Mercurial > hg > cmmr2012-drupal-site
diff vendor/sebastian/comparator/src/MockObjectComparator.php @ 2:5311817fb629
Theme updates
author | Chris Cannam |
---|---|
date | Tue, 10 Jul 2018 13:19:18 +0000 |
parents | c75dbcec494b |
children |
line wrap: on
line diff
--- a/vendor/sebastian/comparator/src/MockObjectComparator.php Thu Jul 05 15:32:06 2018 +0100 +++ b/vendor/sebastian/comparator/src/MockObjectComparator.php Tue Jul 10 13:19:18 2018 +0000 @@ -1,6 +1,6 @@ <?php /* - * This file is part of the Comparator package. + * This file is part of sebastian/comparator. * * (c) Sebastian Bergmann <sebastian@phpunit.de> * @@ -18,20 +18,23 @@ /** * Returns whether the comparator can compare two values. * - * @param mixed $expected The first value to compare - * @param mixed $actual The second value to compare + * @param mixed $expected The first value to compare + * @param mixed $actual The second value to compare + * * @return bool */ public function accepts($expected, $actual) { - return $expected instanceof \PHPUnit_Framework_MockObject_MockObject && $actual instanceof \PHPUnit_Framework_MockObject_MockObject; + return ($expected instanceof \PHPUnit_Framework_MockObject_MockObject || $expected instanceof \PHPUnit\Framework\MockObject\MockObject) && + ($actual instanceof \PHPUnit_Framework_MockObject_MockObject || $actual instanceof \PHPUnit\Framework\MockObject\MockObject); } /** * Converts an object to an array containing all of its private, protected * and public properties. * - * @param object $object + * @param object $object + * * @return array */ protected function toArray($object) @@ -42,4 +45,4 @@ return $array; } -} \ No newline at end of file +}