Closes #85

sebastianbergmann · Jun 15, 2020 · 266d85e · 266d85e
1 parent 1de7b33
commit 266d85e
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 15 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -193,6 +193,6 @@ return PhpCsFixer\Config::create()
                 'property',
             ],
         ],
-        'void_return' => true,
+        'void_return' => false,
         'whitespace_after_comma_in_array' => true,
     ]);
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -2,6 +2,12 @@
 
 All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [4.0.2] - 2020-06-15
+
+### Fixed
+
+* [#53](https://github.com/sebastianbergmann/comparator/issues/85): Version 4.0.1 breaks backward compatibility
+
 ## [4.0.1] - 2020-06-15
 
 ### Changed
@@ -62,6 +68,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 * Added `SebastianBergmann\Comparator\Factory::reset()` to unregister all non-default comparators
 * Added support for `phpunit/phpunit-mock-objects` version `^5.0`
 
+[4.0.2]: https://github.com/sebastianbergmann/comparator/compare/4.0.1...4.0.2
 [4.0.1]: https://github.com/sebastianbergmann/comparator/compare/4.0.0...4.0.1
 [4.0.0]: https://github.com/sebastianbergmann/comparator/compare/3.0.2...4.0.0
 [3.0.2]: https://github.com/sebastianbergmann/comparator/compare/3.0.1...3.0.2

diff --git a/src/ArrayComparator.php b/src/ArrayComparator.php
@@ -43,7 +43,7 @@ public function accepts($expected, $actual)
      *
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = []): void
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = [])/*: void*/
     {
         if ($canonicalize) {
             \sort($expected);

diff --git a/src/Comparator.php b/src/Comparator.php
@@ -31,7 +31,7 @@ public function __construct()
         $this->exporter = new Exporter;
     }
 
-    public function setFactory(Factory $factory): void
+    public function setFactory(Factory $factory)/*: void*/
     {
         $this->factory = $factory;
     }

diff --git a/src/DOMNodeComparator.php b/src/DOMNodeComparator.php
@@ -42,7 +42,7 @@ public function accepts($expected, $actual)
      *
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = []): void
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = [])/*: void*/
     {
         $expectedAsString = $this->nodeToText($expected, true, $ignoreCase);
         $actualAsString   = $this->nodeToText($actual, true, $ignoreCase);

diff --git a/src/DateTimeComparator.php b/src/DateTimeComparator.php
@@ -41,7 +41,7 @@ public function accepts($expected, $actual)
      * @throws \Exception
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = []): void
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = [])/*: void*/
     {
         /** @var \DateTimeInterface $expected */
         /** @var \DateTimeInterface $actual */

diff --git a/src/DoubleComparator.php b/src/DoubleComparator.php
@@ -45,7 +45,7 @@ public function accepts($expected, $actual)
      *
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false): void
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)/*: void*/
     {
         if ($delta == 0) {
             $delta = self::EPSILON;

diff --git a/src/Factory.php b/src/Factory.php
@@ -84,7 +84,7 @@ public function getComparatorFor($expected, $actual)
      *
      * @param Comparator $comparator The comparator to be registered
      */
-    public function register(Comparator $comparator): void
+    public function register(Comparator $comparator)/*: void*/
     {
         \array_unshift($this->customComparators, $comparator);
 
@@ -98,7 +98,7 @@ public function register(Comparator $comparator): void
      *
      * @param Comparator $comparator The comparator to be unregistered
      */
-    public function unregister(Comparator $comparator): void
+    public function unregister(Comparator $comparator)/*: void*/
     {
         foreach ($this->customComparators as $key => $_comparator) {
             if ($comparator === $_comparator) {
@@ -110,7 +110,7 @@ public function unregister(Comparator $comparator): void
     /**
      * Unregisters all non-default comparators.
      */
-    public function reset(): void
+    public function reset()/*: void*/
     {
         $this->customComparators = [];
     }

diff --git a/src/NumericComparator.php b/src/NumericComparator.php
@@ -42,7 +42,7 @@ public function accepts($expected, $actual)
      *
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false): void
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)/*: void*/
     {
         if ($this->isInfinite($actual) && $this->isInfinite($expected)) {
             return;

diff --git a/src/ObjectComparator.php b/src/ObjectComparator.php
@@ -39,7 +39,7 @@ public function accepts($expected, $actual)
      *
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = []): void
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = [])/*: void*/
     {
         if (\get_class($actual) !== \get_class($expected)) {
             throw new ComparisonFailure(

diff --git a/src/ResourceComparator.php b/src/ResourceComparator.php
@@ -38,7 +38,7 @@ public function accepts($expected, $actual)
      *
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false): void
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)/*: void*/
     {
         if ($actual != $expected) {
             throw new ComparisonFailure(

diff --git a/src/ScalarComparator.php b/src/ScalarComparator.php
@@ -44,7 +44,7 @@ public function accepts($expected, $actual)
      *
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false): void
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)/*: void*/
     {
         $expectedToCompare = $expected;
         $actualToCompare   = $actual;

diff --git a/src/SplObjectStorageComparator.php b/src/SplObjectStorageComparator.php
@@ -38,7 +38,7 @@ public function accepts($expected, $actual)
      *
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false): void
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)/*: void*/
     {
         foreach ($actual as $object) {
             if (!$expected->contains($object)) {

diff --git a/src/TypeComparator.php b/src/TypeComparator.php
@@ -38,7 +38,7 @@ public function accepts($expected, $actual)
      *
      * @throws ComparisonFailure
      */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false): void
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)/*: void*/
     {
         if (\gettype($expected) != \gettype($actual)) {
             throw new ComparisonFailure(