diff vendor/sebastian/comparator/src/MockObjectComparator.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

--- a/vendor/sebastian/comparator/src/MockObjectComparator.php	Mon Apr 23 09:33:26 2018 +0100
+++ b/vendor/sebastian/comparator/src/MockObjectComparator.php	Mon Apr 23 09:46:53 2018 +0100
@@ -1,6 +1,6 @@
 <?php
 /*
- * This file is part of the Comparator package.
+ * This file is part of sebastian/comparator.
  *
  * (c) Sebastian Bergmann <[e-mail]>
  *
@@ -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
+}