From 9e59a9aa8cbf2228d704f13ee9b2823bc6c3c7d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 12 Nov 2020 18:39:50 +0100 Subject: [PATCH 1/4] Create index.html --- htdocs/admin/dolistore/index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 htdocs/admin/dolistore/index.html diff --git a/htdocs/admin/dolistore/index.html b/htdocs/admin/dolistore/index.html new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/htdocs/admin/dolistore/index.html @@ -0,0 +1 @@ + From 9c7d698cc729f1792da00a8630e34ae2427092aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 12 Nov 2020 18:40:34 +0100 Subject: [PATCH 2/4] Create index.html --- htdocs/admin/dolistore/class/index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 htdocs/admin/dolistore/class/index.html diff --git a/htdocs/admin/dolistore/class/index.html b/htdocs/admin/dolistore/class/index.html new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/htdocs/admin/dolistore/class/index.html @@ -0,0 +1 @@ + From caa82a1e2f6e5ba7db9217ee43cf56c8e9ac873d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 12 Nov 2020 18:43:52 +0100 Subject: [PATCH 3/4] Update PSWebServiceLibrary.class.php --- .../dolistore/class/PSWebServiceLibrary.class.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php index 00e8672f6d5..abbb3bbc4ed 100644 --- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php +++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php @@ -221,7 +221,9 @@ class PrestaShopWebservice * Load XML from string. Can throw exception * * @param string $response String from a CURL response - * @return SimpleXMLElement status_code, response + * @return SimpleXMLElement|boolean status_code, response + * + * @throw PrestaShopWebserviceException */ protected function parseXML($response) { @@ -251,6 +253,8 @@ class PrestaShopWebservice * * @param array $options Options * @return SimpleXMLElement status_code, response + * + * @throw PrestaShopWebserviceException */ public function add($options) { @@ -300,7 +304,9 @@ class PrestaShopWebservice * ?> * * @param array $options Array representing resource to get. - * @return SimpleXMLElement status_code, response + * @return SimpleXMLElement|boolean status_code, response + * + * @throw PrestaShopWebserviceException */ public function get($options) { @@ -336,6 +342,8 @@ class PrestaShopWebservice * * @param array $options Array representing resource for head request. * @return SimpleXMLElement status_code, response + * + * @throw PrestaShopWebserviceException */ public function head($options) { @@ -372,6 +380,8 @@ class PrestaShopWebservice * * @param array $options Array representing resource to edit. * @return SimpleXMLElement status_code, response + * + * @throw PrestaShopWebserviceException */ public function edit($options) { From 64c48a246a8327186a1a1f90051aec11ba00dc68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 12 Nov 2020 18:53:26 +0100 Subject: [PATCH 4/4] The method PrestaShopWebservice::... is not static, but was called statically --- .../class/PSWebServiceLibrary.class.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php index abbb3bbc4ed..201191d1262 100644 --- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php +++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php @@ -272,10 +272,10 @@ class PrestaShopWebservice } else { throw new PrestaShopWebserviceException('Bad parameters given'); } - $request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'POST', CURLOPT_POSTFIELDS => $xml)); + $request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'POST', CURLOPT_POSTFIELDS => $xml)); - self::checkStatusCode($request['status_code']); - return self::parseXML($request['response']); + $this->checkStatusCode($request['status_code']); + return $this->parseXML($request['response']); } /** @@ -332,9 +332,9 @@ class PrestaShopWebservice throw new PrestaShopWebserviceException('Bad parameters given '); } - $request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET')); - self::checkStatusCode($request['status_code']); // check the response validity - return self::parseXML($request['response']); + $request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET')); + $this->checkStatusCode($request['status_code']); // check the response validity + return $this->parseXML($request['response']); } /** @@ -366,8 +366,8 @@ class PrestaShopWebservice } else { throw new PrestaShopWebserviceException('Bad parameters given'); } - $request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'HEAD', CURLOPT_NOBODY => true)); - self::checkStatusCode($request['status_code']); // check the response validity + $request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'HEAD', CURLOPT_NOBODY => true)); + $this->checkStatusCode($request['status_code']); // check the response validity return $request['header']; } /** @@ -400,9 +400,9 @@ class PrestaShopWebservice throw new PrestaShopWebserviceException('Bad parameters given'); } - $request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml)); - self::checkStatusCode($request['status_code']); // check the response validity - return self::parseXML($request['response']); + $request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml)); + $this->checkStatusCode($request['status_code']); // check the response validity + return $this->parseXML($request['response']); } }