Merge branch 'v1.6' into v1.7

jmikola · jmikola · commit b35af66631a1 · 2020-09-22T09:26:09.000-04:00
diff --git a/tests/SpecTests/DocumentsMatchConstraint.php b/tests/SpecTests/DocumentsMatchConstraint.php
@@ -315,7 +315,7 @@ private function assertEquals(ArrayObject $expected, ArrayObject $actual, $ignor
             }
 
             $expectedType = is_object($expectedValue) ? get_class($expectedValue) : gettype($expectedValue);
-            $actualType = is_object($expectedValue) ? get_class($actualValue) : gettype($actualValue);
+            $actualType = is_object($actualValue) ? get_class($actualValue) : gettype($actualValue);
 
             // Workaround for ObjectComparator printing the whole actual object
             if ($expectedType !== $actualType) {

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ private function assertEquals(ArrayObject $expected, ArrayObject $actual, $ignor`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`$expectedType = is_object($expectedValue) ? get_class($expectedValue) : gettype($expectedValue);`
`318`		`- $actualType = is_object($expectedValue) ? get_class($actualValue) : gettype($actualValue);`
	`318`	`+ $actualType = is_object($actualValue) ? get_class($actualValue) : gettype($actualValue);`
`319`	`319`
`320`	`320`	`// Workaround for ObjectComparator printing the whole actual object`
`321`	`321`	`if ($expectedType !== $actualType) {`