From 299cde3c9048aac08ebf1b131ccb9cf7f41097b6 Mon Sep 17 00:00:00 2001 From: Jeffrey Guo Date: Fri, 18 Dec 2015 15:42:48 +1300 Subject: [PATCH] add condition to prevent running endTestSession() twice reformatted with space indent --- .../Context/Initializer/SilverStripeAwareInitializer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php b/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php index 4042364..ed79843 100644 --- a/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php +++ b/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php @@ -83,13 +83,13 @@ class SilverStripeAwareInitializer implements InitializerInterface public function __destruct() { - file_put_contents('php://stdout', "Killing test session environment..."); - + // Add condition here as register_shutdown_function() also calls this in __construct() if($this->testSessionEnvironment) { + file_put_contents('php://stdout', "Killing test session environment..."); $this->testSessionEnvironment->endTestSession(); + $this->testSessionEnvironment = null; + file_put_contents('php://stdout', " done!" . PHP_EOL); } - - file_put_contents('php://stdout', " done!" . PHP_EOL); } /**