Changed AsyncConnector to return Promise instead of mixed (usually generator).

Changed PorterTest base to AsyncTestCase.
Added PHP 7.3 to Travis.

Author: Bilge

.travis.yml

@@ -8,6 +8,7 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
 
 env:
   matrix:

composer.json

@@ -18,6 +18,7 @@
     "psr/cache": "^1"
   },
   "require-dev": {
+    "amphp/phpunit-util": "^1.1",
     "phpunit/phpunit": "^7.1.3",
     "mockery/mockery": "^1.1"
   },

src/Connector/AsyncConnector.php

@@ -3,6 +3,8 @@
 
 namespace ScriptFUSION\Porter\Connector;
 
+use Amp\Promise;
+
 /**
  * Provides a method for fetching data from a remote source asynchronously.
  */
@@ -13,7 +15,7 @@ interface AsyncConnector
      *
      * @param string $source Source.
      *
-     * @return mixed Async generator function or any return value compatible with Amp\call.
+     * @return Promise Fetched data.
      */
-    public function fetchAsync(string $source);
+    public function fetchAsync(string $source): Promise;
 }

src/Connector/ImportConnector.php

@@ -8,7 +8,6 @@
 use ScriptFUSION\Porter\Connector\Recoverable\RecoverableException;
 use ScriptFUSION\Porter\Connector\Recoverable\RecoverableExceptionHandler;
 use ScriptFUSION\Porter\Connector\Recoverable\StatelessRecoverableExceptionHandler;
-use function Amp\call;
 use function Amp\Promise\all;
 use function ScriptFUSION\Retry\retry;
 use function ScriptFUSION\Retry\retryAsync;
@@ -83,11 +82,7 @@ public function fetchAsync(string $source): Promise
         return retryAsync(
             $this->maxFetchAttempts,
             function () use ($source): Promise {
-                return call(
-                    function () use ($source) {
-                        return $this->connector->fetchAsync($source);
-                    }
-                );
+                return $this->connector->fetchAsync($source);
             },
             $this->createExceptionHandler()
         );

test/Integration/Porter/PorterAsyncTest.php

@@ -22,21 +22,17 @@ protected function setUp(): void
         $this->specification = new AsyncImportSpecification($this->resource);
     }
 
-    public function testImportAsync(): void
+    public function testImportAsync(): \Generator
     {
-        Loop::run(function () {
-            $records = $this->porter->importAsync($this->specification);
+        $records = $this->porter->importAsync($this->specification);
 
-            self::assertTrue(yield $records->advance());
-            self::assertSame(['foo'], $records->getCurrent());
-        });
+        self::assertTrue(yield $records->advance());
+        self::assertSame(['foo'], $records->getCurrent());
     }
 
-    public function testImportOneAsync(): void
+    public function testImportOneAsync(): \Generator
     {
-        Loop::run(function () {
-            self::assertSame(['foo'], yield $this->porter->importOneAsync($this->specification));
-        });
+        self::assertSame(['foo'], yield $this->porter->importOneAsync($this->specification));
     }
 
     /**

test/Integration/Porter/PorterTest.php

@@ -3,9 +3,9 @@
 
 namespace ScriptFUSIONTest\Integration\Porter;
 
+use Amp\PHPUnit\AsyncTestCase;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery\MockInterface;
-use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use ScriptFUSION\Porter\Connector\AsyncConnector;
 use ScriptFUSION\Porter\Connector\Connector;
@@ -18,7 +18,7 @@
 use ScriptFUSION\Porter\Specification\ImportSpecification;
 use ScriptFUSIONTest\MockFactory;
 
-abstract class PorterTest extends TestCase
+abstract class PorterTest extends AsyncTestCase
 {
     use MockeryPHPUnitIntegration;
 
@@ -54,6 +54,8 @@ abstract class PorterTest extends TestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->porter = new Porter($this->container = \Mockery::spy(ContainerInterface::class));
 
         $this->registerProvider($this->provider = MockFactory::mockProvider());