Skip to content
This repository has been archived by the owner on May 16, 2018. It is now read-only.

Fixed compatibility with PHPUnit 4.1 #376

Merged
merged 1 commit into from
Jun 12, 2014
Merged

Conversation

mhujer
Copy link
Contributor

@mhujer mhujer commented Jun 7, 2014

This fixes compatibility with PHPUnit 4.1 as the Constraint interface was changed in sebastianbergmann/phpunit@f0322b6#diff-16

Declaration of Zend_Test_PHPUnit_Constraint_Redirect::fail() should be compatible with 
PHPUnit_Framework_Constraint::fail($other, $description, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = NULL)

Declaration of Zend_Test_PHPUnit_Constraint_ResponseHeader::fail() should be compatible with 
PHPUnit_Framework_Constraint::fail($other, $description, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = NULL)

Declaration of Zend_Test_PHPUnit_Constraint_DomQuery::fail() should be compatible with 
PHPUnit_Framework_Constraint::fail($other, $description, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = NULL)

The compatibility with previous and new PHPUnit versions is accomplished through conditional include of constraint with proper interface. (DomQuery41.php, Redirect41.php and ResponseHeader41.php are just copies of respective *37.php files with fail() method interface changed)

@froschdesign froschdesign added this to the 1.12.7 milestone Jun 10, 2014
akrabat added a commit that referenced this pull request Jun 12, 2014
Fixed compatibility with PHPUnit 4.1
@akrabat akrabat merged commit fa015ec into zendframework:master Jun 12, 2014
@mhujer mhujer deleted the phpunit41 branch June 13, 2014 12:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants