Fix CS/WS issues

sebastianbergmann · May 4, 2021 · 2290275 · 2290275
1 parent f9ab9b2
commit 2290275
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
diff --git a/src/DateTimeComparator.php b/src/DateTimeComparator.php
@@ -47,8 +47,8 @@ public function accepts($expected, $actual)
      * @param bool  $ignoreCase   Case is ignored when set to true
      * @param array $processed    List of already processed elements (used to prevent infinite recursion)
      *
-     * @throws Exception
      * @throws ComparisonFailure
+     * @throws Exception
      */
     public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = [])/*: void*/
     {

diff --git a/src/ScalarComparator.php b/src/ScalarComparator.php
@@ -34,10 +34,10 @@ class ScalarComparator extends Comparator
     public function accepts($expected, $actual)
     {
         return ((is_scalar($expected) xor null === $expected) &&
-               (is_scalar($actual) xor null === $actual))
+               (is_scalar($actual) xor null === $actual)) ||
                // allow comparison between strings and objects featuring __toString()
-               || (is_string($expected) && is_object($actual) && method_exists($actual, '__toString'))
-               || (is_object($expected) && method_exists($expected, '__toString') && is_string($actual));
+               (is_string($expected) && is_object($actual) && method_exists($actual, '__toString')) ||
+               (is_object($expected) && method_exists($expected, '__toString') && is_string($actual));
     }
 
     /**

diff --git a/tests/ArrayComparatorTest.php b/tests/ArrayComparatorTest.php
@@ -15,8 +15,8 @@
  * @covers \SebastianBergmann\Comparator\ArrayComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class ArrayComparatorTest extends TestCase
 {

diff --git a/tests/DOMNodeComparatorTest.php b/tests/DOMNodeComparatorTest.php
@@ -17,8 +17,8 @@
  * @covers \SebastianBergmann\Comparator\DOMNodeComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class DOMNodeComparatorTest extends TestCase
 {

diff --git a/tests/DateTimeComparatorTest.php b/tests/DateTimeComparatorTest.php
@@ -18,8 +18,8 @@
  * @covers \SebastianBergmann\Comparator\DateTimeComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class DateTimeComparatorTest extends TestCase
 {

diff --git a/tests/DoubleComparatorTest.php b/tests/DoubleComparatorTest.php
@@ -16,8 +16,8 @@
  * @covers \SebastianBergmann\Comparator\DoubleComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class DoubleComparatorTest extends TestCase
 {

diff --git a/tests/ExceptionComparatorTest.php b/tests/ExceptionComparatorTest.php
@@ -17,8 +17,8 @@
  * @covers \SebastianBergmann\Comparator\ExceptionComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class ExceptionComparatorTest extends TestCase
 {

diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
@@ -21,8 +21,8 @@
  * @covers \SebastianBergmann\Comparator\Factory
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class FactoryTest extends TestCase
 {

diff --git a/tests/MockObjectComparatorTest.php b/tests/MockObjectComparatorTest.php
@@ -16,8 +16,8 @@
  * @covers \SebastianBergmann\Comparator\MockObjectComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class MockObjectComparatorTest extends TestCase
 {

diff --git a/tests/NumericComparatorTest.php b/tests/NumericComparatorTest.php
@@ -16,8 +16,8 @@
  * @covers \SebastianBergmann\Comparator\NumericComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class NumericComparatorTest extends TestCase
 {

diff --git a/tests/ObjectComparatorTest.php b/tests/ObjectComparatorTest.php
@@ -16,8 +16,8 @@
  * @covers \SebastianBergmann\Comparator\ObjectComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class ObjectComparatorTest extends TestCase
 {

diff --git a/tests/ResourceComparatorTest.php b/tests/ResourceComparatorTest.php
@@ -16,8 +16,8 @@
  * @covers \SebastianBergmann\Comparator\ResourceComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class ResourceComparatorTest extends TestCase
 {

diff --git a/tests/ScalarComparatorTest.php b/tests/ScalarComparatorTest.php
@@ -16,8 +16,8 @@
  * @covers \SebastianBergmann\Comparator\ScalarComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class ScalarComparatorTest extends TestCase
 {

diff --git a/tests/SplObjectStorageComparatorTest.php b/tests/SplObjectStorageComparatorTest.php
@@ -17,8 +17,8 @@
  * @covers \SebastianBergmann\Comparator\SplObjectStorageComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class SplObjectStorageComparatorTest extends TestCase
 {

diff --git a/tests/TypeComparatorTest.php b/tests/TypeComparatorTest.php
@@ -16,8 +16,8 @@
  * @covers \SebastianBergmann\Comparator\TypeComparator<extended>
  *
  * @uses \SebastianBergmann\Comparator\Comparator
- * @uses \SebastianBergmann\Comparator\Factory
  * @uses \SebastianBergmann\Comparator\ComparisonFailure
+ * @uses \SebastianBergmann\Comparator\Factory
  */
 final class TypeComparatorTest extends TestCase
 {