Merge branch '10.4' into 11.0

Author: GrahamCampbell

CHANGELOG.md

@@ -14,7 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [10.4.0] - UPCOMING
 
-[10.4.0]: https://github.com/GitLabPHP/Client/compare/10.3.0...10.4.0
+[10.4.0]: https://github.com/GitLabPHP/Client/compare/10.3.1...10.4.0
+
+## [10.3.1] - 2020-12-04
+
+* Work around GitLab's API returning bad JSON for some endpoints
+
+[10.3.0]: https://github.com/GitLabPHP/Client/compare/10.3.0...10.3.1
 
 ## [10.3.0] - 2020-11-27
 

src/Api/AbstractApi.php

@@ -271,7 +271,7 @@ private function createMultipartStreamBuilder(array $params = [], array $files =
         foreach ($files as $name => $file) {
             $builder->addResource($name, self::tryFopen($file, 'r'), [
                 'headers' => [
-                    'Content-Type' => self::guessFileContentType($file),
+                    ResponseMediator::CONTENT_TYPE_HEADER => self::guessFileContentType($file),
                 ],
                 'filename' => \basename($file),
             ]);
@@ -304,7 +304,7 @@ private static function addMultipartContentType(array $headers, MultipartStreamB
     {
         $contentType = \sprintf('%s; boundary=%s', ResponseMediator::MULTIPART_CONTENT_TYPE, $builder->getBoundary());
 
-        return \array_merge(['Content-Type' => $contentType], $headers);
+        return \array_merge([ResponseMediator::CONTENT_TYPE_HEADER => $contentType], $headers);
     }
 
     /**
@@ -336,7 +336,7 @@ private static function prepareJsonBody(array $params)
      */
     private static function addJsonContentType(array $headers)
     {
-        return \array_merge(['Content-Type' => ResponseMediator::JSON_CONTENT_TYPE], $headers);
+        return \array_merge([ResponseMediator::CONTENT_TYPE_HEADER => ResponseMediator::JSON_CONTENT_TYPE], $headers);
     }
 
     /**

src/Api/Groups.php

@@ -12,13 +12,14 @@ class Groups extends AbstractApi
     /**
      * @param array $parameters {
      *
-     *     @var int[]  $skip_groups   skip the group IDs passes
-     *     @var bool   $all_available show all the groups you have access to
-     *     @var string $search        return list of authorized groups matching the search criteria
-     *     @var string $order_by      Order groups by name or path (default is name)
-     *     @var string $sort          Order groups in asc or desc order (default is asc)
-     *     @var bool   $statistics    include group statistics (admins only)
-     *     @var bool   $owned         limit by groups owned by the current user
+     *     @var int[]  $skip_groups      skip the group IDs passes
+     *     @var bool   $all_available    show all the groups you have access to
+     *     @var string $search           return list of authorized groups matching the search criteria
+     *     @var string $order_by         Order groups by name or path (default is name)
+     *     @var string $sort             Order groups in asc or desc order (default is asc)
+     *     @var bool   $statistics       include group statistics (admins only)
+     *     @var bool   $owned            limit by groups owned by the current user
+     *     @var int    $min_access_level limit by groups in which the current user has at least this access level
      * }
      *
      * @return mixed
@@ -446,6 +447,9 @@ private function getGroupSearchResolver()
             ->setAllowedTypes('owned', 'bool')
             ->setNormalizer('owned', $booleanNormalizer)
         ;
+        $resolver->setDefined('min_access_level')
+            ->setAllowedValues('min_access_level', [null, 10, 20, 30, 40, 50])
+        ;
 
         return $resolver;
     }

src/HttpClient/Message/ResponseMediator.php

@@ -13,6 +13,13 @@
  */
 final class ResponseMediator
 {
+    /**
+     * The content type header.
+     *
+     * @var string
+     */
+    public const CONTENT_TYPE_HEADER = 'Content-Type';
+
     /**
      * The JSON content type identifier.
      *
@@ -45,7 +52,7 @@ public static function getContent(ResponseInterface $response)
     {
         $body = (string) $response->getBody();
 
-        if ('' !== $body && 0 === \strpos($response->getHeaderLine('Content-Type'), self::JSON_CONTENT_TYPE)) {
+        if (!\in_array($body, ['', 'null', 'true', 'false'], true) && 0 === \strpos($response->getHeaderLine(self::CONTENT_TYPE_HEADER), self::JSON_CONTENT_TYPE)) {
             return JsonArray::decode($body);
         }