feature: transform both switchToXHR and removeXhr to a xhrRequest

Amrouche Hamza · Amrouche Hamza · commit cbdfa5de0a1b · 2018-03-02T18:53:36.000+01:00
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -150,14 +150,20 @@ public function getServerParameter($key, $default = '')
         return isset($this->server[$key]) ? $this->server[$key] : $default;
     }
 
-    public function switchToXHR()
+    /**
+     * Calls a URI with XMLHttpRequest.
+     *
+     * @return Crawler
+     */
+    public function xhrRequest(string $method, string $uri, array $parameters = array(), array $files = array(), array $server = array(), string $content = null, bool $changeHistory = true)
     {
         $this->setServerParameter('HTTP_X_REQUESTED_WITH', 'XMLHttpRequest');
-    }
 
-    public function removeXHR()
-    {
-        unset($this->server['HTTP_X_REQUESTED_WITH']);
+        try {
+            return $this->request($method, $uri, $parameters, $files, $server, $content, $changeHistory);
+        } finally {
+            unset($this->server['HTTP_X_REQUESTED_WITH']);
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
@@ -97,10 +97,7 @@ public function testGetRequest()
     public function testGetRequestWithXHR()
     {
         $client = new TestClient();
-        $client->switchToXHR();
-        $client->request('GET', 'http://example.com/', array(), array(), array(), null, true, true);
-        $this->assertEquals($client->getRequest()->getServer()['HTTP_X_REQUESTED_WITH'], 'XMLHttpRequest');
-        $client->removeXHR();
+        $client->xhrRequest('GET', 'http://example.com/', array(), array(), array(), null, true);
         $this->assertFalse($client->getServerParameter('HTTP_X_REQUESTED_WITH', false));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,7 @@ public function testGetRequest()`
`97`	`97`	`public function testGetRequestWithXHR()`
`98`	`98`	`{`
`99`	`99`	`$client = new TestClient();`
`100`		`- $client->switchToXHR();`
`101`		`- $client->request('GET', 'http://example.com/', array(), array(), array(), null, true, true);`
`102`		`- $this->assertEquals($client->getRequest()->getServer()['HTTP_X_REQUESTED_WITH'], 'XMLHttpRequest');`
`103`		`- $client->removeXHR();`
	`100`	`+ $client->xhrRequest('GET', 'http://example.com/', array(), array(), array(), null, true);`
`104`	`101`	`$this->assertFalse($client->getServerParameter('HTTP_X_REQUESTED_WITH', false));`
`105`	`102`	`}`
`106`	`103`