Added content-type header

GrahamCampbell · GrahamCampbell · commit d3fcadac6f7e · 2020-12-04T01:30:15.000Z
diff --git a/src/Api/AbstractApi.php b/src/Api/AbstractApi.php
@@ -302,6 +302,6 @@ 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);
     }
 }
diff --git a/src/Api/Repositories/Workspaces/Downloads.php b/src/Api/Repositories/Workspaces/Downloads.php
@@ -14,6 +14,7 @@
 namespace Bitbucket\Api\Repositories\Workspaces;
 
 use Bitbucket\HttpClient\Message\FileResource;
+use Bitbucket\HttpClient\Message\ResponseMediator;
 use Bitbucket\HttpClient\Util\UriBuilder;
 use Http\Message\MultipartStream\MultipartStreamBuilder;
 
@@ -49,7 +50,7 @@ public function upload(FileResource $file)
     {
         $uri = $this->buildDownloadsUri();
         $builder = (new MultipartStreamBuilder())->addResource($file->getName(), $file->getResource(), $file->getOptions());
-        $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
+        $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
 
         return $this->postRaw($uri, $builder->build(), $headers);
     }
diff --git a/src/Api/Repositories/Workspaces/Issues/Attachments.php b/src/Api/Repositories/Workspaces/Issues/Attachments.php
@@ -14,6 +14,7 @@
 namespace Bitbucket\Api\Repositories\Workspaces\Issues;
 
 use Bitbucket\HttpClient\Message\FileResource;
+use Bitbucket\HttpClient\Message\ResponseMediator;
 use Bitbucket\HttpClient\Util\UriBuilder;
 use Http\Message\MultipartStream\MultipartStreamBuilder;
 
@@ -49,7 +50,7 @@ public function upload(FileResource $file)
     {
         $uri = $this->buildAttachmentsUri();
         $builder = (new MultipartStreamBuilder())->addResource($file->getName(), $file->getResource(), $file->getOptions());
-        $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
+        $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
 
         return $this->postRaw($uri, $builder->build(), $headers);
     }
diff --git a/src/Api/Repositories/Workspaces/Src.php b/src/Api/Repositories/Workspaces/Src.php
@@ -13,6 +13,7 @@
 
 namespace Bitbucket\Api\Repositories\Workspaces;
 
+use Bitbucket\HttpClient\Message\ResponseMediator;
 use Bitbucket\HttpClient\Util\UriBuilder;
 use Http\Message\MultipartStream\MultipartStreamBuilder;
 
@@ -77,7 +78,7 @@ public function createWithFiles(array $files, array $params = [])
             }
         }
 
-        $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
+        $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
 
         return $this->postRaw($uri, $builder->build(), $headers);
     }
diff --git a/src/Api/Snippets.php b/src/Api/Snippets.php
@@ -15,6 +15,7 @@
 
 use Bitbucket\Api\Snippets\Workspaces as SnippetsWorkspaces;
 use Bitbucket\HttpClient\Message\FileResource;
+use Bitbucket\HttpClient\Message\ResponseMediator;
 use Bitbucket\HttpClient\Util\UriBuilder;
 use Http\Message\MultipartStream\MultipartStreamBuilder;
 
@@ -50,7 +51,7 @@ public function create(FileResource $file)
     {
         $uri = $this->buildSnippetsUri();
         $builder = (new MultipartStreamBuilder())->addResource($file->getName(), $file->getResource(), $file->getOptions());
-        $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
+        $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
 
         return $this->postRaw($uri, $builder->build(), $headers);
     }
diff --git a/src/Api/Snippets/Workspaces.php b/src/Api/Snippets/Workspaces.php
@@ -21,6 +21,7 @@
 use Bitbucket\Api\Snippets\Workspaces\Watchers;
 use Bitbucket\Api\Snippets\Workspaces\Watching;
 use Bitbucket\HttpClient\Message\FileResource;
+use Bitbucket\HttpClient\Message\ResponseMediator;
 use Bitbucket\HttpClient\Util\UriBuilder;
 use Http\Message\MultipartStream\MultipartStreamBuilder;
 
