Merge branch 'zf2/master' into milestones/autoloading

- Bring milestones/autoloading branch up-to-date with current master Conflicts: library/Zend/Loader/Autoloader.php library/Zend/Loader/PluginLoader.php library/Zend/Serializer/Serializer.php library/Zend/View/AbstractView.php library/Zend/View/View.php library/Zend/View/ViewEngine.php tests/Zend/Loader/AutoloaderTest.php tests/Zend/View/ViewTest.php
zendframework · Oct 28, 2010 · 9eedf95 · 9eedf95
2 parents 9ba9f17 + 59b5f1f
commit 9eedf95
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 17 deletions.
diff --git a/src/AbstractManager.php b/src/AbstractManager.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Configuration.php b/src/Configuration.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Configuration/SessionConfiguration.php b/src/Configuration/SessionConfiguration.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Configuration/StandardConfiguration.php b/src/Configuration/StandardConfiguration.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -26,7 +25,7 @@
 
 use Zend\Session\Configuration as Configurable,
     Zend\Session\Exception as SessionException,
-    Zend\Validator\Hostname\Hostname as HostnameValidator,
+    Zend\Validator\Hostname as HostnameValidator,
     Zend\Filter\Word\CamelCaseToUnderscore as CamelCaseToUnderscoreFilter;
 
 /**

diff --git a/src/Container.php b/src/Container.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Exception.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  * @since      Preview Release 0.2
  */
 

diff --git a/src/Manager.php b/src/Manager.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/SaveHandler.php b/src/SaveHandler.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  * @since      Preview Release 0.2
  */
 

diff --git a/src/SaveHandler/DbTable.php b/src/SaveHandler/DbTable.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace Zend\Session\SaveHandler;

diff --git a/src/SaveHandler/Exception.php b/src/SaveHandler/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace Zend\Session\SaveHandler;

diff --git a/src/SessionManager.php b/src/SessionManager.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Storage.php b/src/Storage.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Storage/ArrayStorage.php b/src/Storage/ArrayStorage.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Storage/SessionStorage.php b/src/Storage/SessionStorage.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Validator/HttpUserAgent.php b/src/Validator/HttpUserAgent.php
@@ -16,7 +16,6 @@
  * @package    Zend_Session
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  * @since      Preview Release 0.2
  */
 

diff --git a/test/ContainerTest.php b/test/ContainerTest.php
@@ -10,6 +10,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
+        $this->forceAutoloader();
         $_SESSION = array();
         Container::setDefaultManager(null);
         $this->manager = $manager = new TestAsset\TestManager(array(
@@ -25,6 +26,27 @@ public function tearDown()
         Container::setDefaultManager(null);
     }
 
+    protected function forceAutoloader()
+    {
+        $splAutoloadFunctions = spl_autoload_functions();
+        if (!$splAutoloadFunctions || !in_array('ZendTest_Autoloader', $splAutoloadFunctions)) {
+            include __DIR__ . '/../../_autoload.php';
+        }
+    }
+
+    /**
+     * Hack to allow running tests in separate processes
+     *
+     * @see    http://matthewturland.com/2010/08/19/process-isolation-in-phpunit/
+     * @param  PHPUnit_Framework_TestResult $result 
+     * @return void
+     */
+    public function run(\PHPUnit_Framework_TestResult $result = NULL)
+    {
+        $this->setPreserveGlobalState(false);
+        return parent::run($result);
+    }
+
     public function testInstantiationStartsSession()
     {
         $this->manager->destroy();

diff --git a/test/SaveHandler/DbTableTest.php b/test/SaveHandler/DbTableTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Session\SaveHandler;

diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php
@@ -14,11 +14,33 @@ class SessionManagerTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        $this->forceAutoloader();
         $this->error   = false;
         $this->manager = new SessionManager();
         Registry::_unsetInstance();
     }
 
+    protected function forceAutoloader()
+    {
+        $splAutoloadFunctions = spl_autoload_functions();
+        if (!$splAutoloadFunctions || !in_array('ZendTest_Autoloader', $splAutoloadFunctions)) {
+            include __DIR__ . '/../../_autoload.php';
+        }
+    }
+
+    /**
+     * Hack to allow running tests in separate processes
+     *
+     * @see    http://matthewturland.com/2010/08/19/process-isolation-in-phpunit/
+     * @param  PHPUnit_Framework_TestResult $result 
+     * @return void
+     */
+    public function run(\PHPUnit_Framework_TestResult $result = NULL)
+    {
+        $this->setPreserveGlobalState(false);
+        return parent::run($result);
+    }
+
     public function handleErrors($errno, $errstr)
     {
         $this->error = $errstr;