Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility with recent PHPUnit (8) #68

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/Hamcrest/Core/CombinableMatcherTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class CombinableMatcherTest extends \Hamcrest\AbstractMatcherTest
private $_either_3_or_4;
private $_not_3_and_not_4;

protected function setUp()
protected function setUp(): void
{
$this->_either_3_or_4 = \Hamcrest\Core\CombinableMatcher::either(equalTo(3))->orElse(equalTo(4));
$this->_not_3_and_not_4 = \Hamcrest\Core\CombinableMatcher::both(not(equalTo(3)))->andAlso(not(equalTo(4)));
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/Core/IsInstanceOfTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class IsInstanceOfTest extends \Hamcrest\AbstractMatcherTest
private $_baseClassInstance;
private $_subClassInstance;

protected function setUp()
protected function setUp(): void
{
$this->_baseClassInstance = new \Hamcrest\Core\SampleBaseClass('good');
$this->_subClassInstance = new \Hamcrest\Core\SampleSubClass('good');
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/Core/SetTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class SetTest extends \Hamcrest\AbstractMatcherTest
public static $_classProperty;
public $_instanceProperty;

protected function setUp()
protected function setUp(): void
{
self::$_classProperty = null;
unset($this->_instanceProperty);
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/FeatureMatcherTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class FeatureMatcherTest extends \Hamcrest\AbstractMatcherTest

private $_resultMatcher;

protected function setUp()
protected function setUp(): void
{
$this->_resultMatcher = $this->_resultMatcher();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/MatcherAssertTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class MatcherAssertTest extends TestCase
{

protected function setUp()
protected function setUp(): void
{
\Hamcrest\MatcherAssert::resetCount();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/StringDescriptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class StringDescriptionTest extends TestCase

private $_description;

protected function setUp()
protected function setUp(): void
{
$this->_description = new \Hamcrest\StringDescription();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class IsEqualIgnoringWhiteSpaceTest extends \Hamcrest\AbstractMatcherTest

private $_matcher;

protected function setUp()
protected function setUp(): void
{
$this->_matcher = \Hamcrest\Text\IsEqualIgnoringWhiteSpace::equalToIgnoringWhiteSpace(
"Hello World how\n are we? "
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class StringContainsIgnoringCaseTest extends \Hamcrest\AbstractMatcherTest

private $_stringContains;

protected function setUp()
protected function setUp(): void
{
$this->_stringContains = \Hamcrest\Text\StringContainsIgnoringCase::containsStringIgnoringCase(
strtolower(self::EXCERPT)
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/Text/StringContainsInOrderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class StringContainsInOrderTest extends \Hamcrest\AbstractMatcherTest

private $_m;

protected function setUp()
protected function setUp(): void
{
$this->_m = \Hamcrest\Text\StringContainsInOrder::stringContainsInOrder(array('a', 'b', 'c'));
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/Text/StringContainsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class StringContainsTest extends \Hamcrest\AbstractMatcherTest

private $_stringContains;

protected function setUp()
protected function setUp(): void
{
$this->_stringContains = \Hamcrest\Text\StringContains::containsString(self::EXCERPT);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/Text/StringEndsWithTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class StringEndsWithTest extends \Hamcrest\AbstractMatcherTest

private $_stringEndsWith;

protected function setUp()
protected function setUp(): void
{
$this->_stringEndsWith = \Hamcrest\Text\StringEndsWith::endsWith(self::EXCERPT);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/Text/StringStartsWithTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class StringStartsWithTest extends \Hamcrest\AbstractMatcherTest

private $_stringStartsWith;

protected function setUp()
protected function setUp(): void
{
$this->_stringStartsWith = \Hamcrest\Text\StringStartsWith::startsWith(self::EXCERPT);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Hamcrest/Xml/HasXPathTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class HasXPathTest extends \Hamcrest\AbstractMatcherTest
protected static $doc;
protected static $html;

public static function setUpBeforeClass()
public static function setUpBeforeClass(): void
{
self::$xml = <<<XML
<?xml version="1.0"?>
Expand Down