Merge branch 'hotfix/zendframework/zendframework#6484-zend-http-origi…

…n-header-instantiation' Close zendframework/zendframework#6484
zendframework · Aug 6, 2014 · b6a3bf2 · b6a3bf2
5 parents e6cd592 + 2aef442 + 5f5970f + 3ff9149 + d1e784e
commit b6a3bf2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/src/Header/Origin.php b/src/Header/Origin.php
@@ -20,12 +20,10 @@ class Origin implements HeaderInterface
     /**
      * @var string
      */
-    private $value;
-
+    protected $value;
+    
     public static function fromString($headerLine)
     {
-        $header = new static();
-
         list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
@@ -38,10 +36,15 @@ public static function fromString($headerLine)
             throw new Exception\InvalidArgumentException('Invalid header value for Origin key: "' . $name . '"');
         }
 
-        // @todo implementation details
-        $header->value = $value;
+        return new static($value);
+    }
 
-        return $header;
+    /**
+     * @param string|null $value
+     */
+    public function __construct($value = null)
+    {
+        $this->value = (string) $value;
     }
 
     public function getFieldName()

diff --git a/test/Header/OriginTest.php b/test/Header/OriginTest.php
@@ -13,6 +13,16 @@
 
 class OriginTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @group 6484
+     */
+    public function testOriginFieldValueIsAlwaysAString()
+    {
+        $origin = new Origin();
+
+        $this->assertInternalType('string', $origin->getFieldValue());
+    }
+
     public function testOriginFromStringCreatesValidOriginHeader()
     {
         $OriginHeader = Origin::fromString('Origin: http://zend.org');
@@ -28,19 +38,7 @@ public function testOriginGetFieldNameReturnsHeaderName()
 
     public function testOriginGetFieldValueReturnsProperValue()
     {
-        $this->markTestIncomplete('Origin needs to be completed');
-
-        $OriginHeader = new Origin();
+        $OriginHeader = Origin::fromString('Origin: http://zend.org');
         $this->assertEquals('http://zend.org', $OriginHeader->getFieldValue());
     }
-
-    public function testOriginToStringReturnsHeaderFormattedString()
-    {
-        $this->markTestIncomplete('Origin needs to be completed');
-
-        $OriginHeader = new Origin();
-
-        // @todo set some values, then test output
-        $this->assertEmpty('Origin: http://zend.org', $OriginHeader->toString());
-    }
 }