Merge branch '6.13' into 7.2

ezpublishlegacy · Sep 20, 2018 · b7dca05 · b7dca05
2 parents b67b8a4 + 99dba26
commit b7dca05
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/eZ/Publish/Core/REST/Common/Output/Generator.php b/eZ/Publish/Core/REST/Common/Output/Generator.php
@@ -302,6 +302,8 @@ abstract public function getMediaType($name);
     /**
      * Generates a media type from $name and $type.
      *
+     * @deprecated 6.13.5 please start to use generateMediaTypeWithVendor()
+     *
      * @param string $name
      * @param string $type
      *
@@ -312,6 +314,20 @@ protected function generateMediaType($name, $type)
         return "application/vnd.ez.api.{$name}+{$type}";
     }
 
+    /**
+     * Generates a media type from $name, $type and $vendor.
+     *
+     * @param string $name
+     * @param string $type
+     * @param string $vendor
+     *
+     * @return string
+     */
+    protected function generateMediaTypeWithVendor($name, $type, $vendor = 'vnd.ez.api')
+    {
+        return "application/{$vendor}.{$name}+{$type}";
+    }
+
     /**
      * Generates a generic representation of the scalar, hash or list given in
      * $hashValue into the document, using an element of $hashElementName as

diff --git a/eZ/Publish/Core/REST/Common/Output/Generator/Json.php b/eZ/Publish/Core/REST/Common/Output/Generator/Json.php
@@ -36,12 +36,21 @@ class Json extends Generator
      */
     protected $isEmpty = true;
 
+    /**
+     * Enables developer to modify REST response media type prefix.
+     *
+     * @var string
+     */
+    protected $vendor;
+
     /**
      * @param \eZ\Publish\Core\REST\Common\Output\Generator\Json\FieldTypeHashGenerator $fieldTypeHashGenerator
+     * @param string $vendor
      */
-    public function __construct(Json\FieldTypeHashGenerator $fieldTypeHashGenerator)
+    public function __construct(Json\FieldTypeHashGenerator $fieldTypeHashGenerator, $vendor = 'vnd.ez.api')
     {
         $this->fieldTypeHashGenerator = $fieldTypeHashGenerator;
+        $this->vendor = $vendor;
     }
 
     /**
@@ -292,7 +301,7 @@ public function endAttribute($name)
      */
     public function getMediaType($name)
     {
-        return $this->generateMediaType($name, 'json');
+        return $this->generateMediaTypeWithVendor($name, 'json', $this->vendor);
     }
 
     /**

diff --git a/eZ/Publish/Core/REST/Common/Output/Generator/Xml.php b/eZ/Publish/Core/REST/Common/Output/Generator/Xml.php
@@ -36,12 +36,21 @@ class Xml extends Generator
      */
     protected $isEmpty = true;
 
+    /**
+     * Enables developer to modify REST response media type prefix.
+     *
+     * @var string
+     */
+    protected $vendor;
+
     /**
      * @param \eZ\Publish\Core\REST\Common\Output\Generator\Xml\FieldTypeHashGenerator $hashGenerator
+     * @param string $vendor
      */
-    public function __construct(Xml\FieldTypeHashGenerator $hashGenerator)
+    public function __construct(Xml\FieldTypeHashGenerator $hashGenerator, $vendor = 'vnd.ez.api')
     {
         $this->hashGenerator = $hashGenerator;
+        $this->vendor = $vendor;
     }
 
     /**
@@ -236,7 +245,7 @@ public function endAttribute($name)
      */
     public function getMediaType($name)
     {
-        return $this->generateMediaType($name, 'xml');
+        return $this->generateMediaTypeWithVendor($name, 'xml', $this->vendor);
     }
 
     /**