minor symfony#11321 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest (penyaskito)

fabpot · fabpot · commit 7d88e37cbe86 · 2014-07-06T20:21:17.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [HttpKernel] Ensure the storage exists before purging it in ProfilerTest | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#11319 | License | MIT | Doc PR | None Commits ------- eb63270 bug symfony#11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php
@@ -79,9 +79,11 @@ protected function setUp()
 
     protected function tearDown()
     {
-        $this->storage->purge();
-        $this->storage = null;
+        if (null !== $this->storage) {
+            $this->storage->purge();
+            $this->storage = null;
 
-        @unlink($this->tmp);
+            @unlink($this->tmp);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,11 @@ protected function setUp()`
`79`	`79`
`80`	`80`	`protected function tearDown()`
`81`	`81`	`{`
`82`		`- $this->storage->purge();`
`83`		`- $this->storage = null;`
	`82`	`+ if (null !== $this->storage) {`
	`83`	`+ $this->storage->purge();`
	`84`	`+ $this->storage = null;`
`84`	`85`
`85`		`- @unlink($this->tmp);`
	`86`	`+ @unlink($this->tmp);`
	`87`	`+ }`
`86`	`88`	`}`
`87`	`89`	`}`