PHP 8 Compatibility

.github/settings.yml

@@ -12,13 +12,21 @@ branches:
               strict: true
               contexts:
                   - "Static Analysis (ubuntu-latest, 7.4)"
+                  - "Static Analysis (ubuntu-latest, 8.0)"
                   - "Static Analysis (windows-latest, 7.4)"
+                  - "Static Analysis (windows-latest, 8.0)"
                   - "Static Analysis (macOS-latest, 7.4)"
+                  - "Static Analysis (macOS-latest, 8.0)"
                   - "Unit Tests (ubuntu-latest, 7.4)"
+                  - "Unit Tests (ubuntu-latest, 8.0)"
                   - "Unit Tests (windows-latest, 7.4)"
+                  - "Unit Tests (windows-latest, 8.0)"
                   - "Unit Tests (macOS-latest, 7.4)"
+                  - "Unit Tests (macOS-latest, 8.0)"
                   - "Mutation Testing (ubuntu-latest, 7.4)"
+                  - "Mutation Testing (ubuntu-latest, 8.0)"
                   - "Code Style (ubuntu-latest, 7.4)"
+                  - "Code Style (ubuntu-latest, 8.0)"
 
           restrictions: null
           required_linear_history: true

.github/workflows/code-style.yml

@@ -13,7 +13,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.4']
+                php-versions: ['7.4', '8.0']
 
         steps:
             - name: Set git to use LF

.github/workflows/mutation-tests.yml

@@ -13,7 +13,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.4']
+                php-versions: ['7.4', '8.0']
 
         steps:
             - name: Set git to use LF

.github/workflows/static-analysis.yml

@@ -14,7 +14,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest, windows-latest, macOS-latest]
-                php-versions: ['7.4']
+                php-versions: ['7.4', '8.0']
 
         steps:
             - name: Set git to use LF

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest, windows-latest, macOS-latest]
-                php-versions: ['7.4']
+                php-versions: ['7.4', '8.0']
 
         steps:
             - name: Set git to use LF

.scrutinizer.yml

@@ -1,12 +1,19 @@
 build:
     nodes:
-        analysis:
+        php74:
             environment:
                 php:
                     version: 7.4
             tests:
                 override:
                     - php-scrutinizer-run
+        php80:
+            environment:
+                php:
+                    version: 8.0
+            tests:
+                override:
+                    - php-scrutinizer-run
 
 filter:
     paths:

composer.json

@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": ">= 7.4"
+        "php": "^7.4 || ^8.0"
     },
     "require-dev": {
         "amphp/parallel-functions": "^1",

phpstan-docs-baseline.neon

@@ -9,8 +9,3 @@ parameters:
 			message: "#^Unable to resolve the template type NewTKey in call to method static method loophp\\\\collection\\\\Collection\\<mixed,mixed\\>\\:\\:fromIterable\\(\\)$#"
 			count: 1
 			path: docs/pages/code/parse-git-log.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function mb_strtolower expects string, int given\\.$#"
-			count: 1
-			path: docs/pages/code/simple.php

spec/loophp/collection/CollectionSpec.php

@@ -12,6 +12,7 @@
 use ArrayIterator;
 use ArrayObject;
 use Closure;
+use Error;
 use Exception;
 use Generator;
 use InvalidArgumentException;
@@ -27,9 +28,12 @@
 use stdClass;
 use const INF;
 use const PHP_EOL;
+use const PHP_VERSION_ID;
 
 class CollectionSpec extends ObjectBehavior
 {
+    private const PHP_VERSION_8 = 80000;
+
     public function it_can_append(): void
     {
         $generator = static function (): Generator {
@@ -226,9 +230,18 @@ public function it_can_asyncMap(): void
             return $v * 2;
         };
 
-        $this::fromIterable(['c' => 3, 'b' => 2, 'a' => 1])
-            ->asyncMap($callback1, $callback2)
-            ->shouldIterateAs(['a' => 2, 'b' => 4, 'c' => 6]);
+        $this->beConstructedThrough('fromIterable', [['c' => 3, 'b' => 2, 'a' => 1]]);
+
+        if (PHP_VERSION_ID >= self::PHP_VERSION_8) {
+            $this
+                ->asyncMap($callback1, $callback2)
+                ->shouldThrow(Error::class)
+                ->during('all');
+        } else {
+            $this
+                ->asyncMap($callback1, $callback2)
+                ->shouldIterateAs(['a' => 2, 'b' => 4, 'c' => 6]);
+        }
     }
 
     public function it_can_be_constructed_from_a_file(): void

src/Collection.php

@@ -166,9 +166,9 @@ public function append(...$items): CollectionInterface
         return new self(Append::of()(...$items), $this->getIterator());
     }
 
-    public function apply(callable ...$callables): CollectionInterface
+    public function apply(callable ...$callbacks): CollectionInterface
     {
-        return new self(Apply::of()(...$callables), $this->getIterator());
+        return new self(Apply::of()(...$callbacks), $this->getIterator());
     }
 
     public function associate(

src/Contract/Operation/Applyable.php

@@ -9,6 +9,7 @@
 
 namespace loophp\collection\Contract\Operation;
 
+use Iterator;
 use loophp\collection\Contract\Collection;
 
 /**
@@ -20,9 +21,9 @@ interface Applyable
     /**
      * Execute a callback for each element of the collection.
      *
-     * @param callable(TKey, T):bool ...$callables
+     * @param callable(T, TKey, Iterator<TKey, T>): bool ...$callbacks
      *
-     * @return \loophp\collection\Collection<TKey, T>
+     * @return Collection<TKey, T>
      */
-    public function apply(callable ...$callables): Collection;
+    public function apply(callable ...$callbacks): Collection;
 }

src/Operation/Apply.php

@@ -28,7 +28,7 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @param callable(T, TKey, Iterator<TKey, T>):bool ...$callbacks
+             * @param callable(T, TKey, Iterator<TKey, T>): bool ...$callbacks
              *
              * @return Closure(Iterator<TKey, T>): Generator<TKey, T>
              */