Merge pull request #83 from findologic/SW-800_fix_version_conflict

SW-800 Switch to official guzzle library

Author: TobiasGraml11

.github/workflows/phpunit.yml

@@ -9,11 +9,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '5.6'
-          - '7.0'
-          - '7.1'
-          - '7.2'
-          - '7.3'
+          - '8.1'
 
     steps:
       - uses: actions/checkout@v2

README.md

@@ -35,7 +35,7 @@ Currently, we support the following response formats:
 
 ## Requirements
 
- * [PHP](https://php.net/) >= 5.6
+ * [PHP](https://php.net/) >= 8.1
     * [PHP curl extension](https://www.php.net/manual/en/curl.installation.php) (optional)
  * [Composer](https://getcomposer.org/)
 

composer.json

@@ -32,22 +32,22 @@
     ],
     "config": {
         "platform": {
-            "php": "5.6"
+            "php": "8.1"
         }
     },
     "require": {
-        "php": ">=5.6",
+        "php": ">=8.1",
         "vlucas/valitron": "^1.4",
         "ext-SimpleXML": "*",
         "ext-json": "*",
         "ext-dom": "*",
         "ext-libxml": "*",
         "findologic/xml-response-schema": "^2.1",
-        "findologic/guzzle": "^6.5"
+        "guzzlehttp/guzzle": "^7.4.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5 || ^6.5 || ^7.0",
-        "friendsofphp/php-cs-fixer": "^2.14"
+        "phpunit/phpunit": "^9.6.9",
+        "friendsofphp/php-cs-fixer": "^v3.18.0"
     },
     "autoload": {
         "psr-4": {

src/Client.php

@@ -7,7 +7,7 @@
 use FINDOLOGIC\Api\Requests\Request;
 use FINDOLOGIC\Api\Requests\SearchNavigation\SearchNavigationRequest;
 use FINDOLOGIC\Api\Responses\Response;
-use FINDOLOGIC\GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Exception\GuzzleException;
 use Psr\Http\Message\ResponseInterface as GuzzleResponse;
 
 class Client

src/Config.php

@@ -4,22 +4,22 @@
 
 use FINDOLOGIC\Api\Exceptions\ConfigException;
 use FINDOLOGIC\Api\Validators\ConfigValidator;
-use FINDOLOGIC\GuzzleHttp\Client;
+use GuzzleHttp\Client;
 
 class Config
 {
-    const
+    public const
         SERVICE_ID = 'serviceId',
-        API_URL = 'apiUrl',
-        ALIVETEST_TIMEOUT = 'alivetestTimeout',
-        REQUEST_TIMEOUT = 'requestTimeout',
-        HTTP_CLIENT = 'httpClient',
-        ACCESS_TOKEN = 'accessToken';
+    API_URL = 'apiUrl',
+    ALIVETEST_TIMEOUT = 'alivetestTimeout',
+    REQUEST_TIMEOUT = 'requestTimeout',
+    HTTP_CLIENT = 'httpClient',
+    ACCESS_TOKEN = 'accessToken';
 
-    const
+    public const
         DEFAULT_TEMPLATE_API_URL = 'https://service.findologic.com/ps/%s/%s',
-        DEFAULT_ALIVETEST_TIMEOUT = 1.0,
-        DEFAULT_REQUEST_TIMEOUT = 3.0;
+    DEFAULT_ALIVETEST_TIMEOUT = 1.0,
+    DEFAULT_REQUEST_TIMEOUT = 3.0;
 
     /** @var string|null */
     private $serviceId;

src/Definitions/BlockType.php

@@ -4,12 +4,12 @@
 
 class BlockType extends Definition
 {
-    const
+    public const
         SUGGEST_BLOCK = 'suggest',
-        LANDINGPAGE_BLOCK = 'landingpage',
-        CAT_BLOCK = 'cat',
-        VENDOR_BLOCK = 'vendor',
-        ORDERNUMBER_BLOCK = 'ordernumber',
-        PRODUCT_BLOCK = 'product',
-        PROMOTION_BLOCK = 'promotion';
+    LANDINGPAGE_BLOCK = 'landingpage',
+    CAT_BLOCK = 'cat',
+    VENDOR_BLOCK = 'vendor',
+    ORDERNUMBER_BLOCK = 'ordernumber',
+    PRODUCT_BLOCK = 'product',
+    PROMOTION_BLOCK = 'promotion';
 }

src/Definitions/Defaults.php

@@ -5,5 +5,5 @@
 class Defaults extends Definition
 {
     /** @var string Default usergroup aka. no usergroup */
-    const USER_GROUP = '';
+    public const USER_GROUP = '';
 }

src/Definitions/Endpoint.php

@@ -4,11 +4,11 @@
 
 class Endpoint extends Definition
 {
-    const
+    public const
         ALIVETEST = 'alivetest.php',
-        SEARCH = 'index.php',
-        NAVIGATION = 'selector.php',
-        SUGGEST = 'autocomplete.php',
-        TRACKING = 'tracking.php',
-        UPDATE = 'update.php';
+    SEARCH = 'index.php',
+    NAVIGATION = 'selector.php',
+    SUGGEST = 'autocomplete.php',
+    TRACKING = 'tracking.php',
+    UPDATE = 'update.php';
 }

src/Definitions/FilterMode.php

@@ -4,8 +4,8 @@
 
 class FilterMode extends Definition
 {
-    const
+    public const
         SINGLE = 'single',
-        MULTIPLE = 'multiple',
-        MULTISELECT = 'multiselect';
+    MULTIPLE = 'multiple',
+    MULTISELECT = 'multiselect';
 }

src/Definitions/FilterType.php

@@ -4,12 +4,12 @@
 
 class FilterType extends Definition
 {
-    const
+    public const
         SELECT = 'select',
-        LABEL = 'label',
-        RANGE_SLIDER = 'range-slider',
-        COLOR = 'color',
-        COLOR_ALTERNATIVE = 'color-picker',
-        VENDOR_IMAGE = 'image',
-        VENDOR_IMAGE_ALTERNATIVE = 'image-filter';
+    LABEL = 'label',
+    RANGE_SLIDER = 'range-slider',
+    COLOR = 'color',
+    COLOR_ALTERNATIVE = 'color-picker',
+    VENDOR_IMAGE = 'image',
+    VENDOR_IMAGE_ALTERNATIVE = 'image-filter';
 }

src/Definitions/OrderType.php

@@ -4,31 +4,31 @@
 
 class OrderType extends Definition
 {
-    const
+    public const
         FIELD_PRICE = 'price',
-        FIELD_LABEL = 'label',
-        FIELD_SALES_FREQUENCY = 'salesfrequency',
-        FIELD_DATE_ADDED = 'dateadded',
-        FIELD_SHOPSORT = 'shopsort';
+    FIELD_LABEL = 'label',
+    FIELD_SALES_FREQUENCY = 'salesfrequency',
+    FIELD_DATE_ADDED = 'dateadded',
+    FIELD_SHOPSORT = 'shopsort';
 
-    const
+    public const
         DIRECTION_ASCENDING = 'ASC',
-        DIRECTION_DESCENDING = 'DESC';
+    DIRECTION_DESCENDING = 'DESC';
 
-    const DEFAULT_SORT = 'rank';
+    public const DEFAULT_SORT = 'rank';
 
-    const
+    public const
         RELEVANCE = self::DEFAULT_SORT,
-        PRICE_ASCENDING = self::FIELD_PRICE . ' ' . self::DIRECTION_ASCENDING,
-        PRICE_DESCENDING = self::FIELD_PRICE . ' ' . self::DIRECTION_DESCENDING,
-        ALPHABETICAL_ASCENDING = self::FIELD_LABEL . ' ' . self::DIRECTION_ASCENDING,
-        ALPHABETICAL_DESCENDING = self::FIELD_LABEL . ' ' . self::DIRECTION_DESCENDING,
-        TOP_SELLERS_FIRST = self::FIELD_SALES_FREQUENCY . ' ' . self::DIRECTION_DESCENDING,
-        TOP_SELLERS_LAST = self::FIELD_SALES_FREQUENCY . ' ' . self::DIRECTION_ASCENDING,
-        NEWEST_FIRST = self::FIELD_DATE_ADDED . ' ' . self::DIRECTION_DESCENDING,
-        NEWEST_LAST = self::FIELD_DATE_ADDED . ' ' . self::DIRECTION_ASCENDING,
-        SHOPSORT_ASCENDING = self::FIELD_SHOPSORT . ' ' . self::DIRECTION_ASCENDING,
-        SHOPSORT_DESCENDING = self::FIELD_SHOPSORT . ' ' . self::DIRECTION_DESCENDING;
+    PRICE_ASCENDING = self::FIELD_PRICE . ' ' . self::DIRECTION_ASCENDING,
+    PRICE_DESCENDING = self::FIELD_PRICE . ' ' . self::DIRECTION_DESCENDING,
+    ALPHABETICAL_ASCENDING = self::FIELD_LABEL . ' ' . self::DIRECTION_ASCENDING,
+    ALPHABETICAL_DESCENDING = self::FIELD_LABEL . ' ' . self::DIRECTION_DESCENDING,
+    TOP_SELLERS_FIRST = self::FIELD_SALES_FREQUENCY . ' ' . self::DIRECTION_DESCENDING,
+    TOP_SELLERS_LAST = self::FIELD_SALES_FREQUENCY . ' ' . self::DIRECTION_ASCENDING,
+    NEWEST_FIRST = self::FIELD_DATE_ADDED . ' ' . self::DIRECTION_DESCENDING,
+    NEWEST_LAST = self::FIELD_DATE_ADDED . ' ' . self::DIRECTION_ASCENDING,
+    SHOPSORT_ASCENDING = self::FIELD_SHOPSORT . ' ' . self::DIRECTION_ASCENDING,
+    SHOPSORT_DESCENDING = self::FIELD_SHOPSORT . ' ' . self::DIRECTION_DESCENDING;
 
     /**
      * Builds a custom order parameter.

src/Definitions/OutputAdapter.php

@@ -4,10 +4,10 @@
 
 class OutputAdapter extends Definition
 {
-    const
+    public const
         XML_21 = 'XML_2.1',
-        HTML_20 = 'HTML_2.0',
-        HTML_30 = 'HTML_3.0',
-        HTML_31 = 'HTML_3.1',
-        JSON_10 = 'JSON_1.0';
+    HTML_20 = 'HTML_2.0',
+    HTML_30 = 'HTML_3.0',
+    HTML_31 = 'HTML_3.1',
+    JSON_10 = 'JSON_1.0';
 }

src/Definitions/QueryParameter.php

@@ -4,26 +4,26 @@
 
 class QueryParameter extends Definition
 {
-    const
+    public const
         SERVICE_ID = 'shopkey',
-        SHOP_URL = 'shopurl',
-        USER_IP = 'userip',
-        REFERER = 'referer',
-        REVISION = 'revision',
-        SHOP_TYPE = 'shopType',
-        SHOP_VERSION = 'shopVersion',
-        QUERY = 'query',
-        ATTRIB = 'attrib',
-        ORDER = 'order',
-        PROPERTIES = 'properties',
-        PUSH_ATTRIB = 'pushAttrib',
-        COUNT = 'count',
-        FIRST = 'first',
-        IDENTIFIER = 'identifier',
-        GROUP = 'group',
-        USERGROUP = 'usergrouphash',
-        FORCE_ORIGINAL_QUERY = 'forceOriginalQuery',
-        OUTPUT_ATTRIB = 'outputAttrib',
-        SELECTED = 'selected',
-        OUTPUT_ADAPTER = 'outputAdapter';
+    SHOP_URL = 'shopurl',
+    USER_IP = 'userip',
+    REFERER = 'referer',
+    REVISION = 'revision',
+    SHOP_TYPE = 'shopType',
+    SHOP_VERSION = 'shopVersion',
+    QUERY = 'query',
+    ATTRIB = 'attrib',
+    ORDER = 'order',
+    PROPERTIES = 'properties',
+    PUSH_ATTRIB = 'pushAttrib',
+    COUNT = 'count',
+    FIRST = 'first',
+    IDENTIFIER = 'identifier',
+    GROUP = 'group',
+    USERGROUP = 'usergrouphash',
+    FORCE_ORIGINAL_QUERY = 'forceOriginalQuery',
+    OUTPUT_ATTRIB = 'outputAttrib',
+    SELECTED = 'selected',
+    OUTPUT_ADAPTER = 'outputAdapter';
 }

src/Definitions/RequestMethod.php

@@ -4,14 +4,14 @@
 
 class RequestMethod extends Definition
 {
-    const HEAD = 'HEAD';
-    const GET = 'GET';
-    const POST = 'POST';
-    const PUT = 'PUT';
-    const PATCH = 'PATCH';
-    const DELETE = 'DELETE';
-    const PURGE = 'PURGE';
-    const OPTIONS = 'OPTIONS';
-    const TRACE = 'TRACE';
-    const CONNECT = 'CONNECT';
+    public const HEAD = 'HEAD';
+    public const GET = 'GET';
+    public const POST = 'POST';
+    public const PUT = 'PUT';
+    public const PATCH = 'PATCH';
+    public const DELETE = 'DELETE';
+    public const PURGE = 'PURGE';
+    public const OPTIONS = 'OPTIONS';
+    public const TRACE = 'TRACE';
+    public const CONNECT = 'CONNECT';
 }

src/Definitions/SelectType.php

@@ -4,8 +4,8 @@
 
 class SelectType extends Definition
 {
-    const
+    public const
         SINGLE = 'single',
-        MULTIPLE = 'multiple',
-        MULTI_SELECT = 'multiselect';
+    MULTIPLE = 'multiple',
+    MULTI_SELECT = 'multiselect';
 }

src/Definitions/SuggestQueryParameter.php

@@ -4,8 +4,8 @@
 
 class SuggestQueryParameter extends Definition
 {
-    const
+    public const
         AUTOCOMPLETEBLOCKS = 'autocompleteblocks',
-        USERGROUPHASH = 'usergrouphash',
-        MULTISHOP_ID = 'multishop_id';
+    USERGROUPHASH = 'usergrouphash',
+    MULTISHOP_ID = 'multishop_id';
 }

src/Helpers/ResponseHelper.php

@@ -4,11 +4,11 @@
 
 class ResponseHelper
 {
-    const
+    public const
         TYPE_STRING = 'string',
-        TYPE_INT = 'int',
-        TYPE_FLOAT = 'float',
-        TYPE_BOOL = 'bool';
+    TYPE_INT = 'int',
+    TYPE_FLOAT = 'float',
+    TYPE_BOOL = 'bool';
 
     /**
      * Gets a property from an object and converts it to a string.

src/Requests/Item/Item.php

@@ -10,8 +10,8 @@
 
 class Item
 {
-    const VISIBILITY_CHANGE = 0;
-    const PRICE_CHANGE = 1;
+    public const VISIBILITY_CHANGE = 0;
+    public const PRICE_CHANGE = 1;
 
     /** @var string */
     private $id;

src/Requests/Request.php

@@ -17,14 +17,14 @@
 
 abstract class Request
 {
-    const TYPE_SEARCH = 0;
-    const TYPE_NAVIGATION = 1;
-    const TYPE_SUGGEST_V3 = 2;
-    const TYPE_ALIVETEST = 3;
-    const TYPE_ITEM_UPDATE = 4;
-
-    const SET_VALUE = 'set';
-    const ADD_VALUE = 'add';
+    public const TYPE_SEARCH = 0;
+    public const TYPE_NAVIGATION = 1;
+    public const TYPE_SUGGEST_V3 = 2;
+    public const TYPE_ALIVETEST = 3;
+    public const TYPE_ITEM_UPDATE = 4;
+
+    public const SET_VALUE = 'set';
+    public const ADD_VALUE = 'add';
 
     /** @var array */
     protected $params;