Merge branch 'hotfix/4702'

Close zendframework/zendframework#4702

Author: Mike Willbanks

src/Header/Accept.php

@@ -18,6 +18,9 @@
  */
 class Accept extends AbstractAccept
 {
+    /**
+     * @var string
+     */
     protected $regexAddType = '#^([a-zA-Z+-]+|\*)/(\*|[a-zA-Z0-9+-]+)$#';
 
     /**
@@ -67,9 +70,9 @@ public function hasMediaType($type)
     /**
      * Parse the keys contained in the header line
      *
-     * @param string $fieldValuePart
-     * @return \Zend\Http\Header\Accept\FieldValuePart\CharsetFieldValuePart
-     * @see \Zend\Http\Header\AbstractAccept::parseFieldValuePart()
+     * @param  string $fieldValuePart
+     * @return FieldValuePart\AcceptFieldValuePart
+     * @see    \Zend\Http\Header\AbstractAccept::parseFieldValuePart()
      */
     protected function parseFieldValuePart($fieldValuePart)
     {
@@ -87,7 +90,7 @@ protected function parseFieldValuePart($fieldValuePart)
         }
 
         if ($pos = strpos($fieldValuePart, '/')) {
-            $subtypeWhole = $format = $subtype = trim(substr($fieldValuePart, strpos($fieldValuePart, '/')+1));
+            $subtypeWhole = $format = $subtype = trim(substr($fieldValuePart, strpos($fieldValuePart, '/') + 1));
         } else {
             $subtypeWhole = '';
             $format = '*';
@@ -96,19 +99,19 @@ protected function parseFieldValuePart($fieldValuePart)
 
         $pos = strpos($subtype, '+');
         if (false !== $pos) {
-            $format = trim(substr($subtype, $pos+1));
+            $format = trim(substr($subtype, $pos + 1));
             $subtype = trim(substr($subtype, 0, $pos));
         }
 
         $aggregated = array(
-                'typeString' => trim($fieldValuePart),
-                'type'       => $type,
-                'subtype'    => $subtype,
-                'subtypeRaw' => $subtypeWhole,
-                'format'     => $format,
-                'priority'   => isset($params['q']) ? $params['q'] : 1,
-                'params'     => $params,
-                'raw'        => trim($raw)
+            'typeString' => trim($fieldValuePart),
+            'type'       => $type,
+            'subtype'    => $subtype,
+            'subtypeRaw' => $subtypeWhole,
+            'format'     => $format,
+            'priority'   => isset($params['q']) ? $params['q'] : 1,
+            'params'     => $params,
+            'raw'        => trim($raw),
         );
 
         return new FieldValuePart\AcceptFieldValuePart((object) $aggregated);