[FrameworkBundle] Fix calling Client::getProfile() before sending a request

dunglas · dunglas · commit 9e6f4b212291 · 2019-06-25T17:43:39.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Client.php b/src/Symfony/Bundle/FrameworkBundle/Client.php
@@ -66,7 +66,7 @@ public function getKernel()
      */
     public function getProfile()
     {
-        if (!$this->kernel->getContainer()->has('profiler')) {
+        if (null === $this->response || !$this->kernel->getContainer()->has('profiler')) {
             return false;
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php
@@ -28,9 +28,9 @@ public function testProfilerIsDisabled($insulate)
 
         // enable the profiler for the next request
         $client->enableProfiler();
-        $crawler = $client->request('GET', '/profiler');
-        $profile = $client->getProfile();
-        $this->assertInternalType('object', $profile);
+        $this->assertFalse($client->getProfile());
+        $client->request('GET', '/profiler');
+        $this->assertInternalType('object', $client->getProfile());
 
         $client->request('GET', '/profiler');
         $this->assertFalse($client->getProfile());

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function getKernel()`
`66`	`66`	`*/`
`67`	`67`	`public function getProfile()`
`68`	`68`	`{`
`69`		`- if (!$this->kernel->getContainer()->has('profiler')) {`
	`69`	`+ if (null === $this->response \|\| !$this->kernel->getContainer()->has('profiler')) {`
`70`	`70`	`return false;`
`71`	`71`	`}`
`72`	`72`