Do not use defer (#111)

* Do not use defer * Reverted tests
php-http · Oct 9, 2018 · 54a4fc9 · 54a4fc9
1 parent f77e88b
commit 54a4fc9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 34 deletions.
diff --git a/spec/Plugin/RetryPluginSpec.php b/spec/Plugin/RetryPluginSpec.php
@@ -30,9 +30,7 @@ function it_returns_response(RequestInterface $request, ResponseInterface $respo
             }
         };
 
-        $promise = $this->handleRequest($request, $next, function () {});
-        $promise->shouldReturnAnInstanceOf('Http\Client\Common\Deferred');
-        $promise->wait()->shouldReturn($response);
+        $this->handleRequest($request, $next, function () {})->shouldReturnAnInstanceOf('Http\Client\Promise\HttpFulfilledPromise');
     }
 
     function it_throws_exception_on_multiple_exceptions(RequestInterface $request)
@@ -55,7 +53,7 @@ function it_throws_exception_on_multiple_exceptions(RequestInterface $request)
         };
 
         $promise = $this->handleRequest($request, $next, function () {});
-        $promise->shouldReturnAnInstanceOf('Http\Client\Common\Deferred');
+        $promise->shouldReturnAnInstanceOf('Http\Client\Promise\HttpRejectedPromise');
         $promise->shouldThrow($exception2)->duringWait();
     }
 
@@ -78,7 +76,7 @@ function it_returns_response_on_second_try(RequestInterface $request, ResponseIn
         };
 
         $promise = $this->handleRequest($request, $next, function () {});
-        $promise->shouldReturnAnInstanceOf('Http\Client\Common\Deferred');
+        $promise->shouldReturnAnInstanceOf('Http\Client\Promise\HttpFulfilledPromise');
         $promise->wait()->shouldReturn($response);
     }
 
@@ -100,13 +98,8 @@ function it_does_not_keep_history_of_old_failure(RequestInterface $request, Resp
             }
         };
 
-        $promise = $this->handleRequest($request, $next, function () {});
-        $promise->shouldReturnAnInstanceOf('Http\Client\Common\Deferred');
-        $promise->wait()->shouldReturn($response);
-
-        $promise = $this->handleRequest($request, $next, function () {});
-        $promise->shouldReturnAnInstanceOf('Http\Client\Common\Deferred');
-        $promise->wait()->shouldReturn($response);
+        $this->handleRequest($request, $next, function () {})->shouldReturnAnInstanceOf('Http\Client\Promise\HttpFulfilledPromise');
+        $this->handleRequest($request, $next, function () {})->shouldReturnAnInstanceOf('Http\Client\Promise\HttpFulfilledPromise');
     }
 
     function it_has_an_exponential_default_delay(RequestInterface $request, Exception\HttpException $exception)

diff --git a/src/Plugin/RetryPlugin.php b/src/Plugin/RetryPlugin.php
@@ -2,7 +2,6 @@
 
 namespace Http\Client\Common\Plugin;
 
-use Http\Client\Common\Deferred;
 use Http\Client\Common\Plugin;
 use Http\Client\Exception;
 use Psr\Http\Message\RequestInterface;
@@ -77,31 +76,20 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
     {
         $chainIdentifier = spl_object_hash((object) $first);
 
-        $promise = $next($request);
-        $deferred = new Deferred(function () use ($promise) {
-            $promise->wait(false);
-        });
-
-        $onFulfilled = function (ResponseInterface $response) use ($chainIdentifier, $deferred) {
+        return $next($request)->then(function (ResponseInterface $response) use ($request, $chainIdentifier) {
             if (array_key_exists($chainIdentifier, $this->retryStorage)) {
                 unset($this->retryStorage[$chainIdentifier]);
             }
 
-            $deferred->resolve($response);
-
             return $response;
-        };
-
-        $onRejected = function (Exception $exception) use ($request, $next, $onFulfilled, &$onRejected, $chainIdentifier, $deferred) {
+        }, function (Exception $exception) use ($request, $next, $first, $chainIdentifier) {
             if (!array_key_exists($chainIdentifier, $this->retryStorage)) {
                 $this->retryStorage[$chainIdentifier] = 0;
             }
 
             if ($this->retryStorage[$chainIdentifier] >= $this->retry) {
                 unset($this->retryStorage[$chainIdentifier]);
 
-                $deferred->reject($exception);
-
                 throw $exception;
             }
 
@@ -114,15 +102,10 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
 
             // Retry in synchrone
             ++$this->retryStorage[$chainIdentifier];
+            $promise = $this->handleRequest($request, $next, $first);
 
-            $next($request)->then($onFulfilled, $onRejected);
-
-            throw $exception;
-        };
-
-        $promise->then($onFulfilled, $onRejected);
-
-        return $deferred;
+            return $promise->wait();
+        });
     }
 
     /**