Merge branch '2.3'

Author: dunglas

.circleci/config.yml

@@ -142,7 +142,7 @@ jobs:
           name: Run PHPUnit tests
           command: |-
             mkdir -p build/logs/tmp build/cov
-            find tests -name '*Test.php' | circleci tests split --split-by=timings | parallel -j10% --rpl '{_} s/\//_/g;' \
+            circleci tests glob "tests/**/*Test.php" | circleci tests split --split-by=timings | parallel -j10% --rpl '{_} s/\//_/g;' \
               phpdbg -qrr vendor/bin/phpunit --coverage-php build/cov/coverage-{_}.cov --log-junit build/logs/tmp/{_}.xml --colors=always {}
       - run:
           name: Merge PHPUnit test reports

src/DataPersister/ChainDataPersister.php

@@ -51,11 +51,9 @@ public function persist($data)
     {
         foreach ($this->persisters as $persister) {
             if ($persister->supports($data)) {
-                $data = $persister->persist($data) ?? $data;
+                return $persister->persist($data) ?? $data;
             }
         }
-
-        return $data;
     }
 
     /**

tests/DataPersister/ChainDataPersisterTest.php

@@ -60,15 +60,7 @@ public function testPersist()
         $barPersisterProphecy->supports($dummy)->willReturn(true)->shouldBeCalled();
         $barPersisterProphecy->persist($dummy)->shouldBeCalled();
 
-        $bazPersisterProphecy = $this->prophesize(DataPersisterInterface::class);
-        $bazPersisterProphecy->supports($dummy)->willReturn(true)->shouldBeCalled();
-        $bazPersisterProphecy->persist($dummy)->shouldBeCalled();
-
-        (new ChainDataPersister([
-            $fooPersisterProphecy->reveal(),
-            $barPersisterProphecy->reveal(),
-            $bazPersisterProphecy->reveal(),
-        ]))->persist($dummy);
+        (new ChainDataPersister([$fooPersisterProphecy->reveal(), $barPersisterProphecy->reveal()]))->persist($dummy);
     }
 
     public function testRemove()