Merge pull request #42 from M6Web/fix/amp-writabel-stream

(test) Update amp test because of a library change
BedrockStreaming · Mar 18, 2021 · e9bf5e7 · e9bf5e7
2 parents 6bb5396 + f0ac54a
commit e9bf5e7
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 55 deletions.
diff --git a/composer.json b/composer.json
@@ -7,15 +7,16 @@
         {
             "name": "M6Web",
             "email": "[email protected]",
-            "homepage": "http://tech.m6web.fr/"
+            "homepage": "https://tech.bedrockstreaming.com"
         }
     ],
     "autoload": {
         "psr-4": {"M6Web\\Tornado\\": "src/"}
     },
     "autoload-dev": {
         "psr-4": {
-            "M6WebTest\\Tornado\\": "tests/"
+            "M6WebTest\\Tornado\\": "tests/",
+            "M6WebExamples\\Tornado\\": "examples/"
         }
     },
     "require": {

diff --git a/examples/00-README-samples.php b/examples/00-README-samples.php
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+namespace M6WebExamples\Tornado;
+
 require __DIR__.'/../vendor/autoload.php';
 
 use GuzzleHttp\Psr7;

diff --git a/examples/01-async-countdown.php b/examples/01-async-countdown.php
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+namespace M6WebExamples\Tornado;
+
 require __DIR__.'/../vendor/autoload.php';
 
 use M6Web\Tornado\Adapter;

diff --git a/examples/02-failures.php b/examples/02-failures.php
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+namespace M6WebExamples\Tornado;
+
 require __DIR__.'/../vendor/autoload.php';
 
 use M6Web\Tornado\Adapter;

diff --git a/examples/03-http-client.php b/examples/03-http-client.php
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+namespace M6WebExamples\Tornado;
+
 require __DIR__.'/../vendor/autoload.php';
 
 use M6Web\Tornado\Adapter;

diff --git a/examples/04-foreach.php b/examples/04-foreach.php
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+namespace M6WebExamples\Tornado;
+
 require __DIR__.'/../vendor/autoload.php';
 
 use M6Web\Tornado\Adapter;

diff --git a/examples/tests/ExamplesTest.php → examples/Tests/ExamplesTest.php b/examples/tests/ExamplesTest.php → examples/Tests/ExamplesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace M6WebExamplesTest\Tornado;
+namespace M6WebExamples\Tornado\Tests;
 
 use PHPUnit\Framework\TestCase;
 

diff --git a/src/Adapter/Amp/Internal/Deferred.php b/src/Adapter/Amp/Internal/Deferred.php
@@ -10,14 +10,10 @@
  */
 class Deferred implements \M6Web\Tornado\Deferred
 {
-    /**
-     * @var \Amp\Deferred
-     */
+    /** @var \Amp\Deferred */
     private $ampDeferred;
 
-    /**
-     * @var PromiseWrapper
-     */
+    /** @var PromiseWrapper */
     private $promise;
 
     public function __construct(\Amp\Deferred $ampDeferred, PromiseWrapper $promise)

diff --git a/src/Adapter/Amp/Internal/PromiseWrapper.php b/src/Adapter/Amp/Internal/PromiseWrapper.php
@@ -11,9 +11,7 @@
  */
 class PromiseWrapper implements Promise
 {
-    /**
-     * @var \Amp\Promise
-     */
+    /** @var \Amp\Promise */
     private $ampPromise;
 
     /** @var bool */

diff --git a/src/Adapter/Guzzle/CurlMultiClientWrapper.php b/src/Adapter/Guzzle/CurlMultiClientWrapper.php
@@ -4,14 +4,10 @@
 
 final class CurlMultiClientWrapper implements GuzzleClientWrapper
 {
-    /**
-     * @var \GuzzleHttp\Handler\CurlMultiHandler
-     */
+    /** @var \GuzzleHttp\Handler\CurlMultiHandler */
     private $curlMultiHandler;
 
-    /**
-     * @var \GuzzleHttp\Client
-     */
+    /** @var \GuzzleHttp\Client */
     private $guzzleClient;
 
     /**

diff --git a/src/Adapter/Guzzle/HttpClient.php b/src/Adapter/Guzzle/HttpClient.php
@@ -10,14 +10,10 @@
 
 class HttpClient implements \M6Web\Tornado\HttpClient
 {
-    /**
-     * @var EventLoop
-     */
+    /** @var EventLoop */
     private $eventLoop;
 
-    /**
-     * @var GuzzleClientWrapper
-     */
+    /** @var GuzzleClientWrapper */
     private $clientWrapper;
 
     private $nbConcurrentRequests = 0;

diff --git a/src/Adapter/ReactPhp/EventLoop.php b/src/Adapter/ReactPhp/EventLoop.php
@@ -196,7 +196,7 @@ public function delay(int $milliseconds): Promise
     {
         $deferred = $this->deferred();
         $this->reactEventLoop->addTimer(
-            $milliseconds / 1000 /* milliseconds per second */,
+            $milliseconds / 1000 /* milliseconds per second */ ,
             function () use ($deferred) {
                 $deferred->resolve(null);
             }

diff --git a/src/Adapter/ReactPhp/Internal/Deferred.php b/src/Adapter/ReactPhp/Internal/Deferred.php
@@ -10,14 +10,10 @@
  */
 class Deferred implements \M6Web\Tornado\Deferred
 {
-    /**
-     * @var \React\Promise\Deferred
-     */
+    /** @var \React\Promise\Deferred */
     private $reactDeferred;
 
-    /**
-     * @var PromiseWrapper
-     */
+    /** @var PromiseWrapper */
     private $promise;
 
     public function __construct(\React\Promise\Deferred $reactDeferred, PromiseWrapper $promiseWrapper)

diff --git a/src/Adapter/ReactPhp/Internal/PromiseWrapper.php b/src/Adapter/ReactPhp/Internal/PromiseWrapper.php
@@ -11,9 +11,7 @@
  */
 class PromiseWrapper implements Promise
 {
-    /**
-     * @var \React\Promise\PromiseInterface
-     */
+    /** @var \React\Promise\PromiseInterface */
     private $reactPromise;
 
     /** @var bool */

diff --git a/src/Adapter/Tornado/Internal/StreamEventLoop.php b/src/Adapter/Tornado/Internal/StreamEventLoop.php
@@ -9,17 +9,11 @@
  */
 class StreamEventLoop
 {
-    /**
-     * @var resource[]
-     */
+    /** @var resource[] */
     private $readStreams = [];
-    /**
-     * @var resource[]
-     */
+    /** @var resource[] */
     private $writeStreams = [];
-    /**
-     * @var PendingPromise[]
-     */
+    /** @var PendingPromise[] */
     private $pendingPromises = [];
 
     public function readable(EventLoop $eventLoop, $stream): PendingPromise

diff --git a/src/Adapter/Tornado/SynchronousEventLoop.php b/src/Adapter/Tornado/SynchronousEventLoop.php
@@ -7,9 +7,7 @@
 
 class SynchronousEventLoop implements \M6Web\Tornado\EventLoop
 {
-    /**
-     * @var \Throwable[]
-     */
+    /** @var \Throwable[] */
     private $asyncThrowables = [];
 
     /**

diff --git a/tests/Adapter/Amp/EventLoopTest.php b/tests/Adapter/Amp/EventLoopTest.php
@@ -17,4 +17,20 @@ public function testStreamShouldReadFromWritable($expectedSequence = '')
         // Because Amp resolve promises in a slightly different order.
         parent::testStreamShouldReadFromWritable('W0R0W12345R12R34W6R56R');
     }
+
+    public function testStreamShouldNotBeWritableIfClosed()
+    {
+        assert_options(ASSERT_EXCEPTION, 1);
+        $this->expectException(\Throwable::class);
+
+        parent::testStreamShouldNotBeWritableIfClosed();
+    }
+
+    public function testStreamShouldNotBeReadableIfClosed()
+    {
+        assert_options(ASSERT_EXCEPTION, 1);
+        $this->expectException(\Throwable::class);
+
+        parent::testStreamShouldNotBeReadableIfClosed();
+    }
 }
diff --git a/tests/Adapter/Guzzle/GuzzleMockWrapper.php b/tests/Adapter/Guzzle/GuzzleMockWrapper.php
@@ -7,19 +7,13 @@
 
 final class GuzzleMockWrapper implements GuzzleClientWrapper
 {
-    /**
-     * @var \GuzzleHttp\Client
-     */
+    /** @var \GuzzleHttp\Client */
     private $guzzleClient;
 
-    /**
-     * @var array
-     */
+    /** @var array */
     private $transactions = [];
 
-    /**
-     * @var int
-     */
+    /** @var int */
     public $ticks;
 
     public function __construct(array $queue)