8000 Merge branch '4.3' into 4.4 · symfony/symfony@29f5b18 · GitHub
[go: up one dir, main page]
Skip to content

Commit 29f5b18

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: fix tests
2 parents f06e5cc + 56877e7 commit 29f5b18

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@
141141
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
142142
}
143143

144-
$passthruOrFail("$COMPOSER config --unset platform");
144+
if (PHP_VERSION_ID >= 70000) {
145+
$passthruOrFail("$COMPOSER config --unset platform");
146+
}
145147
if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
146148
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
147149
$passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));

‎src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\WebProfilerBundle\Tests\Controller;
1313

14-
use Symfony\Bundle\FrameworkBundle\Client;
14+
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
1515
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
1616
use Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController;
1717
use Symfony\Bundle\WebProfilerBundle\Csp\ContentSecurityPolicyHandler;
@@ -45,7 +45,7 @@ public function testHomeActionWithProfilerDisabled()
4545
public function testHomeActionRedirect()
4646
{
4747
$kernel = new WebProfilerBundleKernel();
48-
$client = new Client($kernel);
48+
$client = new KernelBrowser($kernel);
4949

5050
$client->request('GET', '/_profiler/');
5151

@@ -56,7 +56,7 @@ public function testHomeActionRedirect()
5656
public function testPanelActionWithLatestTokenWhenNoTokensExist()
5757
{
5858
$kernel = new WebProfilerBundleKernel();
59-
$client = new Client($kernel);
59+
$client = new KernelBrowser($kernel);
6060

6161
$client->request('GET', '/_profiler/latest');
6262

@@ -66,7 +66,7 @@ public function testPanelActionWithLatestTokenWhenNoTokensExist()
6666
public function testPanelActionWithLatestToken()
6767
{
6868
$kernel = new WebProfilerBundleKernel();
69-
$client = new Client($kernel);
69+
$client = new KernelBrowser($kernel);
7070

7171
$client->request('GET', '/');
7272
$client->request('GET', '/_profiler/latest');
@@ -77,7 +77,7 @@ public function testPanelActionWithLatestToken()
7777
public function testPane 8000 lActionWithoutValidToken()
7878
{
7979
$kernel = new WebProfilerBundleKernel();
80-
$client = new Client($kernel);
80+
$client = new KernelBrowser($kernel);
8181

8282
$client->request('GET', '/_profiler/this-token-does-not-exist');
8383

@@ -87,7 +87,7 @@ public function testPanelActionWithoutValidToken()
8787
public function testPanelActionWithWrongPanel()
8888
{
8989
$kernel = new WebProfilerBundleKernel();
90-
$client = new Client($kernel);
90+
$client = new KernelBrowser($kernel);
9191

9292
$client->request('GET', '/');
9393
$client->request('GET', '/_profiler/latest?panel=this-panel-does-not-exist');
@@ -98,7 +98,7 @@ public function testPanelActionWithWrongPanel()
9898
public function testPanelActionWithValidPanelAndToken()
9999
{
100100
$kernel = new WebProfilerBundleKernel();
101-
$client = new Client($kernel);
101+
$client = new KernelBrowser($kernel);
102102

103103
$client->request('GET', '/');
104104
$crawler = $client->request('GET', '/_profiler/latest?panel=router');
@@ -224,7 +224,7 @@ public function testSearchBarActionWithProfilerDisabled()
224224
public function testSearchBarActionDefaultPage()
225225
{
226226
$kernel = new WebProfilerBundleKernel();
227-
$client = new Client($kernel);
227+
$client = new KernelBrowser($kernel);
228228

229229
$crawler = $client->request('GET', '/_profiler/search_bar');
230230

@@ -316,7 +316,7 @@ public function testSearchActionWithProfilerDisabled()
316316
public function testSearchActionWithToken()
317317
{
318318
$kernel = new WebProfilerBundleKernel();
319-
$client = new Client($kernel);
319+
$client = new KernelBrowser($kernel);
320320

321321
$client->request('GET', '/');
322322
$token = $client->getResponse()->headers->get('x-debug-token');
@@ -329,7 +329,7 @@ public function testSearchActionWithToken()
329329
public function testSearchActionWithoutToken()
330330
{
331331
$kernel = new WebProfilerBundleKernel();
332-
$client = new Client($kernel);
332+
$client = new KernelBrowser($kernel);
333333
$client->followRedirects();
334334

335335
$client->request('GET', '/');
@@ -355,7 +355,7 @@ public function testPhpinfoActionWithProfilerDisabled()
355355
public function testPhpinfoAction()
356356
{
357357
$kernel = new WebProfilerBundleKernel();
358-
$client = new Client($kernel);
358+
$client = new KernelBrowser($kernel);
359359

360360
$client->request('GET', '/_profiler/phpinfo');
361361

‎src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function reset()
6666

6767
public function lateCollect()
6868
{
69-
$this->data = $this->cloneVar($this->data);
69+
$this->data['instances']['calls'] = $this->cloneVar($this->data['instances']['calls']);
7070
}
7171

7272
/**

0 commit comments

Comments
 (0)
0