chore: add PHP 8.5 support and modernize code style

.github/workflows/main.yml

@@ -8,24 +8,26 @@ name: Check code style and tests
       - master
 jobs:
 
-  build_8_0:
+  build:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        php_version:
+          - '8.4'
+          - '8.5'
+
     steps:
 
-      - uses: actions/checkout@v2
-      - uses: php-actions/composer@v6
-        with:
-          php_version: 8.0
-          version: 2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: ${{ matrix.php_version }}
 
       - name: Update packages
-        run: sudo composer update
+        run: composer update --prefer-dist --no-interaction
 
       - name: PHP version
         run: php -v
@@ -34,8 +36,4 @@ jobs:
         run: vendor/bin/phpcs
 
       - name: Run tests
-        uses: php-actions/phpunit@v3
-        with:
-          version:  9
-          php_version: 8.0
-
+        run: vendor/bin/phpunit

.gitignore

@@ -1,4 +1,4 @@
 vendor/
 composer.lock 
 src/Clients/getDeviceUUID
-.idea
+.idea.phpunit.result.cache

README.md

@@ -6,7 +6,7 @@ PHP библиотека для упрощённого взаимодейтсв
 
 ### Зависимости
 
-* PHP версии 7.3 или выше
+* PHP версии 8.4 или выше
 * [psr/log](https://github.com/php-fig/log)
 * [ext-json](http://php.net/manual/ru/json.installation.php)
 * [ext-simplexml](http://php.net/manual/ru/simplexml.installation.php)

composer.json

@@ -4,7 +4,7 @@
     "keywords": ["mindbox", "sdk"],
     "type": "library",
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.4",
         "psr/log": "^1.1|^2|^3",
         "ext-json": "*",
         "ext-simplexml": "*",

docs/getting_started.md

@@ -6,7 +6,7 @@
 
 ## Системные зависимости
 
-* PHP версии 7.3 или выше
+* PHP версии 8.4 или выше
 * [psr/log](https://github.com/php-fig/log)
 * [ext-json](http://php.net/manual/ru/json.installation.php)
 * [ext-simplexml](http://php.net/manual/ru/simplexml.installation.php)

phpcs.xml.dist

@@ -3,5 +3,5 @@
     <file>src/</file>
     <file>tests/</file>
     <arg value="spn" />
-    <rule ref="PSR2" />
+    <rule ref="PSR12" />
 </ruleset>

src/Clients/AbstractMindboxClient.php

@@ -88,7 +88,7 @@ public function __construct($secretKey, IHttpClient $httpClient, LoggerInterface
     public function prepareRequest(
         $method,
         $operationName,
-        \Mindbox\DTO\DTO $body = null,
+        ?\Mindbox\DTO\DTO $body = null,
         $additionalUrl = '',
         $queryParams = [],
         $isSync = true,
@@ -211,7 +211,7 @@ abstract protected function prepareAuthorizationHeader();
      *
      * @return string
      */
-    abstract protected function prepareBody(\Mindbox\DTO\DTO $body = null);
+    abstract protected function prepareBody(?\Mindbox\DTO\DTO $body = null);
 
     /**
      * Инициализация экземпляра запроса.

src/Clients/MindboxClientFactory.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\Clients;
 
 use Mindbox\XMLHelper\MindboxXMLSerializer;

src/Clients/MindboxClientV2.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\Clients;
 
 use Mindbox\DTO\DTO;
@@ -126,7 +125,7 @@ protected function prepareAuthorizationHeader()
      *
      * @return string
      */
-    protected function prepareBody(DTO $body = null)
+    protected function prepareBody(?DTO $body = null)
     {
         return $body ? $body->toXML() : '';
     }

src/Clients/MindboxClientV3.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\Clients;
 
 use Mindbox\HttpClients\IHttpClient;
@@ -149,7 +148,7 @@ protected function prepareAuthorizationHeader()
      *
      * @return string
      */
-    protected function prepareBody(\Mindbox\DTO\DTO $body = null)
+    protected function prepareBody(?\Mindbox\DTO\DTO $body = null)
     {
         return $body ? $body->toJson() : '';
     }

src/DTO/DTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO;
 
 use ArrayAccess;

src/DTO/DTOCollection.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO;
 
 /**

src/DTO/ResultDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO;
 
 use Mindbox\DTO\V3\Responses\OrderResponseCollection;

src/DTO/V2/CustomFieldDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V2;
 
 /**

src/DTO/V2/IdentityDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V2;
 
 /**

src/DTO/V2/LineDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V2;
 
 use Mindbox\DTO\DTO;

src/DTO/V2/OrderDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V2;
 
 use Mindbox\DTO\DTO;

src/DTO/V2/Responses/LineResponseCollection.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V2\Responses;
 
 use Mindbox\DTO\DTOCollection;

src/DTO/V2/Responses/LineResponseDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V2\Responses;
 
 use Mindbox\DTO\V2\LineDTO;

src/DTO/V2/Responses/OrderResponseCollection.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V2\Responses;
 
 use Mindbox\DTO\DTOCollection;

src/DTO/V2/Responses/OrderResponseDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V2\Responses;
 
 use Mindbox\DTO\V2\OrderDTO;

src/DTO/V3/AreaDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/CustomFieldDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 /**

src/DTO/V3/CustomerDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 /**

src/DTO/V3/CustomerIdentityDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/DiscountDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/IdentityDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 /**

src/DTO/V3/LineDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/OperationDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/OrderDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/PaymentDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/ProductDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 /**

src/DTO/V3/ProductIdentityDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/ProductListItemDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/Requests/AddProductToListRequestDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3\Requests;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/Requests/AreaRequestDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3\Requests;
 
 use Mindbox\DTO\V3\AreaDTO;

src/DTO/V3/Requests/CategoryRequestCollection.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3\Requests;
 
 use Mindbox\DTO\DTOCollection;

src/DTO/V3/Requests/CategoryRequestDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3\Requests;
 
 use Mindbox\DTO\DTO;

src/DTO/V3/Requests/CustomFieldRequestDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3\Requests;
 
 use Mindbox\DTO\V3\CustomFieldDTO;

src/DTO/V3/Requests/CustomerIdentityRequestCollection.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3\Requests;
 
 use Mindbox\DTO\DTOCollection;

src/DTO/V3/Requests/CustomerIdentityRequestDTO.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Mindbox\DTO\V3\Requests;
 
 use Mindbox\DTO\V3\CustomerIdentityDTO;