From 2290275320a248b7437404e92bc8b244c1b7f99f Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Tue, 4 May 2021 17:41:14 +0200
Subject: [PATCH] Fix CS/WS issues

---
 src/DateTimeComparator.php               | 2 +-
 src/ScalarComparator.php                 | 6 +++---
 tests/ArrayComparatorTest.php            | 2 +-
 tests/DOMNodeComparatorTest.php          | 2 +-
 tests/DateTimeComparatorTest.php         | 2 +-
 tests/DoubleComparatorTest.php           | 2 +-
 tests/ExceptionComparatorTest.php        | 2 +-
 tests/FactoryTest.php                    | 2 +-
 tests/MockObjectComparatorTest.php       | 2 +-
 tests/NumericComparatorTest.php          | 2 +-
 tests/ObjectComparatorTest.php           | 2 +-
 tests/ResourceComparatorTest.php         | 2 +-
 tests/ScalarComparatorTest.php           | 2 +-
 tests/SplObjectStorageComparatorTest.php | 2 +-
 tests/TypeComparatorTest.php             | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/DateTimeComparator.php b/src/DateTimeComparator.php
index 0a303b6..d58e6b3 100644
--- 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
index 08ded92..c473cc6 100644
--- 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
index 017cd91..ddbaed4 100644
--- 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
index 8d52fc2..dd5f30a 100644
--- 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
index 4312812..8da7bb4 100644
--- 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
index f45f3a7..d3ca2b1 100644
--- 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
index 533e066..fec38e6 100644
--- 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
index b328cca..a819494 100644
--- 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
index 1469538..553ff62 100644
--- 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
index 7d8b49a..f2e0e62 100644
--- 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
index 08bf814..c44916d 100644
--- 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
index ba15c8a..3209a3c 100644
--- 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
index e44eb34..198b8a3 100644
--- 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
index 086b3b0..31d7e1f 100644
--- 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
index 00ae070..64d54d0 100644
--- 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
 {