Merge branch 'm00t-stacked_url_map'

Author: CHH

src/Stack/UrlMap.php

@@ -56,10 +56,10 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
         foreach ($this->map as $path => $app) {
             if (0 === strpos($pathInfo, $path)) {
                 $server = $request->server->all();
-                $server['SCRIPT_FILENAME'] = $server['SCRIPT_NAME'] = $server['PHP_SELF'] = $path;
+                $server['SCRIPT_FILENAME'] = $server['SCRIPT_NAME'] = $server['PHP_SELF'] = $request->getBaseUrl().$path;
 
                 $attributes = $request->attributes->all();
-                $attributes[static::ATTR_PREFIX] = $path;
+                $attributes[static::ATTR_PREFIX] = $request->getBaseUrl().$path;
 
                 $newRequest = $request->duplicate(null, null, $attributes, null, null, $server);
 

tests/functional/UrlMapTest.php

@@ -54,5 +54,34 @@ public function testOverridesPathInfo()
         $response = $urlMap->handle(Request::create('/foo?bar=baz'));
         $this->assertEquals('Hello World', $response->getContent());
     }
+
+    public function testShouldBeStackable()
+    {
+        $app = new CallableHttpKernel(function (Request $request) {
+            return new Response("Fallback!");
+        });
+
+        // $this do not reference the wrapping object in 5.3
+        $self = $this;
+
+        $urlMapInner = new UrlMap($app);
+        $urlMapInner->setMap(array(
+            '/bar' => new CallableHttpKernel(function (Request $request) use ($self) {
+                $self->assertEquals('/', $request->getPathinfo());
+                $self->assertEquals('/foo/bar', $request->attributes->get(UrlMap::ATTR_PREFIX));
+                $self->assertEquals('/foo/bar', $request->getBaseUrl());
+
+                return new Response("Hello World");
+            }),
+        ));
+
+        $urlMapOuter = new UrlMap($app);
+        $urlMapOuter->setMap(array(
+            '/foo' => $urlMapInner
+        ));
+
+        $response = $urlMapOuter->handle(Request::create('/foo/bar?baz=fiz'));
+        $this->assertEquals('Hello World', $response->getContent());
+    }
 }