Refactoring PATCH headers to Base.

Author: ycombinator

lib/OpenCloud/Common/Base.php

@@ -32,6 +32,8 @@
  */
 abstract class Base
 {
+    const PATCH_CONTENT_TYPE = MimeConst::JSON_PATCH;
+
     /**
      * Holds all the properties added by overloading.
      *
@@ -419,4 +421,9 @@ protected static function getJsonHeader()
     {
         return array(HeaderConst::CONTENT_TYPE => MimeConst::JSON);
     }
+
+    protected static function getPatchHeaders()
+    {
+        return array(HeaderConst::CONTENT_TYPE => static::PATCH_CONTENT_TYPE);
+    }
 }

lib/OpenCloud/Common/Constants/Mime.php

@@ -21,4 +21,5 @@ class Mime
 {
     const JSON = 'application/json';
     const TEXT = 'text/plain';
+    const JSON_PATCH = 'application/json-patch+json';
 }

lib/OpenCloud/Image/Resource/Image.php

@@ -35,6 +35,8 @@ class Image extends AbstractSchemaResource implements ImageInterface
     protected static $json_name = '';
     protected static $json_collection_name = 'images';
 
+    const PATCH_CONTENT_TYPE = 'application/openstack-images-v2.1-json-patch';
+
     /**
      * Update this resource
      *
@@ -85,7 +87,7 @@ public function update(array $params, Schema $schema = null)
         $body = $document->toString();
 
         return $this->getClient()
-            ->patch($this->getUrl(), $this->getService()->getPatchHeaders(), $body)
+            ->patch($this->getUrl(), $this->getPatchHeaders(), $body)
             ->send();
     }
 

lib/OpenCloud/Image/Service.php

@@ -17,7 +17,6 @@
 
 namespace OpenCloud\Image;
 
-use OpenCloud\Common\Constants\Header;
 use OpenCloud\Common\Service\CatalogService;
 use OpenCloud\Image\Resource\Image;
 use OpenCloud\Image\Resource\Schema\Schema;
@@ -32,18 +31,6 @@ class Service extends CatalogService
     const DEFAULT_TYPE = 'image';
     const DEFAULT_NAME = 'cloudImages';
 
-    const PATCH_CONTENT_TYPE = 'application/openstack-images-v2.1-json-patch';
-
-    /**
-     * Get the default headers to send for PATCH requests
-     *
-     * @return array
-     */
-    public function getPatchHeaders()
-    {
-        return array(Header::CONTENT_TYPE => self::PATCH_CONTENT_TYPE);
-    }
-
     /**
      * This operation returns images you created, shared images that you accepted, and standard images.
      *

tests/OpenCloud/Tests/Common/BaseTest.php

@@ -36,6 +36,11 @@ public function getBar()
     {
         return $this->bar;
     }
+
+    public static function getPatchHeaders()
+    {
+        return parent::getPatchHeaders();
+    }
 }
 
 class BaseTest extends \OpenCloud\Tests\OpenCloudTestCase
@@ -100,4 +105,14 @@ public function testSetProperty()
         $this->my->setBaz('goodbye');
         $this->assertEquals('goodbye', $this->my->getBaz());
     }
+
+    public function testGetPatchHeaders()
+    {
+        $expectedHeaders = array(
+            'Content-Type' => 'application/json-patch+json'
+        );
+
+        $my = $this->my;
+        $this->assertEquals($expectedHeaders, $my::getPatchHeaders());
+    }
 }

tests/OpenCloud/Tests/Image/Resource/ImageTest.php

@@ -22,11 +22,19 @@
 use OpenCloud\Image\Resource\Schema\Schema;
 use OpenCloud\Tests\OpenCloudTestCase;
 
+class PublicImage extends Image
+{
+    public static function getPatchHeaders()
+    {
+        return parent::getPatchHeaders();
+    }
+}
+
 class ImageTest extends OpenCloudTestCase
 {
     public function setupObjects()
     {
-        $this->image = new Image($this->getClient()->imageService('cloudImages', 'IAD'));
+        $this->image = new PublicImage($this->getClient()->imageService('cloudImages', 'IAD'));
     }
 
     protected function getSchemaData()
@@ -139,4 +147,13 @@ public function test_Delete_Tag()
 
         $this->assertInstanceOf('Guzzle\Http\Message\Response', $this->image->deleteTag(12345));
     }
+
+    public function testGetPatchHeaders()
+    {
+        $expectedHeaders = array(
+            'Content-Type' => 'application/openstack-images-v2.1-json-patch'
+        );
+
+        $this->assertEquals($expectedHeaders, $this->image->getPatchHeaders());
+    }
 }