Reset Route arguments for each call

Fix #2430
slimphp · Apr 27, 2018 · 95585bd · 95585bd
1 parent e84150b
commit 95585bd
Show file tree

Hide file tree

Showing 2 changed files with 112 additions and 1 deletion.
diff --git a/Slim/Route.php b/Slim/Route.php
@@ -68,6 +68,13 @@ class Route extends Routable implements RouteInterface
      */
     protected $arguments = [];
 
+    /**
+     * Route arguments parameters
+     *
+     * @var null|array
+     */
+    protected $savedArguments;
+
     /**
      * The callable payload
      *
@@ -286,7 +293,15 @@ public function getArgument($name, $default = null)
      */
     public function prepare(ServerRequestInterface $request, array $arguments)
     {
-        // Add the arguments
+        // Save the arguments added on routes
+        if (!isset($this->savedArguments)) {
+            $this->savedArguments = $this->getArguments();
+        }
+
+        // Reset the arguments
+        $this->setArguments($this->savedArguments);
+
+        // Add the route arguments
         foreach ($arguments as $k => $v) {
             $this->setArgument($k, $v);
         }

diff --git a/tests/AppTest.php b/tests/AppTest.php
@@ -2317,6 +2317,102 @@ public function testExceptionOutputBufferingPrepend()
         $this->assertStringStartsWith('output buffer test', $output);
     }
 
+    public function testInvokeSequentialProccessToAPathWithOptionalArgsAndWithoutOptionalArgs()
+    {
+        $app = new App();
+        $app->get('/foo[/{bar}]', function ($req, $res, $args) {
+            return $res->write(count($args));
+        });
+
+        // Prepare request and response objects
+        $env = Environment::mock([
+            'SCRIPT_NAME' => '/index.php',
+            'REQUEST_URI' => '/foo/bar',
+            'REQUEST_METHOD' => 'GET',
+        ]);
+        $uri = Uri::createFromEnvironment($env);
+        $headers = Headers::createFromEnvironment($env);
+        $cookies = [];
+        $serverParams = $env->all();
+        $body = new RequestBody();
+        $req = new Request('GET', $uri, $headers, $cookies, $serverParams, $body);
+        $res = new Response();
+
+        // Invoke process with optional arg
+        $resOut = $app->process($req, $res);
+
+        $this->assertInstanceOf('\Psr\Http\Message\ResponseInterface', $resOut);
+        $this->assertEquals('1', (string)$resOut->getBody());
+
+        // Prepare request and response objects
+        $env = Environment::mock([
+            'SCRIPT_NAME' => '/index.php',
+            'REQUEST_URI' => '/foo',
+            'REQUEST_METHOD' => 'GET',
+        ]);
+        $uri = Uri::createFromEnvironment($env);
+        $headers = Headers::createFromEnvironment($env);
+        $cookies = [];
+        $serverParams = $env->all();
+        $body = new RequestBody();
+        $req = new Request('GET', $uri, $headers, $cookies, $serverParams, $body);
+        $res = new Response();
+
+        // Invoke process with optional arg
+        $resOut2 = $app->process($req, $res);
+
+        $this->assertInstanceOf('\Psr\Http\Message\ResponseInterface', $resOut2);
+        $this->assertEquals('0', (string)$resOut2->getBody());
+    }
+
+    public function testInvokeSequentialProccessToAPathWithOptionalArgsAndWithoutOptionalArgsAndKeepSetedArgs()
+    {
+        $app = new App();
+        $app->get('/foo[/{bar}]', function ($req, $res, $args) {
+            return $res->write(count($args));
+        })->setArgument('baz', 'quux');
+
+        // Prepare request and response objects
+        $env = Environment::mock([
+            'SCRIPT_NAME' => '/index.php',
+            'REQUEST_URI' => '/foo/bar',
+            'REQUEST_METHOD' => 'GET',
+        ]);
+        $uri = Uri::createFromEnvironment($env);
+        $headers = Headers::createFromEnvironment($env);
+        $cookies = [];
+        $serverParams = $env->all();
+        $body = new RequestBody();
+        $req = new Request('GET', $uri, $headers, $cookies, $serverParams, $body);
+        $res = new Response();
+
+        // Invoke process with optional arg
+        $resOut = $app->process($req, $res);
+
+        $this->assertInstanceOf('\Psr\Http\Message\ResponseInterface', $resOut);
+        $this->assertEquals('2', (string)$resOut->getBody());
+
+        // Prepare request and response objects
+        $env = Environment::mock([
+            'SCRIPT_NAME' => '/index.php',
+            'REQUEST_URI' => '/foo',
+            'REQUEST_METHOD' => 'GET',
+        ]);
+        $uri = Uri::createFromEnvironment($env);
+        $headers = Headers::createFromEnvironment($env);
+        $cookies = [];
+        $serverParams = $env->all();
+        $body = new RequestBody();
+        $req = new Request('GET', $uri, $headers, $cookies, $serverParams, $body);
+        $res = new Response();
+
+        // Invoke process with optional arg
+        $resOut2 = $app->process($req, $res);
+
+        $this->assertInstanceOf('\Psr\Http\Message\ResponseInterface', $resOut2);
+        $this->assertEquals('1', (string)$resOut2->getBody());
+    }
+
     protected function skipIfPhp70()
     {
         if (version_compare(PHP_VERSION, '7.0', '>=')) {