Merge remote-tracking branch 'origin/master'

Silentscripter · Silentscripter · commit 9fe6cb794e5c · 2016-07-01T22:05:08.000+02:00
# Conflicts:
#	src/PrestashopWebService.php
diff --git a/src/PrestashopWebService.php b/src/PrestashopWebService.php
@@ -11,13 +11,13 @@ class PrestashopWebService extends PSLibrary
     /**
      * Retrieve the resource schema
      *
-     * @param $resource
+     * @param $resource , $schema
      * @return SimpleXMLElement
      * @throws \PrestaShopWebserviceException
      */
-    public function getSchema($resource)
+    public function getSchema($resource , $schema = 'blank')
     {
-        return $this->get(['resource' => $resource . '?schema=blank']);
+        return $this->get(['resource' => $resource . "?schema=$schema"]);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,13 @@ class PrestashopWebService extends PSLibrary`
`11`	`11`	`/**`
`12`	`12`	`* Retrieve the resource schema`
`13`	`13`	`*`
`14`		`- * @param $resource`
	`14`	`+ * @param $resource , $schema`
`15`	`15`	`* @return SimpleXMLElement`
`16`	`16`	`* @throws \PrestaShopWebserviceException`
`17`	`17`	`*/`
`18`		`- public function getSchema($resource)`
	`18`	`+ public function getSchema($resource , $schema = 'blank')`
`19`	`19`	`{`
`20`		`- return $this->get(['resource' => $resource . '?schema=blank']);`
	`20`	`+ return $this->get(['resource' => $resource . "?schema=$schema"]);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`/**`