Merge pull request #12033 from cakephp/here-attribute

Add 'here' to the emulated property set.
cakephp · May 1, 2018 · 9ff2776 · 9ff2776
2 parents 0cb6d51 + a87b80b
commit 9ff2776
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Http/ServerRequest.php b/src/Http/ServerRequest.php
@@ -196,7 +196,7 @@ class ServerRequest implements ArrayAccess, ServerRequestInterface
      *
      * @var array
      */
-    protected $emulatedAttributes = ['session', 'webroot', 'base', 'params'];
+    protected $emulatedAttributes = ['session', 'webroot', 'base', 'params', 'here'];
 
     /**
      * Array of Psr\Http\Message\UploadedFileInterface objects.

diff --git a/tests/TestCase/Http/ServerRequestTest.php b/tests/TestCase/Http/ServerRequestTest.php
@@ -3590,13 +3590,15 @@ public function testGetAttributesCompatibility($prop)
                     'controller' => 'Articles',
                     'action' => 'index'
                 ],
+                'url' => '/articles/view',
                 'base' => '/cakeapp',
                 'webroot' => '/cakeapp/'
             ]);
 
             if ($prop === 'session') {
                 $this->assertSame($request->getSession(), $request->getAttribute($prop));
             } else {
+                $this->assertNotEmpty($request->getAttribute($prop));
                 $this->assertSame($request->{$prop}, $request->getAttribute($prop));
             }
         });
@@ -3733,6 +3735,7 @@ public function testGetEnv()
     public function emulatedPropertyProvider()
     {
         return [
+            ['here'],
             ['params'],
             ['base'],
             ['webroot'],