Merge branch '3.4' into 4.4
* 3.4: [VarDumper] fix for change in PHP 7.4.6 (bis) [BrowserKit] Allow Referer set by history to be overridden (3.4)
This commit is contained in:
commit
94e8c42736
@ -380,7 +380,7 @@ abstract class Client
|
|||||||
$uri = preg_replace('{^'.parse_url($uri, PHP_URL_SCHEME).'}', $server['HTTPS'] ? 'https' : 'http', $uri);
|
$uri = preg_replace('{^'.parse_url($uri, PHP_URL_SCHEME).'}', $server['HTTPS'] ? 'https' : 'http', $uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->history->isEmpty()) {
|
if (!isset($server['HTTP_REFERER']) && !$this->history->isEmpty()) {
|
||||||
$server['HTTP_REFERER'] = $this->history->current()->getUri();
|
$server['HTTP_REFERER'] = $this->history->current()->getUri();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -230,6 +230,15 @@ class AbstractBrowserTest extends TestCase
|
|||||||
$this->assertEquals('http://www.example.com/foo/foobar', $server['HTTP_REFERER'], '->request() sets the referer');
|
$this->assertEquals('http://www.example.com/foo/foobar', $server['HTTP_REFERER'], '->request() sets the referer');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testRequestRefererCanBeOverridden()
|
||||||
|
{
|
||||||
|
$client = new TestClient();
|
||||||
|
$client->request('GET', 'http://www.example.com/foo/foobar');
|
||||||
|
$client->request('GET', 'bar', [], [], ['HTTP_REFERER' => 'xyz']);
|
||||||
|
$server = $client->getRequest()->getServer();
|
||||||
|
$this->assertEquals('xyz', $server['HTTP_REFERER'], '->request() allows referer to be overridden');
|
||||||
|
}
|
||||||
|
|
||||||
public function testRequestHistory()
|
public function testRequestHistory()
|
||||||
{
|
{
|
||||||
$client = $this->getBrowser();
|
$client = $this->getBrowser();
|
||||||
|
@ -175,6 +175,7 @@ class SplCaster
|
|||||||
{
|
{
|
||||||
$storage = [];
|
$storage = [];
|
||||||
unset($a[Caster::PREFIX_DYNAMIC."\0gcdata"]); // Don't hit https://bugs.php.net/65967
|
unset($a[Caster::PREFIX_DYNAMIC."\0gcdata"]); // Don't hit https://bugs.php.net/65967
|
||||||
|
unset($a["\0SplObjectStorage\0storage"]);
|
||||||
|
|
||||||
$clone = clone $c;
|
$clone = clone $c;
|
||||||
foreach ($clone as $obj) {
|
foreach ($clone as $obj) {
|
||||||
|
Reference in New Issue
Block a user