Merge 0.4.1. Fixes #133

.gitignore

@@ -3,3 +3,5 @@ composer.lock
 vendor/
 docs/
 .editorconfig
+.phpunit.result.cache
+build/

README.md

@@ -9,7 +9,7 @@ WP_Mock is an API mocking framework, built and maintained by [10up](http://10up.
 First, add WP Mock as a dev-dependency with [Composer](http://getcomposer.org):
 
 ```bash
-composer require --dev 10up/wp_mock:0.3.0
+composer require --dev 10up/wp_mock:0.4.1
 ```
 
 Then, make sure your bootstrap file is loading the composer autoloader:

composer.json

@@ -2,7 +2,7 @@
 	"name"       : "10up/wp_mock",
 	"description": "A mocking library to take the pain out of unit testing for WordPress",
 	"license"    : "GPL-2.0-or-later",
-	"version"    : "0.4.0",
+	"version"    : "0.4.1",
 	"require"    : {
 		"php"                 : ">=7.1",
 		"phpunit/phpunit"     : ">=7.0",

php/WP_Mock.php

@@ -114,7 +114,7 @@ public static function bootstrap() {
 	/**
 	 * Make sure Mockery doesn't have anything set up already.
 	 */
-	public static function setUp() {
+	public static function setUp() : void {
 		if ( self::$__bootstrapped ) {
 			\Mockery::close();
 
@@ -128,7 +128,7 @@ public static function setUp() {
 	/**
 	 * Tear down anything built up inside Mockery when we're ready to do so.
 	 */
-	public static function tearDown() {
+	public static function tearDown() : void {
 		self::$event_manager->flush();
 		self::$function_manager->flush();
 

php/WP_Mock/Tools/Constraints/IsEqualHtml.php

@@ -4,7 +4,43 @@
 
 use PHPUnit\Framework\Constraint\IsEqual;
 
-class IsEqualHtml extends \PHPUnit\Framework\Constraint\IsEqual {
+class IsEqualHtml {
+	protected $IsEqual;
+	protected $value;
+
+	/**
+	 * @var float
+	 */
+	private $delta;
+
+	/**
+	 * @var int
+	 */
+	private $maxDepth;
+
+	/**
+	 * @var bool
+	 */
+	private $canonicalize;
+
+	/**
+	 * @var bool
+	 */
+	private $ignoreCase;
+
+	public function __construct(
+			$value,
+			float $delta = 0.0,
+			int $maxDepth = 10,
+			bool $canonicalize = false,
+			bool $ignoreCase = false
+		) {
+			$this->value = $value;
+			$this->delta = $delta;
+			$this->maxDepth = $maxDepth;
+			$this->canonicalize = $canonicalize;
+			$this->ignoreCase = $ignoreCase;
+		}
 
 	private function clean( $thing ) {
 		$thing = preg_replace( '/\n\s+/', '', $thing );
@@ -15,7 +51,7 @@ private function clean( $thing ) {
 	public function evaluate( $other, $description = '', $returnResult = FALSE ) {
 		$other       = $this->clean( $other );
 		$this->value = $this->clean( $this->value );
-		return parent::evaluate( $other, $description, $returnResult );
+		$isEqual = new IsEqual( $this->value, $this->delta, $this->maxDepth, $this->canonicalize, $this->ignoreCase );
+		return $isEqual->evaluate( $other, $description, $returnResult );
 	}
-
 }

php/WP_Mock/Tools/TestCase.php

@@ -40,7 +40,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
 	 */
 	protected $testFiles = array();
 
-	public function setUp() {
+	public function setUp() : void {
 		$this->requireFileDependencies();
 
 		WP_Mock::setUp();
@@ -54,7 +54,7 @@ public function setUp() {
 		$this->cleanGlobals();
 	}
 
-	public function tearDown() {
+	public function tearDown() : void {
 		WP_Mock::tearDown();
 
 		$this->cleanGlobals();

phpunit.xml.dist

@@ -9,7 +9,7 @@
 				 colors="true"
          verbose="true">
 	<testsuites>
-		<testsuite>
+		<testsuite name="All Tests">
 			<directory suffix="Test.php">./tests/</directory>
 		</testsuite>
 	</testsuites>

tests/DeprecatedMethodsTest.php

@@ -2,19 +2,20 @@
 
 class DeprecatedMethodsTest extends \PHPUnit\Framework\TestCase {
 
-	public function setUp() {
+	public function setUp() : void {
 		WP_Mock::setUp();
 		WP_Mock::getDeprecatedListener()->reset();
 	}
 
-	protected function tearDown() {
+	protected function tearDown() : void {
 		WP_Mock::getDeprecatedListener()->reset();
 		WP_Mock::tearDown();
 	}
 
 	public function testWpFunctionLogsDeprecationNotice() {
 		$listener = WP_Mock::getDeprecatedListener();
-		$result   = Mockery::mock( '\PHPUnit\Framework\TestResult' );
+		$testResult = new \PHPUnit\Framework\TestResult();
+		$result   = Mockery::mock( $testResult );
 		$case     = Mockery::mock( '\PHPUnit\Framework\TestCase' );
 		$listener->setTestCase( $case );
 		$listener->setTestResult( $result );
@@ -27,7 +28,8 @@ public function testWpFunctionLogsDeprecationNotice() {
 
 	public function testWpPassthruFunctionLogsDeprecationNotice() {
 		$listener = WP_Mock::getDeprecatedListener();
-		$result   = Mockery::mock( '\PHPUnit\Framework\TestResult' );
+		$testResult = new \PHPUnit\Framework\TestResult();
+		$result = Mockery::mock( $testResult );
 		$case     = Mockery::mock( '\PHPUnit\Framework\TestCase' );
 		$listener->setTestCase( $case );
 		$listener->setTestResult( $result );

tests/FunctionMocksTest.php

@@ -21,7 +21,7 @@ class FunctionMocksTest extends \PHPUnit\Framework\TestCase {
 		'_n',
 	);
 
-	protected function setUp() {
+	protected function setUp() : void {
 		if ( ! $this->isInIsolation() ) {
 			WP_Mock::setUp();
 		}
@@ -56,10 +56,10 @@ public function testCommonFunctionsDefaultFunctionality( $function, $action ) {
 	/**
 	 * @runInSeparateProcess
 	 * @preserveGlobalState disabled
-	 * @expectedException \PHPUnit\Framework\ExpectationFailedException
-	 * @expectedExceptionMessageRegExp /No handler found for \w+/
 	 */
 	public function testDefaultFailsInStrictMode() {
+		$this->expectExceptionMessageRegExp('/No handler found for \w+/');
+		$this->expectException('\PHPUnit\Framework\ExpectationFailedException');
 		WP_Mock::activateStrictMode();
 		WP_Mock::bootstrap();
 		_e('Test');

tests/WP_Mock/DeprecatedListenerTest.php

@@ -13,11 +13,11 @@ class DeprecatedListenerTest extends \PHPUnit\Framework\TestCase {
 	/** @var DeprecatedListener */
 	protected $object;
 
-	protected function setUp() {
+	protected function setUp() : void {
 		$this->object = new DeprecatedListener();
 	}
 
-	public function tearDown() {
+	public function tearDown() : void {
 		$this->object->reset();
 	}
 
@@ -37,7 +37,8 @@ public function testReset() {
 	}
 
 	public function testCheckCallsNoCalls() {
-		$result = Mockery::mock( '\PHPUnit\Framework\TestResult' );
+		$testResult = new \PHPUnit\Framework\TestResult();
+		$result     = Mockery::mock( $testResult );
 		$result->shouldReceive( 'addFailure' )->never();
 		/** @var \\PHPUnit\Framework\TestResult $result */
 		$this->object->setTestResult( $result );
@@ -51,7 +52,8 @@ public function testCheckCalls_scalar_only() {
 		$testCase = Mockery::mock( '\PHPUnit\Framework\TestCase' );
 		/** @var \PHPUnit\Framework\TestCase $testCase */
 		$this->object->setTestCase( $testCase );
-		$result = Mockery::mock( '\PHPUnit\Framework\TestResult' );
+		$testResult = new \PHPUnit\Framework\TestResult();
+		$result     = Mockery::mock( $testResult );
 		$result->shouldReceive( 'addFailure' )
 			->once()
 			->andReturnUsing( function ( $case, $exception, $int ) use ( $testCase ) {
@@ -85,7 +87,8 @@ public function testCheckCalls_non_scalars() {
 		$testCase = Mockery::mock( '\PHPUnit\Framework\TestCase' );
 		/** @var \PHPUnit\Framework\TestCase $testCase */
 		$this->object->setTestCase( $testCase );
-		$result      = Mockery::mock( '\PHPUnit\Framework\TestResult' );
+		$testResult = new \PHPUnit\Framework\TestResult();
+		$result     = Mockery::mock( $testResult );;
 		$testClosure = function ( $case, $exception, $int ) use ( $testCase, $callback1, $object1, $range ) {
 			$int = (int) $int; // It's coming as 0.0
 			$callback1 = get_class( $callback1 ) . ':' . spl_object_hash( $callback1 );