Merge branch 'KnpLabs:master' into master

Author: Ha-Moham

CHANGELOG-3.X.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 3.13.0
+
+### Added
+- Test against php 8.3 ([sergiy-petrov](https://github.com/sergiy-petrov)) [#1124](https://github.com/KnpLabs/php-github-api/issues/1124)
+- feat: Secret Scanning Alerts ([haridarshan](https://github.com/haridarshan)) [#1114](https://github.com/KnpLabs/php-github-api/issues/1114)
+- feat: User Migration ([haridarshan](https://github.com/haridarshan)) [#1115](https://github.com/KnpLabs/php-github-api/issues/1115)
+
+### Changed
+- General chores ([acrobat](https://github.com/acrobat)) [#1125](https://github.com/KnpLabs/php-github-api/issues/1125)
+
+### Fixed
+- Fix detection of secondary rate limit ([mathieudz](https://github.com/mathieudz)) [#1126](https://github.com/KnpLabs/php-github-api/issues/1126)
+
 ## 3.12.0
 
 ### Added

composer.json

@@ -52,7 +52,7 @@
     "extra": {
         "branch-alias": {
             "dev-2.x": "2.20.x-dev",
-            "dev-master": "3.12-dev"
+            "dev-master": "3.13-dev"
         }
     },
     "config": {

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);

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.',
                         ]
                     )
                 ),