bug #1126 Fix detection of secondary rate limit (mathieudz)

This PR was squashed before being merged into the 3.12-dev branch. Discussion ---------- Actual error message is "You have exceeded a secondary rate limit and have been temporarily blocked from content creation. Please retry your request again later. If you reach out to GitHub Support for help, please include the request ID [...]" Commits ------- 661fccb Fix detection of secondary rate limit 7d8aeb6 Update secondary rate limit test with new message
KnpLabs · Nov 19, 2023 · 9d19af3 · 9d19af3
1 parent 67398b0
commit 9d19af3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Github/HttpClient/Plugin/GithubExceptionThrower.php b/lib/Github/HttpClient/Plugin/GithubExceptionThrower.php
@@ -128,7 +128,7 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
             }
 
             $reset = (int) ResponseMediator::getHeader($response, 'X-RateLimit-Reset');
-            if ((403 === $response->getStatusCode()) && 0 < $reset && isset($content['message']) && (0 === strpos($content['message'], 'You have exceeded a secondary rate limit.'))) {
+            if ((403 === $response->getStatusCode()) && 0 < $reset && isset($content['message']) && (0 === strpos($content['message'], 'You have exceeded a secondary rate limit'))) {
                 $limit = (int) ResponseMediator::getHeader($response, 'X-RateLimit-Limit');
 
                 throw new ApiLimitExceedException($limit, $reset);

diff --git a/test/Github/Tests/HttpClient/Plugin/GithubExceptionThrowerTest.php b/test/Github/Tests/HttpClient/Plugin/GithubExceptionThrowerTest.php
@@ -103,7 +103,7 @@ public static function responseProvider()
                     ],
                     json_encode(
                         [
-                            'message' => 'You have exceeded a secondary rate limit. Please wait a few minutes before you try again.',
+                            'message' => 'You have exceeded a secondary rate limit and have been temporarily blocked from content creation. Please retry your request again later. If you reach out to GitHub Support for help, please include the request ID #xxxxxxx.',
                         ]
                     )
                 ),
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,7 @@ public static function responseProvider() @@
                         ],
                         json_encode(
                             [
-                                'message' => 'You have exceeded a secondary rate limit. Please wait a few minutes before you try again.',
+                                'message' => 'You have exceeded a secondary rate limit and have been temporarily blocked from content creation. Please retry your request again later. If you reach out to GitHub Support for help, please include the request ID #xxxxxxx.',
                             ]
                         )
                     ),
@@ Expand Down @@