Revert "xdebug and phpunit upgrade"

This reverts commit 01fe626.
k-samuel · Nov 21, 2024 · 23d5b82 · 23d5b82
1 parent 01fe626
commit 23d5b82
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 54 deletions.
diff --git a/composer.json b/composer.json
@@ -33,8 +33,8 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^11",
-        "phpstan/phpstan": "^2",
+        "phpunit/phpunit": "^9",
+        "phpstan/phpstan": "^1",
         "codacy/coverage": "dev-master",
         "phpbench/phpbench": "^1.2"
     },

diff --git a/src/Filter/ExcludeFilterInterface.php b/src/Filter/ExcludeFilterInterface.php
@@ -35,7 +35,7 @@ interface ExcludeFilterInterface extends FilterInterface
     /**
      * Add records into exclude list
      * @param array<int|string,array<int>|\SplFixedArray<int>> $facetedData
-     * @param array<int,bool|int> &$excludeRecords - RecordId passed into keys of an array (performance issue)
+     * @param array<int,bool|int> & $excludeRecords - RecordId passed into keys of an array (performance issue)
      * @return void
      */
     public function addExcluded(array $facetedData,  array &$excludeRecords): void;

diff --git a/src/Filter/ExcludeRangeFilter.php b/src/Filter/ExcludeRangeFilter.php
@@ -37,7 +37,7 @@
 class ExcludeRangeFilter extends RangeFilter implements ExcludeFilterInterface
 {
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function addExcluded(array $facetedData,  array &$excludeRecords): void
     {
@@ -61,9 +61,6 @@ public function addExcluded(array $facetedData,  array &$excludeRecords): void
                 continue;
             }
             foreach ($records as $item) {
-                /**
-                 * @var int $item
-                 */
                 $excludeRecords[$item] = true;
             }
         }

diff --git a/src/Filter/ExcludeValueFilter.php b/src/Filter/ExcludeValueFilter.php
@@ -55,9 +55,6 @@ public function addExcluded(array $facetedData,  array &$excludeRecords): void
             }
 
             foreach ($facetedData[$item] as $recId) {
-                /**
-                 * @var int $recId
-                 */
                 $excludeRecords[$recId] = true;
             }
         }

