Properly set the subtype on the dispatcher as well as the standards tree.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

src/Dispatcher.php

@@ -122,11 +122,18 @@ class Dispatcher
     protected $persistAuthentication = true;
 
     /**
-     * API vendor.
+     * API subtype.
      *
      * @var string
      */
-    protected $vendor;
+    protected $subtype;
+
+    /**
+     * API standards tree.
+     *
+     * @var string
+     */
+    protected $standardsTree;
 
     /**
      * API prefix.
@@ -486,7 +493,7 @@ protected function addPrefixToUri($uri)
      */
     protected function getAcceptHeader()
     {
-        return sprintf('application/vnd.%s.%s+%s', $this->getVendor(), $this->getVersion(), $this->getFormat());
+        return sprintf('application/%s.%s.%s+%s', $this->getStandardsTree(), $this->getSubtype(), $this->getVersion(), $this->getFormat());
     }
 
     /**
@@ -613,25 +620,47 @@ public function getFormat()
     }
 
     /**
-     * Get the vendor.
+     * Get the subtype.
+     *
+     * @return string
+     */
+    public function getSubtype()
+    {
+        return $this->subtype;
+    }
+
+    /**
+     * Set the subtype.
+     *
+     * @param string $subtype
+     *
+     * @return void
+     */
+    public function setSubtype($subtype)
+    {
+        $this->subtype = $subtype;
+    }
+
+    /**
+     * Get the standards tree.
      *
      * @return string
      */
-    public function getVendor()
+    public function getStandardsTree()
     {
-        return $this->vendor;
+        return $this->standardsTree;
     }
 
     /**
-     * Set the vendor.
+     * Set the standards tree.
      *
-     * @param string $vendor
+     * @param string $standardsTree
      *
      * @return void
      */
-    public function setVendor($vendor)
+    public function setStandardsTree($standardsTree)
     {
-        $this->vendor = $vendor;
+        $this->standardsTree = $standardsTree;
     }
 
     /**

src/Provider/ApiServiceProvider.php

@@ -137,6 +137,7 @@ public function registerDispatcher()
             $config = $app['config']['api'];
 
             $dispatcher->setSubtype($config['subtype']);
+            $dispatcher->setStandardsTree($config['standardsTree']);
             $dispatcher->setPrefix($config['prefix']);
             $dispatcher->setDefaultVersion($config['version']);
             $dispatcher->setDefaultDomain($config['domain']);

tests/DispatcherTest.php

@@ -38,7 +38,8 @@ public function setUp()
         $this->auth = new Auth($this->router, $this->container, []);
         $this->dispatcher = new Dispatcher($this->container, new Filesystem, $this->router, $this->auth);
 
-        $this->dispatcher->setVendor('api');
+        $this->dispatcher->setSubtype('api');
+        $this->dispatcher->setStandardsTree('vnd');
         $this->dispatcher->setDefaultVersion('v1');
         $this->dispatcher->setDefaultFormat('json');