Merge branch '2.x'

* 2.x:
  bug #992 fixed php warning in GithubExceptionThrower (clxmstaab, acrobat)
  phpdoc: fix typo
  Update changelog for 2.19.2 release

Author: acrobat

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.19.2
+
+### Changed
+- Improved bc check ([acrobat](https://github.com/acrobat)) [#982](https://github.com/KnpLabs/php-github-api/issues/982)
+- Correctly link to github actions docs and fix backlinks ([acrobat](https://github.com/acrobat)) [#983](https://github.com/KnpLabs/php-github-api/issues/983)
+- Add missing repo hooks documentation ([acrobat](https://github.com/acrobat)) [#987](https://github.com/KnpLabs/php-github-api/issues/987)
+- Fix incorrect public key documentation ([acrobat](https://github.com/acrobat)) [#988](https://github.com/KnpLabs/php-github-api/issues/988)
+- Fixed incorrect parameters in apps docs ([acrobat](https://github.com/acrobat)) [#989](https://github.com/KnpLabs/php-github-api/issues/989)
+
+### Fixed
+- Deployments: use proper media-type for in_progress/queued, inactive state ([staabm](https://github.com/staabm)) [#979](https://github.com/KnpLabs/php-github-api/issues/979)
+- backported #979 into 2.x ([staabm](https://github.com/staabm)) [#981](https://github.com/KnpLabs/php-github-api/issues/981)
+- [952] doc - Specify lcobucci/jwt version, fix deprecation ([amacrobert-meq](https://github.com/amacrobert-meq), [acrobat](https://github.com/acrobat)) [#953](https://github.com/KnpLabs/php-github-api/issues/953)
+- Replace deprecated organization team repository add/remove urls ([acrobat](https://github.com/acrobat)) [#985](https://github.com/KnpLabs/php-github-api/issues/985)
+
 ## 2.19.1
 
 ### Fixed

lib/Github/Api/Deployment.php

@@ -78,7 +78,7 @@ public function create($username, $repository, array $params)
      * @param int    $id         the deployment number
      * @param array  $params     The information about the deployment update.
      *                           Must include a "state" field of pending, success, error, or failure.
-     *                           May also be given a target_url and description, ßee link for more details.
+     *                           May also be given a target_url and description, see link for more details.
      *
      * @throws MissingArgumentException
      *

lib/Github/HttpClient/Plugin/GithubExceptionThrower.php

@@ -56,7 +56,7 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
                 if (422 === $response->getStatusCode() && isset($content['errors'])) {
                     $errors = [];
                     foreach ($content['errors'] as $error) {
-                        switch ($error['code']) {
+                        switch ($error['code'] ?? null) {
                             case 'missing':
                                 $errors[] = sprintf('The %s %s does not exist, for resource "%s"', $error['field'], $error['value'], $error['resource']);
                                 break;
@@ -78,6 +78,12 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
                                 break;
 
                             default:
+                                if (is_string($error)) {
+                                    $errors[] = $error;
+
+                                    break;
+                                }
+
                                 if (isset($error['message'])) {
                                     $errors[] = $error['message'];
                                 }

test/Github/Tests/HttpClient/Plugin/GithubExceptionThrowerTest.php

@@ -49,7 +49,7 @@ function (RequestInterface $request) use ($promise) {
         if ($exception) {
             $this->expectException(get_class($exception));
             $this->expectExceptionCode($exception->getCode());
-            $this->expectExceptionMessage($exception->getMessage());
+            $this->expectExceptionMessageRegExp('/'.preg_quote($exception->getMessage(), '/').'$/');
         }
 
         $result->wait();
@@ -200,6 +200,22 @@ public static function responseProvider()
                 ),
                 'exception' => new \Github\Exception\RuntimeException('This endpoint requires you to be authenticated.', 401),
             ],
+            'Cannot delete active deployment' => [
+                'response' => new Response(
+                    422,
+                    [
+                        'content-type' => 'application/json',
+                    ],
+                    json_encode(
+                        [
+                            'message' => 'Validation Failed',
+                            'errors' => ['We cannot delete an active deployment unless it is the only deployment in a given environment.'],
+                            'documentation_url' => 'https://docs.github.com/rest/reference/repos#delete-a-deployment',
+                        ]
+                    )
+                ),
+                'exception' => new \Github\Exception\ValidationFailedException('Validation Failed: We cannot delete an active deployment unless it is the only deployment in a given environment.', 422),
+            ],
         ];
     }
 }