* Добавлена поддержка Bitrix v22.600.

* Добавлена поддержка PHP 8.0, 8.1 и 8.2.

Author: vitalikxp

.github/workflows/php-unit.yml

@@ -5,11 +5,25 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        PHP: ["7.1", "7.2", "7.3", "7.4"]
-        Bitrix: ["18.5", "19.0", "20.0", "20.5", "21.400"]
+        PHP: ["7.3", "7.4", "8.0", "8.1", "8.2"]
+        Bitrix: ["18.5", "19.0", "20.0", "20.5", "21.400", "22.600"]
         exclude:
-          - { PHP: "7.1", Bitrix: "21.400" }
-          - { PHP: "7.2", Bitrix: "21.400" }
+          - { PHP: "7.3", Bitrix: "22.600" }
+          - { PHP: "8.0", Bitrix: "18.5" }
+          - { PHP: "8.0", Bitrix: "19.0" }
+          - { PHP: "8.0", Bitrix: "20.0" }
+          - { PHP: "8.0", Bitrix: "20.5" }
+          - { PHP: "8.0", Bitrix: "21.400" }
+          - { PHP: "8.1", Bitrix: "18.5" }
+          - { PHP: "8.1", Bitrix: "19.0" }
+          - { PHP: "8.1", Bitrix: "20.0" }
+          - { PHP: "8.1", Bitrix: "20.5" }
+          - { PHP: "8.1", Bitrix: "21.400" }
+          - { PHP: "8.2", Bitrix: "18.5" }
+          - { PHP: "8.2", Bitrix: "19.0" }
+          - { PHP: "8.2", Bitrix: "20.0" }
+          - { PHP: "8.2", Bitrix: "20.5" }
+          - { PHP: "8.2", Bitrix: "21.400" }
     container:
       image: webdevops/php-dev:${{ matrix.PHP }}
       env:
@@ -61,6 +75,7 @@ jobs:
       - name: Run PHPUnit tests
         run: XDEBUG_MODE=coverage vendor/bin/phpunit --whitelist src/ --coverage-text --coverage-clover clover.xml
       - name: Push data to https://scrutinizer-ci.com
+        if: matrix.PHP == '7.4' && matrix.Bitrix == '21.400'
         run: |
           wget -nv https://scrutinizer-ci.com/ocular.phar
           php ocular.phar code-coverage:upload --format=php-clover clover.xml

.gitignore

@@ -1,3 +1,4 @@
 vendor/
 composer.lock
 /coverage/
+/.phpunit.result.cache

composer.json

@@ -15,7 +15,7 @@
         }
     },
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.2",
         "ext-json": "*",
         "elasticsearch/elasticsearch": "^7.1"
     },
@@ -25,8 +25,8 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^9.6",
         "symfony/var-dumper": "^4.3",
-        "sheerockoff/bitrix-ci": "18.5"
+        "sheerockoff/bitrix-ci": "21.400"
     }
 }

tests/IndexerTest.php

@@ -29,12 +29,17 @@
 
 class IndexerTest extends TestCase
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         global $APPLICATION;
 
         self::tearDownAfterClass();
 
+        $elements = CIBlockElement::GetList(['ID' => 'ASC']);
+        while ($element = $elements->Fetch()) {
+            CIBlockElement::Delete($element['ID']);
+        }
+
         $cIBlockType = new CIBlockType();
         $isTypeAdded = $cIBlockType->Add([
             'ID' => 'elastic_test',
@@ -138,7 +143,7 @@ public static function setUpBeforeClass()
             'TITLE' => 'Основной склад',
             'XML_ID' => 'MAIN',
             'ACTIVE' => 'Y',
-            'ADDRESS' => '',
+            'ADDRESS' => 'Липецк',
             'DESCRIPTION' => ''
         ]);
 
@@ -148,7 +153,7 @@ public static function setUpBeforeClass()
             'TITLE' => 'Запасной склад',
             'XML_ID' => 'SECONDARY',
             'ACTIVE' => 'Y',
-            'ADDRESS' => '',
+            'ADDRESS' => 'Тамбов',
             'DESCRIPTION' => ''
         ]);
 
@@ -287,7 +292,7 @@ public static function setUpBeforeClass()
         fclose($csv);
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         CIBlockType::Delete('elastic_test');
 
@@ -728,15 +733,15 @@ public function testCanSearch(array $stack = [])
         ];
 
         foreach ($filters as $filter) {
-            $response = $indexer->search('test_products', $filter);
+            $response = $indexer->search('test_products', $filter, ['ID' => 'ASC'], ['size' => 20]);
             $this->assertNotEmpty($response['hits']['hits'], 'No elasticsearch hits for ' . json_encode($filter));
 
             $elasticIds = array_map(function ($hit) {
                 return (int)$hit['_source']['ID'];
             }, $response['hits']['hits']);
 
             $elements = [];
-            $rs = CIBlockElement::GetList(null, $filter);
+            $rs = CIBlockElement::GetList(['ID' => 'ASC'], $filter);
             while ($element = $rs->GetNextElement()) {
                 $elements[] = $element;
             }
@@ -749,8 +754,8 @@ public function testCanSearch(array $stack = [])
             }, $elements);
 
             $this->assertSame(
-                array_slice(sort($bitrixIds), 0, 10),
-                array_slice(sort($elasticIds), 0, 10)
+                array_slice($bitrixIds, 0, 20),
+                array_slice($elasticIds, 0, 20)
             );
         }