[BrowserKit] Emulate back/forward browser navigation

e-moe · e-moe · commit 44df3024db70 · 2017-04-07T15:55:54.000+03:00
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -38,7 +38,9 @@ abstract class Client
     protected $crawler;
     protected $insulated = false;
     protected $redirect;
+    protected $redirects = array();
     protected $followRedirects = true;
+    protected $browserNavigation = false;
 
     private $maxRedirects = -1;
     private $redirectCount = 0;
@@ -68,6 +70,16 @@ public function followRedirects($followRedirect = true)
         $this->followRedirects = (bool) $followRedirect;
     }
 
+    /**
+     * Sets whether to emulate back/forward browser navigation (skip redirects).
+     *
+     * @param bool $browserNavigation Whether to emulate browser navigation
+     */
+    public function browserNavigation($browserNavigation = true)
+    {
+        $this->browserNavigation = (bool) $browserNavigation;
+    }
+
     /**
      * Sets the maximum number of requests that crawler can follow.
      *
@@ -308,6 +320,8 @@ public function request($method, $uri, array $parameters = array(), array $files
         }
 
         if ($this->followRedirects && $this->redirect) {
+            $this->redirects[] = spl_object_hash($this->history->current());
+
             return $this->crawler = $this->followRedirect();
         }
 
@@ -410,7 +424,11 @@ protected function createCrawlerFromContent($uri, $content, $type)
      */
     public function back()
     {
-        return $this->requestFromRequest($this->history->back(), false);
+        do {
+            $request = $this->history->back();
+        } while ($this->browserNavigation && in_array(spl_object_hash($request), $this->redirects));
+
+        return $this->requestFromRequest($request, false);
     }
 
     /**
@@ -420,7 +438,11 @@ public function back()
      */
     public function forward()
     {
-        return $this->requestFromRequest($this->history->forward(), false);
+        do {
+            $request = $this->history->forward();
+        } while ($this->browserNavigation && in_array(spl_object_hash($request), $this->redirects));
+
+        return $this->requestFromRequest($request, false);
     }
 
     /**
