Correcting connection existence in tearDown operations

Ocramius · Ocramius · commit 22546a381144 · 2017-08-11T23:28:20.000+02:00
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -308,12 +308,13 @@ protected function useModelSet($setName)
      */
     protected function tearDown()
     {
+        $conn     = static::$_sharedConn;
+
         // In case test is skipped, tearDown is called, but no setup may have run
         if ( ! $conn) {
             return;
         }
 
-        $conn     = static::$_sharedConn;
         $platform = $conn->getDatabasePlatform();
 
         $this->_sqlLoggerStack->enabled = false;

Original file line number	Diff line number	Diff line change
`@@ -308,12 +308,13 @@ protected function useModelSet($setName)`
`308`	`308`	`*/`
`309`	`309`	`protected function tearDown()`
`310`	`310`	`{`
	`311`	`+ $conn = static::$_sharedConn;`
	`312`	`+`
`311`	`313`	`// In case test is skipped, tearDown is called, but no setup may have run`
`312`	`314`	`if ( ! $conn) {`
`313`	`315`	`return;`
`314`	`316`	`}`
`315`	`317`
`316`		`- $conn = static::$_sharedConn;`
`317`	`318`	`$platform = $conn->getDatabasePlatform();`
`318`	`319`
`319`	`320`	`$this->_sqlLoggerStack->enabled = false;`