Merge branch 'hotfix/132'

Close #132

Author: weierophinney

CHANGELOG.md

@@ -23,6 +23,8 @@ All notable changes to this project will be documented in this file, in reverse
   validation of the HTTP protocol version.
 - [#127](https://github.com/zendframework/zend-diactoros/pull/127) now properly
   removes attributes with `null` values when calling `withoutAttribute()`.
+- [#132](https://github.com/zendframework/zend-diactoros/pull/132) updates the
+  `ServerRequestFactory` to marshal the request path fragment, if present.
 
 ## 1.3.3 - 2016-01-04
 

src/ServerRequestFactory.php

@@ -262,8 +262,15 @@ public static function marshalUriFromServer(array $server, array $headers)
             $query = ltrim($server['QUERY_STRING'], '?');
         }
 
+        // URI fragment
+        $fragment = '';
+        if (strpos($path, '#') !== false) {
+            list($path, $fragment) = explode('#', $path, 2);
+        }
+
         return $uri
             ->withPath($path)
+            ->withFragment($fragment)
             ->withQuery($query);
     }
 

test/ServerRequestFactoryTest.php

@@ -339,6 +339,21 @@ public function testMarshalUriInjectsQueryStringFromServer()
         $this->assertEquals('bar=baz', $uri->getQuery());
     }
 
+    public function testMarshalUriInjectsFragmentFromServer()
+    {
+        $request = new ServerRequest();
+        $request = $request->withUri(new Uri('http://example.com/'));
+        $request = $request->withHeader('Host', 'example.com');
+
+        $server = [
+            'REQUEST_URI' => '/foo/bar#foo',
+        ];
+
+        $uri = ServerRequestFactory::marshalUriFromServer($server, $request->getHeaders());
+        $this->assertInstanceOf('Zend\Diactoros\Uri', $uri);
+        $this->assertEquals('foo', $uri->getFragment());
+    }
+
     public function testCanCreateServerRequestViaFromGlobalsMethod()
     {
         $server = [