Merge pull request #376 from mhujer/phpunit41

Fixed compatibility with PHPUnit 4.1
zendframework · Jun 12, 2014 · fa015ec · fa015ec
2 parents 1947510 + 01a19d9
commit fa015ec
Show file tree

Hide file tree

Showing 6 changed files with 1,183 additions and 3 deletions.
diff --git a/library/Zend/Test/PHPUnit/Constraint/DomQuery.php b/library/Zend/Test/PHPUnit/Constraint/DomQuery.php
@@ -20,7 +20,9 @@
  * @version    $Id$
  */
 
-if (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
+if (version_compare(PHPUnit_Runner_Version::id(), '4.1', '>=')) {
+    include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'DomQuery41.php');
+} elseif (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'DomQuery37.php');
 } else {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'DomQuery34.php');