@@ -56,7 +57,7 @@ public function create(FileResource $file)
     {
         $uri = $this->buildWorkspacesUri();
         $builder = (new MultipartStreamBuilder())->addResource($file->getName(), $file->getResource(), $file->getOptions());
-        $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
+        $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
 
         return $this->postRaw($uri, $builder->build(), $headers);
     }
@@ -109,7 +110,7 @@ public function updateFiles(string $snippet, array $files)
             $builder->addResource($file->getName(), $file->getResource(), $file->getOptions());
         }
 
-        $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
+        $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
 
         return $this->postRaw($uri, $builder->build(), $headers);
     }
diff --git a/src/Api/Snippets/Workspaces/Files.php b/src/Api/Snippets/Workspaces/Files.php
@@ -13,6 +13,7 @@
 
 namespace Bitbucket\Api\Snippets\Workspaces;
 
+use Bitbucket\HttpClient\Message\ResponseMediator;
 use Bitbucket\HttpClient\Util\UriBuilder;
 use Http\Message\MultipartStream\MultipartStreamBuilder;
 
@@ -87,7 +88,7 @@ public function updateFiles(string $commit, array $files)
             $builder->addResource($file->getName(), $file->getResource(), $file->getOptions());
         }
 
-        $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
+        $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];
 
         return $this->postRaw($uri, $builder->build(), $headers);
     }
