PHPunit 4 compatibility for test files

tests/TestHelper.php

@@ -23,13 +23,15 @@
 /**
  * Include PHPUnit dependencies
  */
-require_once 'PHPUnit/Runner/Version.php';
+if (version_compare(PHPUnit_Runner_Version::id(), '4.0.0', '<')) {
+    require_once 'PHPUnit/Runner/Version.php';
 
-$phpunitVersion = PHPUnit_Runner_Version::id();
-if ($phpunitVersion == '@package_version@' || version_compare($phpunitVersion, '3.5.5', '>=')) {
-    require_once 'PHPUnit/Autoload.php'; // >= PHPUnit 3.5.5
-} else {
-    require_once 'PHPUnit/Framework.php'; // < PHPUnit 3.5.5
+    $phpunitVersion = PHPUnit_Runner_Version::id();
+    if ($phpunitVersion == '@package_version@' || version_compare($phpunitVersion, '3.5.5', '>=')) {
+        require_once 'PHPUnit/Autoload.php'; // >= PHPUnit 3.5.5
+    } else {
+        require_once 'PHPUnit/Framework.php'; // < PHPUnit 3.5.5
+    }
 }
 
 /*

tests/Zend/Loader/AutoloaderFactoryTest.php

@@ -27,10 +27,12 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  * Preload a number of classes to ensure they're available once we've disabled
  * other autoloaders.
  */
-require_once 'PHPUnit/Framework/Constraint/IsEqual.php';
-require_once 'PHPUnit/Framework/Constraint/IsInstanceOf.php';
-require_once 'PHPUnit/Framework/Constraint/IsNull.php';
-require_once 'PHPUnit/Framework/Constraint/IsTrue.php';
+if (version_compare(PHPUnit_Runner_Version::id(), '4.0.0', '<')) {
+    require_once 'PHPUnit/Framework/Constraint/IsEqual.php';
+    require_once 'PHPUnit/Framework/Constraint/IsInstanceOf.php';
+    require_once 'PHPUnit/Framework/Constraint/IsNull.php';
+    require_once 'PHPUnit/Framework/Constraint/IsTrue.php';
+}
 require_once 'Zend/Loader/AutoloaderFactory.php';
 require_once 'Zend/Loader/ClassMapAutoloader.php';
 require_once 'Zend/Loader/StandardAutoloader.php';
@@ -54,7 +56,7 @@ class Zend_Loader_AutoloaderFactoryTest extends PHPUnit_Framework_TestCase
             $this->loaders = array();
         }
 
-        // Clear out other autoloaders to ensure those being tested are at the 
+        // Clear out other autoloaders to ensure those being tested are at the
         // top of the stack
         foreach ($this->loaders as $loader) {
             spl_autoload_unregister($loader);
@@ -108,7 +110,7 @@ class Zend_Loader_AutoloaderFactoryTest extends PHPUnit_Framework_TestCase
         }
         include dirname(__FILE__) . '/_files/InvalidInterfaceAutoloader.php';
         Zend_Loader_AutoloaderFactory::factory(array(
-            'InvalidInterfaceAutoloader' => array()            
+            'InvalidInterfaceAutoloader' => array()
         ));
     }