Merge branch 'hotfix/7'

Close #7

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.5.3 - TBD
+## 2.5.3 - 2016-03-01
 
 ### Added
 
@@ -21,6 +21,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#6](https://github.com/zendframework/zend-test/pull/6) updates the
   `AbstractControllerTestCase` to mark a test as failed if no route match occurs
   in a number of assertions that require a route match.
+- [#7](https://github.com/zendframework/zend-test/pull/7) modifies the `reset()`
+  method of the `AbstractControllerTestCase` to prevent rewriting the
+  `$_SESSION` superglobal if it has not previously been enabled.
 
 ## 2.5.2 - 2015-12-09
 

src/PHPUnit/Controller/AbstractControllerTestCase.php

@@ -292,9 +292,14 @@ public function reset($keepPersistence = false)
         // force to re-create all components
         $this->application = null;
 
-        // reset server datas
+        // reset server data
         if (!$keepPersistence) {
-            $_SESSION = [];
+            // Do not create a global session variable if it doesn't already
+            // exist. Otherwise calling this function could mark tests risky,
+            // as it changes global state.
+            if (array_key_exists('_SESSION', $GLOBALS)) {
+                $_SESSION = [];
+            }
             $_COOKIE  = [];
         }
 
@@ -697,8 +702,8 @@ public function assertNoMatchedRoute()
             $match      = $routeMatch->getMatchedRouteName();
             $match      = strtolower($match);
             throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                    'Failed asserting that no route matched, actual matched route name is "%s"',
-                    $match
+                'Failed asserting that no route matched, actual matched route name is "%s"',
+                $match
             ));
         }
         $this->assertNull($routeMatch);

test/PHPUnit/Controller/AbstractControllerTestCaseTest.php

@@ -418,4 +418,15 @@ public function testCustomResponseObject()
         $this->dispatch('/custom-response');
         $this->assertResponseStatusCode(999);
     }
+
+    public function testResetDoesNotCreateSessionIfNoSessionExists()
+    {
+        if (! extension_loaded('session')) {
+            $this->markTestSkipped('No session extension loaded');
+        }
+
+        $this->reset();
+
+        $this->assertFalse(array_key_exists('_SESSION', $GLOBALS));
+    }
 }

test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php

@@ -549,6 +549,10 @@ public function testAssertWithMultiDispatch()
 
     public function testAssertWithMultiDispatchWithoutPersistence()
     {
+        if (! extension_loaded('session')) {
+            $this->markTestSkipped('No session extension loaded');
+        }
+
         $this->dispatch('/tests-persistence');
 
         $controller = $this->getApplicationServiceLocator()
@@ -573,6 +577,10 @@ public function testAssertWithMultiDispatchWithoutPersistence()
 
     public function testAssertWithMultiDispatchWithPersistence()
     {
+        if (! extension_loaded('session')) {
+            $this->markTestSkipped('No session extension loaded');
+        }
+
         $this->dispatch('/tests-persistence');
 
         $controller = $this->getApplicationServiceLocator()
@@ -607,14 +615,18 @@ public function testAssertWithEventShared()
 
         $this->assertEquals(true, StaticEventManager::hasInstance());
         $countListeners = count(StaticEventManager::getInstance()->getListeners(
-            'Zend\Mvc\Application', MvcEvent::EVENT_FINISH));
+            'Zend\Mvc\Application',
+            MvcEvent::EVENT_FINISH
+        ));
         $this->assertEquals(1, $countListeners);
 
         $this->reset();
 
         $this->assertEquals(false, StaticEventManager::hasInstance());
         $countListeners = StaticEventManager::getInstance()->getListeners(
-            'Zend\Mvc\Application', MvcEvent::EVENT_FINISH);
+            'Zend\Mvc\Application',
+            MvcEvent::EVENT_FINISH
+        );
         $this->assertEquals(false, $countListeners);
 
         $this->dispatch('/tests-bis');