Implement against InternetMediaTypeInterface (#4)

Author: webignition

composer.json

@@ -13,7 +13,11 @@
     ],
     "autoload": {
         "psr-4": {
-            "webignition\\InternetMediaType\\": "src/",
+            "webignition\\InternetMediaType\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
             "webignition\\Tests\\InternetMediaType\\": "tests/"
         }
     },
@@ -27,13 +31,15 @@
     },
     "require": {
         "php": ">=5.6.0",
+        "webignition/internet-media-type-interface":">=0.1,<1.0",
         "webignition/quoted-string":">=0.2.1,<1.0",
         "webignition/string-parser":">=0.2.3,<1.0"
+
     },
     "require-dev": {
         "phpunit/phpunit": "~5.0",
         "squizlabs/php_codesniffer": "3.*"
     },
-    "minimum-stability":"dev",
+    "minimum-stability":"stable",
     "prefer-stable":true
 }

composer.lock

@@ -3,42 +3,11 @@
 namespace webignition\InternetMediaType;
 
 use webignition\InternetMediaType\Parameter\Parameter;
+use webignition\InternetMediaTypeInterface\InternetMediaTypeInterface;
+use webignition\InternetMediaTypeInterface\ParameterInterface;
 
-/**
- * Models an Internet Media Type as defined as:
- *
- * HTTP uses Internet Media Types [17] in the Content-Type (section 14.17) and
- * Accept (section 14.1) header fields in order to provide open and extensible data
- * typing and type negotiation.
- *
- * media-type     = type "/" subtype *( ";" parameter )
- * type           = token
- * subtype        = token
- *
- * Parameters MAY follow the type/subtype in the form of attribute/value pairs
- *
- * parameter               = attribute "=" value
- * attribute               = token
- * value                   = token | quoted-string
- *
- * The type, subtype, and parameter attribute names are case-insensitive
- *
- * http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
- *
- * Note: may have multiple parameters as per Content-Type example
- * in http://www.w3.org/Protocols/rfc1341/rfc1341.html section 7.3.2:
- *
- *       Content-Type: Message/Partial;
- *           number=2; total=3;
- *           id="[email protected]";
- *
- */
-class InternetMediaType
+class InternetMediaType implements InternetMediaTypeInterface
 {
-    const TYPE_SUBTYPE_SEPARATOR = '/';
-    const PARAMETER_ATTRIBUTE_VALUE_SEPARATOR = '=';
-    const ATTRIBUTE_PARAMETER_SEPARATOR = ';';
-
     /**
      * Main media type.
      *
@@ -62,74 +31,62 @@ class InternetMediaType
      *
      * @var Parameter[]
      */
-    private $parameters = array();
+    private $parameters = [];
 
     /**
-     * @param string $type
-     *
-     * @return self
+     * {@inheritdoc}
      */
     public function setType($type)
     {
         $this->type = strtolower($type);
-        return $this;
     }
 
     /**
-     * @return string
+     * {@inheritdoc}
      */
     public function getType()
     {
         return $this->type;
     }
 
     /**
-     * @param string $subtype
-     *
-     * @return self
+     * {@inheritdoc}
      */
     public function setSubtype($subtype)
     {
         $this->subtype = strtolower($subtype);
-        return $this;
     }
 
     /**
-     * @return string
+     * {@inheritdoc}
      */
     public function getSubtype()
     {
         return $this->subtype;
     }
 
     /**
-     * @param Parameter $parameter
-     *
-     * @return self
+     * {@inheritdoc}
      */
-    public function addParameter(Parameter $parameter)
+    public function addParameter(ParameterInterface $parameter)
     {
         $this->parameters[$parameter->getAttribute()] = $parameter;
 
         return $this;
     }
 
     /**
-     * @param string $attribute
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function hasParameter($attribute)
     {
         return !is_null($this->getParameter($attribute));
     }
 
     /**
-     * @param Parameter $parameter
-     *
-     * @return self
+     * {@inheritdoc}
      */
-    public function removeParameter(Parameter $parameter)
+    public function removeParameter(ParameterInterface $parameter)
     {
         if ($this->hasParameter($parameter->getAttribute())) {
             unset($this->parameters[$parameter->getAttribute()]);
@@ -139,9 +96,7 @@ public function removeParameter(Parameter $parameter)
     }
 
     /**
-     * @param string $attribute
-     *
-     * @return Parameter|null
+     * {@inheritdoc}
      */
     public function getParameter($attribute)
     {
@@ -151,37 +106,29 @@ public function getParameter($attribute)
     }
 
     /**
-     * Get collection of Parameter objects
-     *
-     * @return Parameter[]
+     * {@inheritdoc}
      */
     public function getParameters()
     {
         return $this->parameters;
     }
 
     /**
-     * @return bool
+     * @return string
      */
-    public function hasType()
+    public function getTypeSubtypeString()
     {
+        $string = '';
+
         if (empty($this->type)) {
-            return false;
+            return $string;
         }
 
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSubtype()
-    {
         if (empty($this->subtype)) {
-            return false;
+            return $string;
         }
 
-        return true;
+        return $this->type . self::TYPE_SUBTYPE_SEPARATOR . $this->subtype;
     }
 
     /**
@@ -225,24 +172,4 @@ private function isEmptyParameterStringCollection($parameterStringCollection)
 
         return true;
     }
-
-    /**
-     * Get a string of the form {type}/{subtype}
-     *
-     * @return string
-     */
-    public function getTypeSubtypeString()
-    {
-        $string = '';
-
-        if (!$this->hasType()) {
-            return $string;
-        }
-
-        if (!$this->hasSubtype()) {
-            return $string;
-        }
-
-        return $this->getType() . self::TYPE_SUBTYPE_SEPARATOR . $this->getSubtype();
-    }
 }