Merge pull request #88 from php-tmdb/feature/427-retry-after

Feature/427 retry after

Author: wtfzdotnet

.travis.yml

@@ -7,7 +7,7 @@ php:
   - hhvm
 
 before_script:
-  - composer --prefer-source install
+  - composer self-update
 
 script: phpunit --coverage-text --coverage-clover=coverage.clover --verbose
 

lib/Tmdb/HttpClient/Adapter/GuzzleAdapter.php

@@ -49,16 +49,31 @@ public function __construct(ClientInterface $client = null, array $options = [])
      */
     public function registerSubscribers(EventDispatcherInterface $eventDispatcher)
     {
-        // Retry 500 and 503 responses that were sent as GET and HEAD requests.
         $filter = RetrySubscriber::createChainFilter([
-            // Does early filter to force non-idempotent methods to NOT be retried.
             RetrySubscriber::createIdempotentFilter(),
-            // Performs the last check, returning ``true`` or ``false`` based on
-            // if the response received a 500 or 503 status code.
-            RetrySubscriber::createStatusFilter([500, 503])
+            RetrySubscriber::createStatusFilter([427, 500, 503])
+        ]);
+
+        $retry = new RetrySubscriber([
+            'filter' => $filter,
+            'delay'  => function ($number, $event) {
+                /** @var \GuzzleHttp\Message\Response $response */
+                if (null !== $response = $event->getResponse() && $event->getResponse()->getStatusCode() === 427) {
+                    $time    = microtime(true);
+                    $resetAt = (int) $response->getHeader('X-RateLimit-Reset');
+
+                    $sleep = $resetAt - $time;
+
+                    if ($sleep >= 0) {
+                        return $sleep * 1000;
+                    }
+                }
+
+                return 0;
+            },
+            'max' => 3
         ]);
 
-        $retry = new RetrySubscriber(['filter' => $filter]);
         $this->client->getEmitter()->attach($retry);
     }
 

lib/Tmdb/Model/Query/Discover/DiscoverMoviesQuery.php

@@ -152,13 +152,21 @@ public function primaryReleaseYear($year)
      * @param  \DateTime|integer $year
      * @return $this
      */
-    public function primaryReleaseYearGte($year)
+    public function primaryReleaseDateGte($year)
     {
-        $this->set('primary_release_year.gte', $this->getDate($year));
+        $this->set('primary_release_date.gte', $this->getDate($year));
 
         return $this;
     }
 
+    /**
+     * @deprecated
+     */
+    public function primaryReleaseYearGte($year)
+    {
+        return $this->primaryReleaseDateGte($year);
+    }
+
     /**
      * Filter by the primary release date and only include those which are less than or equal to the specified value.
      *
@@ -167,13 +175,21 @@ public function primaryReleaseYearGte($year)
      * @param  \DateTime|integer $year
      * @return $this
      */
-    public function primaryReleaseYearLte($year)
+    public function primaryReleaseDateLte($year)
     {
-        $this->set('primary_release_year.lte', $this->getDate($year));
+        $this->set('primary_release_date.lte', $this->getDate($year));
 
         return $this;
     }
 
+    /**
+     * @deprecated
+     */
+    public function primaryReleaseYearLte($year)
+    {
+        return $this->primaryReleaseDateLte($year);
+    }
+
     /**
      * Filter by all available release dates and only include those which are greater or equal to the specified value.
      *