Following the visibilty of the Java MIMEParse class

See Java version of MIMEParse at
http://code.google.com/p/mimeparse/source/browse/trunk/java/MIMEParse.java

This class sets certain methods as protected, something that Python
doesn't concern itself with. I am following suit with the PHP version of
the library and using the same visibility as the Java class.

Author: Ben Ramsey

src/Bitworking/Mimeparse.php

@@ -29,7 +29,7 @@ class Mimeparse
      * @return array ($type, $subtype, $params)
      * @throws UnexpectedValueException when $mimeType does not include a valid subtype
      */
-    public static function parseMimeType($mimeType)
+    protected static function parseMimeType($mimeType)
     {
         $parts = explode(';', $mimeType);
 
@@ -76,7 +76,7 @@ public static function parseMimeType($mimeType)
      * @param string $range
      * @return array ($type, $subtype, $params)
      */
-    public static function parseMediaRange($range)
+    protected static function parseMediaRange($range)
     {
         list($type, $subtype, $params) = self::parseMimeType($range);
 
@@ -104,7 +104,7 @@ public static function parseMediaRange($range)
      * @param array  $parsedRanges
      * @return array ($bestFitness, $bestFitQuality)
      */
-    public static function fitnessAndQualityParsed($mimeType, $parsedRanges)
+    protected static function fitnessAndQualityParsed($mimeType, $parsedRanges)
     {
         $bestFitness = -1;
         $bestFitQuality = 0;
@@ -149,7 +149,7 @@ public static function fitnessAndQualityParsed($mimeType, $parsedRanges)
      * @param array  $parsedRanges
      * @return float $q
      */
-    public static function qualityParsed($mimeType, $parsedRanges)
+    protected static function qualityParsed($mimeType, $parsedRanges)
     {
         list($fitness, $q) = self::fitnessAndQualityParsed($mimeType, $parsedRanges);
         return $q;
@@ -212,5 +212,14 @@ public static function bestMatch($supported, $header)
         $a = $weightedMatches[count($weightedMatches) - 1];
         return (empty($a[0][1]) ? null : $a[1]);
     }
+
+    /**
+     * Disable access to constructor
+     *
+     * @codeCoverageIgnore
+     */
+    private function __construct()
+    {
+    }
 }
 

tests/Bitworking/MimeparseTest.php

@@ -4,50 +4,64 @@
 class MimeparseTest extends \PHPUnit_Framework_TestCase
 {
     /**
+     * Testing this protected method because it includes a lot of parsing
+     * functionality that we wish to isolate from other tests.
+     *
      * @covers Bitworking\Mimeparse::parseMediaRange
      * @covers Bitworking\Mimeparse::parseMimeType
      */
     public function testParseMediaRange()
     {
+        $method = new \ReflectionMethod('Bitworking\Mimeparse', 'parseMediaRange');
+        $method->setAccessible(true);
+
         $expected1 = array(
             0 => 'application',
             1 => 'xml',
             2 => array('q' => '1'),
         );
 
-        $this->assertEquals($expected1, Mimeparse::parseMediaRange('application/xml;q=1'));
-        $this->assertEquals($expected1, Mimeparse::parseMediaRange('application/xml'));
-        $this->assertEquals($expected1, Mimeparse::parseMediaRange('application/xml;q='));
+        $this->assertEquals($expected1, $method->invoke(null, 'application/xml;q=1'));
+        $this->assertEquals($expected1, $method->invoke(null, 'application/xml'));
+        $this->assertEquals($expected1, $method->invoke(null, 'application/xml;q='));
 
         $expected2 = array(
             0 => 'application',
             1 => 'xml',
             2 => array('q' => '1', 'b' => 'other'),
         );
 
-        $this->assertEquals($expected2, Mimeparse::parseMediaRange('application/xml ; q=1;b=other'));
-        $this->assertEquals($expected2, Mimeparse::parseMediaRange('application/xml ; q=2;b=other'));
+        $this->assertEquals($expected2, $method->invoke(null, 'application/xml ; q=1;b=other'));
+        $this->assertEquals($expected2, $method->invoke(null, 'application/xml ; q=2;b=other'));
 
         // Java URLConnection class sends an Accept header that includes a single "*"
         $this->assertEquals(array(
             0 => '*',
             1 => '*',
             2 => array('q' => '.2'),
-        ), Mimeparse::parseMediaRange(' *; q=.2'));
+        ), $method->invoke(null, ' *; q=.2'));
     }
 
     /**
+     * Testing this protected method because it throws an exception that we
+     * want to test.
+     *
      * @covers Bitworking\Mimeparse::parseMimeType
      * @expectedException UnexpectedValueException
      * @expectedExceptionMessage malformed mime type
      */
     public function testParseMimeTypeWithMalformedMimeType()
     {
-        $parsed = Mimeparse::parseMimeType('application/;q=1');
+        $method = new \ReflectionMethod('Bitworking\Mimeparse', 'parseMediaRange');
+        $method->setAccessible(true);
+
+        $parsed = $method->invoke(null, 'application/;q=1');
     }
 
     /**
      * @covers Bitworking\Mimeparse::quality
+     * @covers Bitworking\Mimeparse::qualityParsed
+     * @covers Bitworking\Mimeparse::fitnessAndQualityParsed
      */
     public function testQuality()
     {