diff --git a/src/HttpClient/Message/ResponseMediator.php b/src/HttpClient/Message/ResponseMediator.php
@@ -24,6 +24,13 @@
  */
 final class ResponseMediator
 {
+    /**
+     * The content type header.
+     *
+     * @var string
+     */
+    public const CONTENT_TYPE_HEADER = 'Content-Type';
+
     /**
      * The JSON content type identifier.
      *
@@ -54,7 +61,7 @@ public static function getContent(ResponseInterface $response)
             return [];
         }
 
-        if (0 !== \strpos($response->getHeaderLine('Content-Type'), self::JSON_CONTENT_TYPE)) {
+        if (0 !== \strpos($response->getHeaderLine(self::CONTENT_TYPE_HEADER), self::JSON_CONTENT_TYPE)) {
             throw new RuntimeException(\sprintf('The content type was not %s.', self::JSON_CONTENT_TYPE));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,6 @@ private static function prepareJsonBody(array $params)`
`302`	`302`	`*/`
`303`	`303`	`private static function addJsonContentType(array $headers)`
`304`	`304`	`{`
`305`		`- return \array_merge(['Content-Type' => ResponseMediator::JSON_CONTENT_TYPE], $headers);`
	`305`	`+ return \array_merge([ResponseMediator::CONTENT_TYPE_HEADER => ResponseMediator::JSON_CONTENT_TYPE], $headers);`
`306`	`306`	`}`
`307`	`307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`namespace Bitbucket\Api\Repositories\Workspaces;`
`15`	`15`
`16`	`16`	`use Bitbucket\HttpClient\Message\FileResource;`
	`17`	`+use Bitbucket\HttpClient\Message\ResponseMediator;`
`17`	`18`	`use Bitbucket\HttpClient\Util\UriBuilder;`
`18`	`19`	`use Http\Message\MultipartStream\MultipartStreamBuilder;`
`19`	`20`
`@@ -49,7 +50,7 @@ public function upload(FileResource $file)`
`49`	`50`	`{`
`50`	`51`	`$uri = $this->buildDownloadsUri();`
`51`	`52`	`$builder = (new MultipartStreamBuilder())->addResource($file->getName(), $file->getResource(), $file->getOptions());`
`52`		`- $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];`
	`53`	`+ $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];`
`53`	`54`
`54`	`55`	`return $this->postRaw($uri, $builder->build(), $headers);`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`namespace Bitbucket\Api\Repositories\Workspaces;`
`15`	`15`
	`16`	`+use Bitbucket\HttpClient\Message\ResponseMediator;`
`16`	`17`	`use Bitbucket\HttpClient\Util\UriBuilder;`
`17`	`18`	`use Http\Message\MultipartStream\MultipartStreamBuilder;`
`18`	`19`
`@@ -77,7 +78,7 @@ public function createWithFiles(array $files, array $params = [])`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`
`80`		`- $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];`
	`81`	`+ $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];`
`81`	`82`
`82`	`83`	`return $this->postRaw($uri, $builder->build(), $headers);`
`83`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`use Bitbucket\Api\Snippets\Workspaces as SnippetsWorkspaces;`
`17`	`17`	`use Bitbucket\HttpClient\Message\FileResource;`
	`18`	`+use Bitbucket\HttpClient\Message\ResponseMediator;`
`18`	`19`	`use Bitbucket\HttpClient\Util\UriBuilder;`
`19`	`20`	`use Http\Message\MultipartStream\MultipartStreamBuilder;`
`20`	`21`
`@@ -50,7 +51,7 @@ public function create(FileResource $file)`
`50`	`51`	`{`
`51`	`52`	`$uri = $this->buildSnippetsUri();`
`52`	`53`	`$builder = (new MultipartStreamBuilder())->addResource($file->getName(), $file->getResource(), $file->getOptions());`
`53`		`- $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];`
	`54`	`+ $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];`
`54`	`55`
`55`	`56`	`return $this->postRaw($uri, $builder->build(), $headers);`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`use Bitbucket\Api\Snippets\Workspaces\Watchers;`
`22`	`22`	`use Bitbucket\Api\Snippets\Workspaces\Watching;`
`23`	`23`	`use Bitbucket\HttpClient\Message\FileResource;`
	`24`	`+use Bitbucket\HttpClient\Message\ResponseMediator;`
`24`	`25`	`use Bitbucket\HttpClient\Util\UriBuilder;`
`25`	`26`	`use Http\Message\MultipartStream\MultipartStreamBuilder;`
`26`	`27`
`@@ -56,7 +57,7 @@ public function create(FileResource $file)`
`56`	`57`	`{`
`57`	`58`	`$uri = $this->buildWorkspacesUri();`
`58`	`59`	`$builder = (new MultipartStreamBuilder())->addResource($file->getName(), $file->getResource(), $file->getOptions());`
`59`		`- $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];`
	`60`	`+ $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];`
`60`	`61`
`61`	`62`	`return $this->postRaw($uri, $builder->build(), $headers);`
`62`	`63`	`}`
`@@ -109,7 +110,7 @@ public function updateFiles(string $snippet, array $files)`
`109`	`110`	`$builder->addResource($file->getName(), $file->getResource(), $file->getOptions());`
`110`	`111`	`}`
`111`	`112`
`112`		`- $headers = ['Content-Type' => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];`
	`113`	`+ $headers = [ResponseMediator::CONTENT_TYPE_HEADER => \sprintf('multipart/form-data; boundary="%s"', $builder->getBoundary())];`
`113`	`114`
`114`	`115`	`return $this->postRaw($uri, $builder->build(), $headers);`
`115`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,13 @@`
`24`	`24`	`*/`
`25`	`25`	`final class ResponseMediator`
`26`	`26`	`{`
	`27`	`+ /**`
	`28`	`+ * The content type header.`
	`29`	`+ *`
	`30`	`+ * @var string`
	`31`	`+ */`
	`32`	`+ public const CONTENT_TYPE_HEADER = 'Content-Type';`
	`33`	`+`
`27`	`34`	`/**`
`28`	`35`	`* The JSON content type identifier.`
`29`	`36`	`*`
`@@ -54,7 +61,7 @@ public static function getContent(ResponseInterface $response)`
`54`	`61`	`return [];`
`55`	`62`	`}`
`56`	`63`
`57`		`- if (0 !== \strpos($response->getHeaderLine('Content-Type'), self::JSON_CONTENT_TYPE)) {`
	`64`	`+ if (0 !== \strpos($response->getHeaderLine(self::CONTENT_TYPE_HEADER), self::JSON_CONTENT_TYPE)) {`
`58`	`65`	`throw new RuntimeException(\sprintf('The content type was not %s.', self::JSON_CONTENT_TYPE));`
`59`	`66`	`}`
`60`	`67`