Merge branch 'Slamdunk-hotfix/phpunit-alias'

library/Zend/Test/PHPUnit/Constraint/DomQuery.php

@@ -22,8 +22,17 @@
 
 if (version_compare(PHPUnit_Runner_Version::id(), '4.1', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'DomQuery41.php');
+
+    class Zend_Test_PHPUnit_Constraint_DomQuery extends Zend_Test_PHPUnit_Constraint_DomQuery41
+    {}
 } elseif (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'DomQuery37.php');
+
+    class Zend_Test_PHPUnit_Constraint_DomQuery extends Zend_Test_PHPUnit_Constraint_DomQuery37
+    {}
 } else {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'DomQuery34.php');
+
+    class Zend_Test_PHPUnit_Constraint_DomQuery extends Zend_Test_PHPUnit_Constraint_DomQuery34
+    {}
 }

library/Zend/Test/PHPUnit/Constraint/DomQuery34.php

@@ -33,7 +33,7 @@ require_once 'Zend/Dom/Query.php';
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_DomQuery34 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants

library/Zend/Test/PHPUnit/Constraint/DomQuery37.php

@@ -33,7 +33,7 @@ require_once 'Zend/Dom/Query.php';
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_DomQuery37 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants

library/Zend/Test/PHPUnit/Constraint/DomQuery41.php

@@ -33,7 +33,7 @@ require_once 'Zend/Dom/Query.php';
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_DomQuery41 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants

library/Zend/Test/PHPUnit/Constraint/Redirect.php

@@ -22,8 +22,17 @@
 
 if (version_compare(PHPUnit_Runner_Version::id(), '4.1', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Redirect41.php');
+
+    class Zend_Test_PHPUnit_Constraint_Redirect extends Zend_Test_PHPUnit_Constraint_Redirect41
+    {}
 } elseif (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Redirect37.php');
+
+    class Zend_Test_PHPUnit_Constraint_Redirect extends Zend_Test_PHPUnit_Constraint_Redirect37
+    {}
 } else {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Redirect34.php');
+
+    class Zend_Test_PHPUnit_Constraint_Redirect extends Zend_Test_PHPUnit_Constraint_Redirect34
+    {}
 }

library/Zend/Test/PHPUnit/Constraint/Redirect34.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_Redirect34 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants

library/Zend/Test/PHPUnit/Constraint/Redirect37.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_Redirect37 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants

library/Zend/Test/PHPUnit/Constraint/Redirect41.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_Redirect41 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants

library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php

@@ -22,8 +22,17 @@
 
 if (version_compare(PHPUnit_Runner_Version::id(), '4.1', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'ResponseHeader41.php');
+
+    class Zend_Test_PHPUnit_Constraint_ResponseHeader extends Zend_Test_PHPUnit_Constraint_ResponseHeader41
+    {}
 } elseif (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'ResponseHeader37.php');
+
+    class Zend_Test_PHPUnit_Constraint_ResponseHeader extends Zend_Test_PHPUnit_Constraint_ResponseHeader37
+    {}
 } else {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'ResponseHeader34.php');
+
+    class Zend_Test_PHPUnit_Constraint_ResponseHeader extends Zend_Test_PHPUnit_Constraint_ResponseHeader34
+    {}
 }

library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_ResponseHeader34 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants

library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_ResponseHeader37 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants

library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php

@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Constraint
+class Zend_Test_PHPUnit_Constraint_ResponseHeader41 extends PHPUnit_Framework_Constraint
 {
     /**#@+
      * Assertion type constants