diff --git a/src/Filter/RangeFilter.php b/src/Filter/RangeFilter.php
@@ -104,9 +104,6 @@ public function filterInput(array $facetedData,  array &$inputIdKeys, array $exc
 
         if (empty($inputIdKeys)) {
             foreach ($limit as $v) {
-                /**
-                 * @var int $v
-                 */
                 $inputIdKeys[$v] = true;
             }
             return;
@@ -116,9 +113,6 @@ public function filterInput(array $facetedData,  array &$inputIdKeys, array $exc
         // Reuse of input data. Set mark "2" for the data that needs to be in result.
         foreach ($limit as $index) {
             if (isset($inputIdKeys[$index])) {
-                /**
-                 * @var int $index
-                 */
                 $inputIdKeys[$index] = 2;
             }
         }

diff --git a/src/Filter/ValueFilter.php b/src/Filter/ValueFilter.php
@@ -37,7 +37,7 @@
 class ValueFilter extends AbstractFilter
 {
     /**
-     * @var array<int|mixed,mixed>
+     * @var array<int,mixed>
      */
     protected $value;
 

diff --git a/src/Index/Factory.php b/src/Index/Factory.php
@@ -47,6 +47,9 @@ final class Factory
 
     public function create(string $storage): IndexInterface
     {
+        /**
+         * @var StorageInterface $store
+         */
         $store = new $storage;
 
         if (!$store instanceof StorageInterface) {

diff --git a/src/Index/Storage/ArrayStorage.php b/src/Index/Storage/ArrayStorage.php
@@ -41,18 +41,18 @@ class ArrayStorage implements StorageInterface
 {
     /**
      * Index data
-     * @var array<int|string,array<int|string,array<int,int>>>
+     * @var array<int|string,array<int|string,array<int>>>
      */
     protected array $data = [];
     /**
-     * @var array<int|string, IndexerInterface>
+     * @var array<int|string,IndexerInterface>
      */
     protected array $indexers = [];
 
     /**
      * Add record to index
      * @param int $recordId
-     * @param array<int|string,mixed|array<int,mixed>> $recordValues -  ['fieldName'=>'fieldValue','fieldName2'=>['val1','val2']]
+     * @param array<int|string,array<int,mixed>> $recordValues -  ['fieldName'=>'fieldValue','fieldName2'=>['val1','val2']]
      * @return bool
      */
     public function addRecord(int $recordId, array $recordValues): bool
@@ -68,10 +68,6 @@ public function addRecord(int $recordId, array $recordValues): bool
                 if (!isset($this->data[$fieldName])) {
                     $this->data[$fieldName] = [];
                 }
-
-                /**
-                 * @phpstan-ignore-next-line
-                 */
                 if (!$this->indexers[$fieldName]->add($this->data[$fieldName], $recordId, $values)) {
                     return false;
                 }
@@ -92,21 +88,20 @@ public function addRecord(int $recordId, array $recordValues): bool
 
     /**
      * Get facet data.
-     * @return array<int|string,array<int|string,array<int,int>|\SplFixedArray<int>>>
+     * @return array<int|string,array<int|string,array<int>|\SplFixedArray<int>>>
      */
     public function getData(): array
     {
         return $this->data;
     }
 
     /**
-     * Get facet data. 
-     * @return array<int|string,array<int|string,array<int,int>>>
+     * Get facet data.
+     * @return array<int|string,array<int|string,array<int>>>
      */
     public function export(): array
     {
         foreach ($this->indexers as $fieldName => $item) {
-            // @phpstan-ignore-next-line
             $item->optimize($this->data[$fieldName]);
         }
 
@@ -115,7 +110,7 @@ public function export(): array
 
     /**
      * Set index data. Can be used for restoring from DB
-     * @param array<int|string,array<int|string,array<int,int>>> $data
+     * @param array<int|string,array<int|string,array<int>>> $data
      */
     public function setData(array $data): void
     {
@@ -195,7 +190,6 @@ protected function getValuesCount(): array
     public function optimize(): void
     {
         foreach ($this->indexers as $fieldName => $item) {
-            // @phpstan-ignore-next-line
             $item->optimize($this->data[$fieldName]);
         }
 

diff --git a/src/Index/Storage/FixedArrayStorage.php b/src/Index/Storage/FixedArrayStorage.php
@@ -45,7 +45,7 @@ class FixedArrayStorage extends ArrayStorage
 
     /**
      * Get index data. Can be used for storing it to DB
-     * @return array<int|string,array<int|string,array<int,int>>>
+     * @return array<int|string,array<int|string,array<int>>>
      */
     public function export(): array
     {
@@ -54,11 +54,10 @@ public function export(): array
         }
 
         foreach ($this->indexers as $fieldName => $item) {
-            // @phpstan-ignore-next-line
             $item->optimize($this->data[$fieldName]);
         }
         /**
-         * @var array<int|string,array<int|string,array<int,int>>>
+         * @var array<int|string,array<int|string,array<int>>>
          */
         return $this->data;
     }
@@ -70,7 +69,7 @@ public function writeMode(): void
     {
         foreach ($this->data as &$value) {
             /**
-             * @var array<int,int>|\SplFixedArray<int> $recordList
+             * @var \SplFixedArray<int> $recordList
              */
             foreach ($value as &$recordList) {
                 if ($recordList instanceof \SplFixedArray) {
@@ -90,7 +89,7 @@ public function convert(): void
     {
         foreach ($this->data as &$value) {
             /**
-             * @var array<int,int>|\SplFixedArray<int> $recordList
+             * @var array<int>|\SplFixedArray<int> $recordList
              */
             foreach ($value as &$recordList) {
                 if (is_array($recordList)) {

diff --git a/src/Index/Storage/Scanner.php b/src/Index/Storage/Scanner.php
@@ -64,7 +64,7 @@ public function findRecordsMap(StorageInterface $storage, array $filters, array
                 return [];
             }
         }
-        // @phpstan-ignore return.type
+
         return $inputRecords;
     }
 
@@ -87,7 +87,6 @@ public function findExcludeRecordsMap(StorageInterface $storage, array $filters,
         foreach ($filters as $filter) {
             $fieldName = $filter->getFieldName();
             if (isset($data[$fieldName])) {
-                // @phpstan-ignore-next-line
                 $filter->addExcluded($data[$fieldName], $excludeRecords);
             }
         }
@@ -140,9 +139,6 @@ private function findInput(StorageInterface $storage, array $inputRecords, array
      */
     public function getAllRecordIdMap(StorageInterface $storage): array
     {
-        /**
-         * @var array<int,bool> $result
-         */
         $result = [];
         /**
          * @var array<int|string,array<int>>$values
@@ -154,6 +150,10 @@ public function getAllRecordIdMap(StorageInterface $storage): array
                 }
             }
         }
+        /**
+         * @var array<int,bool> $result
+         */
+
         return $result;
     }
     /**

diff --git a/src/Indexer/IndexerInterface.php b/src/Indexer/IndexerInterface.php
@@ -42,7 +42,7 @@ public function add(array &$indexContainer, int $recordId, array $values): bool;
 
     /**
      * Optimize data structures
-     * @param array<int|string,array<int|string,array<int,int>>> &$indexContainer
+     * @param array<int|string,array<int|string,array<int>>> &$indexContainer
      * @return void
      */
     public function optimize(array &$indexContainer): void;

diff --git a/src/Indexer/Number/RangeIndexer.php b/src/Indexer/Number/RangeIndexer.php
@@ -34,13 +34,15 @@
 
 class RangeIndexer implements IndexerInterface
 {
-
+    /**
+     * @var int
+     */
     protected int $step;
 
     protected bool $hasUnsorted = false;
     /**
      * New values for sorting
-     * @var array<int|string,array<int|string,array<int,int>>>
+     * @var array<int|string,array<int|string,array<int>>>
      */
     protected array $unsortedBuf = [];
 
@@ -53,7 +55,7 @@ public function __construct(int $step)
     }
 
     /**
-     * @param array<int|string,array<int,int>> $indexContainer
+     * @param array<int|string,array<int>> $indexContainer
      * @param int $recordId
      * @param array<int,int|float> $values
      * @return bool
@@ -76,7 +78,7 @@ public function add(&$indexContainer, int $recordId, array $values): bool
     /**
      * Prepare values for export
      *
-     * @param array<int|string,array<int|string,array<int,int>>> &$indexContainer
+     * @param array<int|string,array<int|string,array<int>>> &$indexContainer
      * @return void
      */
     public function optimize(array &$indexContainer): void
@@ -87,12 +89,10 @@ public function optimize(array &$indexContainer): void
 
         foreach ($this->unsortedBuf as $position => &$values) {
             ksort($values);
-            foreach ($values as $ids) {
+            foreach ($values as $value => $ids) {
                 foreach ($ids as $id) {
-                    // @phpstan-ignore-next-line
                     $this->addSorterId($indexContainer[$position], $id);
                 }
-                // @phpstan-ignore parameterByRef.type
                 $indexContainer[$position] = array_values($indexContainer[$position]);
             }
         }

diff --git a/src/Indexer/Number/RangeListIndexer.php b/src/Indexer/Number/RangeListIndexer.php
@@ -96,7 +96,7 @@ protected function detectRangeKey($value): int
     /**
      * Prepare values for export
      *
-     * @param array<int|string,array<int|string,array<int,int>>> &$indexContainer
+     * @param array<int|string,array<int|string,array<int>>> &$indexContainer
      * @return void
      */
     public function optimize(array &$indexContainer): void
@@ -107,12 +107,10 @@ public function optimize(array &$indexContainer): void
 
         foreach ($this->unsortedBuf as $position => &$values) {
             ksort($values);
-            foreach ($values as $ids) {
+            foreach ($values as $value => $ids) {
                 foreach ($ids as $id) {
-                    // @phpstan-ignore-next-line
                     $this->addSorterId($indexContainer[$position], $id);
                 }
-                // @phpstan-ignore-next-line
                 $indexContainer[$position] = array_values($indexContainer[$position]);
             }
         }

diff --git a/tests/unit/Index/Storage/StorageTest.php b/tests/unit/Index/Storage/StorageTest.php
@@ -8,7 +8,7 @@
 
 class StorageTest extends TestCase
 {
-    static public function storeProvider(): array
+    public function storeProvider(): array
     {
         return [
             [(new Factory)->create(Factory::ARRAY_STORAGE)],

diff --git a/tests/unit/IndexTest.php b/tests/unit/IndexTest.php
@@ -41,7 +41,7 @@ public function testAggregate(): void
         );
     }
 
-    static public function storeProvider(): array
+    public function storeProvider(): array
     {
         return [
             [(new Factory)->create(Factory::ARRAY_STORAGE)],
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 foreach ($facetedData[$item] as $recId) {
-                    /**
-                     * @var int $recId
-                     */
                     $excludeRecords[$recId] = true;
                 }
             }
@@ Expand Down @@