Merge pull request #151 from voku/copilot/find-and-fix-deprecated-code

Fix deprecated PHP patterns for PHP 8.2–8.5+ compatibility

Author: voku

.github/workflows/ci.yml

@@ -17,17 +17,12 @@ jobs:
       fail-fast: false
       matrix:
         php: [
-            7.0,
-            7.1,
-            7.2,
-            7.3,
-            7.4,
             8.0,
             8.1
         ]
         composer: [basic]
         include:
-          - php: 7.3
+          - php: 8.0
             composer: lowest
     timeout-minutes: 10
     steps:
@@ -44,10 +39,10 @@ jobs:
 
       - name: Determine composer cache directory
         id: composer-cache
-        run: echo "::set-output name=directory::$(composer config cache-dir)"
+        run: echo "directory=$(composer config cache-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.directory }}
           key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -94,7 +89,7 @@ jobs:
 
       - name: Archive logs artifacts
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: logs_composer-${{ matrix.composer }}_php-${{ matrix.php }}
           path: |

composer.json

@@ -20,13 +20,14 @@
     }
   ],
   "require": {
-    "php": ">=7.0.0",
+    "php": ">=8.0.0",
     "ext-json": "*",
     "symfony/polyfill-mbstring": "~1.0",
     "phpdocumentor/reflection-docblock": "~4.3 || ~5.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
+    "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0",
+    "phpstan/phpstan": "^1.0"
   },
   "support": {
     "docs": "https://voku.github.io/Arrayy/",

phpstan.neon

@@ -1,8 +1,6 @@
 parameters:
     level: 8
     reportUnmatchedIgnoredErrors: false
-    checkGenericClassInNonGenericObjectType: true
-    checkMissingIterableValueType: false
     paths:
         - %currentWorkingDirectory%/src/
         - %currentWorkingDirectory%/tests/

phpunit.xml.dist

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         backupGlobals="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
          bootstrap="tests/bootstrap.php"
@@ -13,12 +11,15 @@
     <testsuite name="Arrayy Test Suite">
         <directory>tests</directory>
     </testsuite>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
     <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <junit outputFile="build/logs/junit.xml"/>
     </logging>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src/</directory>
+        </include>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
 </phpunit>

src/Arrayy.php

@@ -1941,7 +1941,7 @@ public static function createFromObjectVars($object): self
      * @phpstan-return static<int,string>
      * @psalm-mutation-free
      */
-    public static function createFromString(string $str, string $delimiter = null, string $regEx = null): self
+    public static function createFromString(string $str, ?string $delimiter = null, ?string $regEx = null): self
     {
         if ($regEx) {
             \preg_match_all($regEx, $str, $array);
@@ -2648,7 +2648,7 @@ public function filter($closure = null, int $flag = \ARRAY_FILTER_USE_BOTH)
     public function filterBy(
         string $property,
         $value,
-        string $comparisonOp = null
+        ?string $comparisonOp = null
     ): self {
         if (!$comparisonOp) {
             $comparisonOp = \is_array($value) ? 'contains' : 'eq';
@@ -2834,7 +2834,7 @@ public function firstKey()
      * @phpstan-return static<TKey,T>
      * @psalm-mutation-free
      */
-    public function firstsImmutable(int $number = null): self
+    public function firstsImmutable(?int $number = null): self
     {
         $arrayTmp = $this->toArray();
 
@@ -2863,7 +2863,7 @@ public function firstsImmutable(int $number = null): self
      * @phpstan-return static<array-key,TKey>
      * @psalm-mutation-free
      */
-    public function firstsKeys(int $number = null): self
+    public function firstsKeys(?int $number = null): self
     {
         $arrayTmp = $this->keys()->toArray();
 
@@ -2895,7 +2895,7 @@ public function firstsKeys(int $number = null): self
      *
      * @phpstan-return ($number is null ? static<int,T> : static<TKey,T>)
      */
-    public function firstsMutable(int $number = null): self
+    public function firstsMutable(?int $number = null): self
     {
         $this->generatorToArray();
 
@@ -2972,7 +2972,7 @@ public function flip(): self
     public function get(
         $key = null,
         $fallback = null,
-        array $array = null,
+        ?array $array = null,
         bool $useByReference = false
     ) {
         if ($array === null && $key === null) {
@@ -4265,7 +4265,7 @@ public function lastKey()
      * @phpstan-return static<TKey,T>
      * @psalm-mutation-free
      */
-    public function lastsImmutable(int $number = null): self
+    public function lastsImmutable(?int $number = null): self
     {
         if ($this->isEmpty()) {
             return static::create(
@@ -4310,7 +4310,7 @@ public function lastsImmutable(int $number = null): self
      *
      * @phpstan-return static<TKey,T>
      */
-    public function lastsMutable(int $number = null): self
+    public function lastsMutable(?int $number = null): self
     {
         if ($this->isEmpty()) {
             return $this;
@@ -4724,7 +4724,7 @@ public function mostUsedValue()
      * @phpstan-return static<array-key,T>
      * @psalm-mutation-free
      */
-    public function mostUsedValues(int $number = null): self
+    public function mostUsedValues(?int $number = null): self
     {
         return $this->countValues()->arsortImmutable()->firstsKeys($number);
     }
@@ -5230,7 +5230,7 @@ public function push(...$args)
      *
      * @phpstan-return static<array-key,T>
      */
-    public function randomImmutable(int $number = null): self
+    public function randomImmutable(?int $number = null): self
     {
         $this->generatorToArray();
 
@@ -5347,7 +5347,7 @@ public function randomKeys(int $number): self
      *
      * @phpstan-return static<TKey,T>
      */
-    public function randomMutable(int $number = null): self
+    public function randomMutable(?int $number = null): self
     {
         $this->generatorToArray();
 
@@ -5429,7 +5429,7 @@ public function randomValues(int $number): self
      * @phpstan-param  array<(int&T)|(string&T),int> $array
      * @phpstan-return static<array-key,T>
      */
-    public function randomWeighted(array $array, int $number = null): self
+    public function randomWeighted(array $array, ?int $number = null): self
     {
         // init
         $options = [];
@@ -6248,7 +6248,7 @@ public function shift()
      * @phpstan-param  array<TKey,T> $array
      * @phpstan-return static<TKey,T>
      */
-    public function shuffle(bool $secure = false, array $array = null): self
+    public function shuffle(bool $secure = false, ?array $array = null): self
     {
         if ($array === null) {
             $array = $this->toArray(false);
@@ -6454,7 +6454,7 @@ public function sizeRecursive(): int
      * @phpstan-return static<array-key,T>
      * @psalm-mutation-free
      */
-    public function slice(int $offset, int $length = null, bool $preserveKeys = false)
+    public function slice(int $offset, ?int $length = null, bool $preserveKeys = false)
     {
         return static::create(
             \array_slice(
@@ -6719,7 +6719,7 @@ static function ($value) use ($sorter) {
      * @phpstan-return static<TKey,T>
      * @psalm-mutation-free
      */
-    public function splice(int $offset, int $length = null, $replacement = []): self
+    public function splice(int $offset, ?int $length = null, $replacement = []): self
     {
         $tmpArray = $this->toArray();
 
@@ -6967,7 +6967,7 @@ public function toJson(int $options = 0, int $depth = 512): string
      *
      * @phpstan-return static<int, static<TKey,T>>
      */
-    public function toPermutation(array $items = null, array $helper = []): self
+    public function toPermutation(?array $items = null, array $helper = []): self
     {
         // init
         $return = [];
@@ -7891,7 +7891,7 @@ protected static function objectToArray($object)
         /**
          * @psalm-suppress PossiblyInvalidArgument - the parameter is always some kind of array - false-positive from psalm?
          */
-        return \array_map(['static', 'objectToArray'], $object);
+        return \array_map([static::class, 'objectToArray'], $object);
     }
 
     /**

src/ArrayyMeta.php

@@ -4,6 +4,7 @@
 
 namespace Arrayy;
 
+#[\AllowDynamicProperties]
 final class ArrayyMeta
 {
     /** @noinspection MagicMethodsValidityInspection */

src/ArrayyRewindableExtendedGenerator.php

@@ -15,7 +15,7 @@ class ArrayyRewindableExtendedGenerator extends ArrayyRewindableGenerator
 {
     public function __construct(
         callable $generatorConstructionFunction,
-        callable $onRewind = null,
+        ?callable $onRewind = null,
         string $class = ''
     ) {
         parent::__construct(

src/ArrayyRewindableGenerator.php

@@ -49,7 +49,7 @@ class ArrayyRewindableGenerator extends \ArrayIterator
      */
     public function __construct(
         callable $generatorConstructionFunction,
-        callable $onRewind = null,
+        ?callable $onRewind = null,
         string $class = ''
     ) {
         $this->class = $class;

src/Collection/Collection.php

@@ -102,9 +102,9 @@ class Collection extends AbstractCollection
      */
     public function __construct(
         $data = [],
-        string $iteratorClass = null,
-        bool $checkPropertiesInConstructor = null,
-        TypeInterface $type = null
+        ?string $iteratorClass = null,
+        ?bool $checkPropertiesInConstructor = null,
+        ?TypeInterface $type = null
     ) {
         // fallback
         if ($iteratorClass === null) {

src/Collection/CollectionInterface.php

@@ -496,7 +496,7 @@ public function set($key, $value);
      *
      * @phpstan-return CollectionInterface<array-key|TKey,T>
      */
-    public function slice(int $offset, int $length = null, bool $preserveKeys = false);
+    public function slice(int $offset, ?int $length = null, bool $preserveKeys = false);
 
     /**
      * Gets a native PHP array representation of the collection.