Ensure generators aren't reused from failed state

.github/workflows/ci.yaml

@@ -10,17 +10,16 @@ on:
       - master
       - main
 
-jobs:
+env:
+  COMPOSER_ROOT_VERSION: 0.1.x-dev
 
+jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
         coverage: ['pcov']
-        include:
-          - php-version: '7.1'
-            coverage: xdebug
 
     name: Test with PHP ${{ matrix.php-version }}
 
@@ -48,11 +47,6 @@ jobs:
             composer-${{ matrix.php-version }}-
             composer-
 
-      - name: Set package version for Composer
-        uses: ergebnis/composer-root-version-action@0.2.1
-        with:
-          branch: main
-
       - name: Install dependencies
         run: |
           composer remove --no-update --dev --no-interaction --no-progress \
@@ -69,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      PHP_VERSION: '8.1'
+      PHP_VERSION: '8.2'
 
     steps:
       - name: Checkout code
@@ -92,11 +86,6 @@ jobs:
             composer-${{ env.PHP_VERSION }}-
             composer-
 
-      - name: Set package version for Composer
-        uses: ergebnis/composer-root-version-action@0.2.1
-        with:
-          branch: main
-
       - name: Install dependencies
         run: |
           composer update --prefer-dist --no-interaction --no-progress
@@ -121,8 +110,8 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      PHP_VERSION: '8.1'
-      PHP_CS_FIXER_VERSION: 'v3.12.0'
+      PHP_VERSION: '8.2'
+      PHP_CS_FIXER_VERSION: 'v3.35.1'
 
     steps:
       - name: Checkout

composer.json

@@ -10,16 +10,16 @@
         }
     ],
     "require": {
-        "php": ">=7.1"
+        "php": ">=7.4"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.8",
-        "friendsofphp/php-cs-fixer": "^3.12",
-        "infection/infection": ">=0.18",
+        "friendsofphp/php-cs-fixer": "^3.35.1",
+        "infection/infection": ">=0.27.6",
         "phan/phan": ">=2",
         "php-coveralls/php-coveralls": "^2.0",
         "phpstan/phpstan": ">=1.4.5",
-        "phpunit/phpunit": ">=7.4",
+        "phpunit/phpunit": ">=9.5 <10",
         "vimeo/psalm": ">=2"
     },
     "autoload": {

phpunit.xml.dist

@@ -1,23 +1,24 @@
-<phpunit bootstrap="vendor/autoload.php"
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
          executionOrder="random"
          resolveDependencies="true"
          forceCoversAnnotation="false"
-         colors="true">
-
-    <testsuites>
-        <testsuite name="Main">
-            <directory>tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="coverage-text" target="php://stdout"/>
-    </logging>
+         colors="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <text outputFile="php://stdout"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Main">
+      <directory>tests/</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
 </phpunit>

src/Deferred.php

@@ -23,6 +23,7 @@
  * Deferred: a wrapper object.
  *
  * @template T
+ * @template-implements Interfaces\Deferred<T>
  *
  * @psalm-suppress PropertyNotSetInConstructor
  *
@@ -40,30 +41,46 @@ final class Deferred implements Interfaces\Deferred
      */
     private $output;
 
+    /**
+     * @var ?\Throwable
+     */
+    private $error;
+
     /**
      * @param iterable<T> $input
      */
     public function __construct(iterable $input)
     {
         $this->input = $input;
+        $this->error = null;
     }
 
     /**
      * @return T
      */
     public function get()
     {
+        if (null !== $this->error) {
+            throw $this->error;
+        }
+
         if (null === $this->input) {
             return $this->output;
         }
 
-        foreach ($this->input as $output) {
-            $this->output = $output;
+        try {
+            foreach ($this->input as $output) {
+                $this->output = $output;
 
-            break;
-        }
+                break;
+            }
+        } catch (\Throwable $e) {
+            $this->error = $e;
 
-        $this->input = null;
+            throw $e;
+        } finally {
+            $this->input = null;
+        }
 
         return $this->output;
     }

src/Immediate.php

@@ -23,6 +23,7 @@
  * Immediate: a wrapper object.
  *
  * @template T
+ * @template-implements Interfaces\Deferred<T>
  *
  * @internal
  */

tests/DeferredTest.php

@@ -84,4 +84,32 @@ private function yieldsNothing(bool $false = false): iterable
             yield 1;
         }
     }
+
+    public function testThrowsSame(): void
+    {
+        $later = new Deferred($this->generatorThrows(true));
+        $e = null;
+
+        try {
+            $this->assertDeferredSame(1, $later);
+            $this->fail('Should have thrown');
+        } catch (\InvalidArgumentException $e) {
+            $this->assertSame(__CLASS__, $e->getMessage());
+        }
+
+        try {
+            $this->assertDeferredSame(1, $later);
+        } catch (\InvalidArgumentException $e2) {
+            $this->assertSame($e, $e2);
+        }
+    }
+
+    private function generatorThrows(bool $throw = false): iterable
+    {
+        if ($throw) {
+            throw new \InvalidArgumentException(__CLASS__);
+        }
+
+        yield 1;
+    }
 }

tests/Examples/Calculator.php

@@ -45,7 +45,7 @@ private function makeDependency(int $number)
 
         for ($i = 1; $i <= $number; ++$i) {
             \usleep(100);
-            $factorial = $factorial * $i;
+            $factorial *= $i;
         }
 
         yield $factorial;

tests/LaterTest.php

@@ -32,7 +32,7 @@ public function testGet(): void
     {
         $later = later(
             /** @return iterable<int> */
-            function (): iterable {
+            static function (): iterable {
                 yield 42;
             }
         );