Changed RecoverableExceptionHandler::__invoke return type ?Promise -> void.

Author: Bilge

src/Connector/AsyncDataSource.php

@@ -3,19 +3,10 @@
 
 namespace ScriptFUSION\Porter\Connector;
 
-use Amp\Promise;
-
 /**
  * Specifies a data source and the necessary parameters required to fetch it asynchronously.
  */
-interface AsyncDataSource
+interface AsyncDataSource extends DataSource
 {
-    /**
-     * Computes the hash code for this object's state. The computed hash must be the same when the object state
-     * is unchanged or is still considered equivalent for cache key purposes, otherwise the hash code must always
-     * be different for different states.
-     *
-     * @return Promise<string> Hash code.
-     */
-    public function computeHash(): Promise;
+    // Intentionally empty. TODO: Remove in next version.
 }

src/Connector/Recoverable/ExponentialAsyncDelayRecoverableExceptionHandler.php

@@ -3,7 +3,6 @@
 
 namespace ScriptFUSION\Porter\Connector\Recoverable;
 
-use Amp\Promise;
 use ScriptFUSION\Retry\ExceptionHandler\AsyncExponentialBackoffExceptionHandler;
 
 /**
@@ -34,8 +33,8 @@ public function initialize(): void
         $this->handler = new AsyncExponentialBackoffExceptionHandler($this->initialDelay);
     }
 
-    public function __invoke(RecoverableException $exception): ?Promise
+    public function __invoke(RecoverableException $exception): void
     {
-        return ($this->handler)();
+        ($this->handler)();
     }
 }

src/Connector/Recoverable/ExponentialSleepRecoverableExceptionHandler.php

@@ -3,7 +3,6 @@
 
 namespace ScriptFUSION\Porter\Connector\Recoverable;
 
-use Amp\Promise;
 use ScriptFUSION\Retry\ExceptionHandler\ExponentialBackoffExceptionHandler;
 
 /**
@@ -34,10 +33,8 @@ public function initialize(): void
         $this->handler = new ExponentialBackoffExceptionHandler($this->initialDelay);
     }
 
-    public function __invoke(RecoverableException $exception): ?Promise
+    public function __invoke(RecoverableException $exception): void
     {
         ($this->handler)();
-
-        return null;
     }
 }

src/Connector/Recoverable/RecoverableExceptionHandler.php

@@ -3,8 +3,6 @@
 
 namespace ScriptFUSION\Porter\Connector\Recoverable;
 
-use Amp\Promise;
-
 /**
  * Provides methods for handling recoverable exceptions.
  *
@@ -28,11 +26,10 @@ interface RecoverableExceptionHandler
     public function initialize(): void;
 
     /**
-     * Handles a recoverable exception. Return value is ignored unless it's a promise.
+     * Handles a recoverable exception. The handler may either throw its own exception to abort the import, or ignore
+     * the exception to continue retrying the import.
      *
      * @param RecoverableException $exception Recoverable exception.
-     *
-     * @return Promise|null Promise that responds with an asynchronous delay or null.
      */
-    public function __invoke(RecoverableException $exception): ?Promise;
+    public function __invoke(RecoverableException $exception): void;
 }

src/Connector/Recoverable/StatelessRecoverableExceptionHandler.php

@@ -3,8 +3,6 @@
 
 namespace ScriptFUSION\Porter\Connector\Recoverable;
 
-use Amp\Promise;
-
 /**
  * Contains a fetch exception handler that does not have private state and therefore does not require initialization.
  */
@@ -25,8 +23,8 @@ final public function initialize(): void
         // Intentionally empty.
     }
 
-    final public function __invoke(RecoverableException $exception): ?Promise
+    final public function __invoke(RecoverableException $exception): void
     {
-        return ($this->handler)($exception);
+        ($this->handler)($exception);
     }
 }

test/Integration/Connector/ImportConnectorTest.php

@@ -102,22 +102,6 @@ public function testStatelessExceptionHandlerNotCloned(): void
         );
     }
 
-    /**
-     * Tests that a recoverable exception handler cannot return false.
-     */
-    public function testExceptionHandlerCannotCancelRetries(): void
-    {
-        $this->expectException(\TypeError::class);
-
-        FixtureFactory::buildImportConnector(
-            \Mockery::mock(Connector::class)
-                ->shouldReceive('fetch')
-                ->andThrow(new TestRecoverableException)
-                ->getMock(),
-            new StatelessRecoverableExceptionHandler(fn () => false)
-        )->fetch($this->source);
-    }
-
     /**
      * Tests that when a user recoverable exception handler throws an exception, the handler's exception can be
      * captured.

test/Stubs/TestRecoverableExceptionHandler.php

@@ -3,7 +3,6 @@
 
 namespace ScriptFUSIONTest\Stubs;
 
-use Amp\Promise;
 use ScriptFUSION\Porter\Connector\Recoverable\RecoverableException;
 use ScriptFUSION\Porter\Connector\Recoverable\RecoverableExceptionHandler;
 
@@ -21,11 +20,9 @@ public function initialize(): void
         })();
     }
 
-    public function __invoke(RecoverableException $exception): ?Promise
+    public function __invoke(RecoverableException $exception): void
     {
         $this->series->next();
-
-        return null;
     }
 
     public function getCurrent()