NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commitebd9e48

Amrouche Hamza

committed

[BrowserKit] add a way to switch to ajax for one request

1 parenta522e04 commitebd9e48Copy full SHA for ebd9e48

File tree

2 files changed

+31

-4

lines changed

src/Symfony/Component/BrowserKit
- Client.php
- Tests
  - ClientTest.php

2 files changed

+31

-4

lines changed

`‎src/Symfony/Component/BrowserKit/Client.php‎`

Lines changed: 23 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,16 @@ public function getServerParameter($key, $default = '')`
`150`	`150`	`returnisset($this->server[$key]) ?$this->server[$key] :$default;`
`151`	`151`	`}`
`152`	`152`
	`153`	`+publicfunctionswitchToAjax()`
	`154`	`+ {`
	`155`	`+$this->setServerParameter('HTTP_X-Requested-With','XMLHttpRequest');`
	`156`	`+ }`
	`157`	`+`
	`158`	`+publicfunctionremoveAjax()`
	`159`	`+ {`
	`160`	`+ unset($this->server['HTTP_X-Requested-With']);`
	`161`	`+ }`
	`162`	`+`
`153`	`163`	`/**`
`154`	`164`	`* Returns the History instance.`
`155`	`165`	`*`
`@@ -249,14 +259,15 @@ public function click(Link $link)`
`249`	`259`	`*`
`250`	`260`	`* @param Form $form A Form instance`
`251`	`261`	`* @param array $values An array of form field values`
	`262`	`+ * @param bool $isAjax Whether it's ajax or not`
`252`	`263`	`*`
`253`	`264`	`* @return Crawler`
`254`	`265`	`*/`
`255`		`-publicfunctionsubmit(Form$form,array$values =array())`
	`266`	`+publicfunctionsubmit(Form$form,array$values =array(),$isAjax =false)`
`256`	`267`	`{`
`257`	`268`	`$form->setValues($values);`
`258`	`269`
`259`		`-return$this->request($form->getMethod(),$form->getUri(),$form->getPhpValues(),$form->getPhpFiles());`
	`270`	`+return$this->request($form->getMethod(),$form->getUri(),$form->getPhpValues(),$form->getPhpFiles(),array(),null,true,$isAjax);`
`260`	`271`	`}`
`261`	`272`
`262`	`273`	`/**`
`@@ -269,17 +280,21 @@ public function submit(Form $form, array $values = array())`
`269`	`280`	`* @param array $server The server parameters (HTTP headers are referenced with a HTTP_ prefix as PHP does)`
`270`	`281`	`* @param string $content The raw body data`
`271`	`282`	`* @param bool $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())`
`272`		`- *`
	`283`	`+ * @param bool $isAjax Whether it's a ajax request or not`
`273`	`284`	`* @return Crawler`
`274`	`285`	`*/`
`275`		`-publicfunctionrequest($method,$uri,array$parameters =array(),array$files =array(),array$server =array(),$content =null,$changeHistory =true)`
	`286`	`+publicfunctionrequest($method,$uri,array$parameters =array(),array$files =array(),array$server =array(),$content =null,$changeHistory =true,$isAjax =false)`
`276`	`287`	`{`
`277`	`288`	`if ($this->isMainRequest) {`
`278`	`289`	`$this->redirectCount =0;`
`279`	`290`	`}else {`
`280`	`291`	`++$this->redirectCount;`
`281`	`292`	`}`
`282`	`293`
	`294`	`+if (true ===$isAjax) {`
	`295`	`+$this->switchToAjax();`
	`296`	`+ }`
	`297`	`+`
`283`	`298`	`$uri =$this->getAbsoluteUri($uri);`
`284`	`299`
`285`	`300`	`$server =array_merge($this->server,$server);`
`@@ -324,6 +339,10 @@ public function request($method, $uri, array $parameters = array(), array $files`
`324`	`339`	`$this->redirect =null;`
`325`	`340`	`}`
`326`	`341`
	`342`	`+if (true ===$isAjax) {`
	`343`	`+$this->removeAjax();`
	`344`	`+ }`
	`345`	`+`
`327`	`346`	`if ($this->followRedirects &&$this->redirect) {`
`328`	`347`	`$this->redirects[serialize($this->history->current())] =true;`
`329`	`348`

`‎src/Symfony/Component/BrowserKit/Tests/ClientTest.php‎`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,14 @@ public function testGetRequest()`
`94`	`94`	`$this->assertEquals('http://example.com/',$client->getRequest()->getUri(),'->getCrawler() returns the Request of the last request');`
`95`	`95`	`}`
`96`	`96`
	`97`	`+publicfunctiontestGetRequestWithAjax()`
	`98`	`+ {`
	`99`	`+$client =newTestClient();`
	`100`	`+$client->request('GET','http://example.com/',array(),array(),array(),null,true,true);`
	`101`	`+$this->assertEquals($client->getRequest()->getServer()['HTTP_X-Requested-With'],'XMLHttpRequest');`
	`102`	`+$this->assertEquals('http://example.com/',$client->getRequest()->getUri(),'->getCrawler() returns the Request of the last request');`
	`103`	`+ }`
	`104`	`+`
`97`	`105`	`publicfunctiontestGetRequestWithIpAsHttpHost()`
`98`	`106`	`{`
`99`	`107`	`$client =newTestClient();`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitebd9e48

File tree

2 files changed

2 files changed

`‎src/Symfony/Component/BrowserKit/Client.php‎`

`‎src/Symfony/Component/BrowserKit/Tests/ClientTest.php‎`

0 commit comments