Aktualisiere PHP-CS-Fixer auf v3.62.0 (#18)

webfactory · Aug 26, 2024 · dc321cc · dc321cc
1 parent f2c6fc7
commit dc321cc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 19 deletions.
diff --git a/.github/workflows/fix-cs-php.yml b/.github/workflows/fix-cs-php.yml
@@ -18,7 +18,7 @@ jobs:
                     ref: ${{ github.head_ref }}
 
             -   name: Run PHP-CS-Fixer
-                uses: docker://oskarstark/php-cs-fixer-ga:3.11.0
+                uses: docker://ghcr.io/webfactory/php-cs-fixer:3.62.0
 
             -   name: Commit and push back changes
                 uses: stefanzweifel/git-auto-commit-action@v4

diff --git a/src/DestinationAdapter.php b/src/DestinationAdapter.php
@@ -19,7 +19,7 @@ interface DestinationAdapter
     /**
      * Get an Iterator over all $className objects in the destination system, ordered by their ascending IDs.
      *
-     * @return Iterator
+     * @return \Iterator
      *
      * @psalm-return Iterator<Tr>
      */

diff --git a/src/SourceAdapter.php b/src/SourceAdapter.php
@@ -21,7 +21,7 @@ interface SourceAdapter
     /**
      * Get an Iterator over all objects in the source system, ordered by their ascending IDs.
      *
-     * @return Iterator
+     * @return \Iterator
      *
      * @psalm-return Iterator<Ts>
      */

diff --git a/src/Synchronizer.php b/src/Synchronizer.php
@@ -9,7 +9,6 @@
 namespace Webfactory\ContentMapping;
 
 use Iterator;
-use LogicException;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
@@ -43,10 +42,10 @@ final class Synchronizer
     private $logger;
 
     /** @var ?int */
-    private $lastSourceId = null;
+    private $lastSourceId;
 
     /** @var ?int */
-    private $lastDestinationId = null;
+    private $lastDestinationId;
 
     /**
      * @psalm-param SourceAdapter<Ts> $source
@@ -57,7 +56,7 @@ public function __construct(
         SourceAdapter $source,
         Mapper $mapper,
         DestinationAdapter $destination,
-        LoggerInterface $logger = null
+        ?LoggerInterface $logger = null
     ) {
         $this->source = $source;
         $this->mapper = $mapper;
@@ -128,7 +127,7 @@ private function fetchDestinationId(object $destinationObject): int
      * @psalm-param Iterator<Ts> $sourceQueue
      * @psalm-param Iterator<Tr> $destinationQueue
      */
-    private function compareQueuesAndReactAccordingly(Iterator $sourceQueue, Iterator $destinationQueue, string $className): void
+    private function compareQueuesAndReactAccordingly(\Iterator $sourceQueue, \Iterator $destinationQueue, string $className): void
     {
         while ($sourceQueue->valid() && $destinationQueue->valid()) {
             $sourceObject = $sourceQueue->current();
@@ -145,7 +144,7 @@ private function compareQueuesAndReactAccordingly(Iterator $sourceQueue, Iterato
                 $destinationQueue->next();
             } else {
                 if ($sourceObjectId != $destinationObjectId) {
-                    throw new LogicException();
+                    throw new \LogicException();
                 }
                 $this->update($sourceObject, $destinationObject);
                 $sourceQueue->next();
@@ -239,7 +238,7 @@ private function update(object $sourceObject, object $destinationObject): void
      * @psalm-param Iterator<Ts> $sourceQueue
      * @psalm-param Iterator<Tr> $destinationQueue
      */
-    private function insertRemainingSourceObjects(Iterator $sourceQueue, string $className): void
+    private function insertRemainingSourceObjects(\Iterator $sourceQueue, string $className): void
     {
         while ($sourceQueue->valid()) {
             $sourceObject = $sourceQueue->current();
@@ -254,7 +253,7 @@ private function insertRemainingSourceObjects(Iterator $sourceQueue, string $cla
      * @psalm-param Iterator<Ts> $sourceQueue
      * @psalm-param Iterator<Tr> $destinationQueue
      */
-    private function deleteRemainingDestinationObjects(Iterator $destinationQueue): void
+    private function deleteRemainingDestinationObjects(\Iterator $destinationQueue): void
     {
         while ($destinationQueue->valid()) {
             $destinationObject = $destinationQueue->current();

diff --git a/tests/Stubs/DestinationStub.php b/tests/Stubs/DestinationStub.php
@@ -11,10 +11,7 @@ class DestinationStub implements DestinationAdapter
      */
     private $objects;
 
-    /**
-     * @param $objects
-     */
-    public function __construct(\Iterator $objects = null)
+    public function __construct(?\Iterator $objects = null)
     {
         $this->objects = $objects ?: new \ArrayIterator();
     }

diff --git a/tests/Stubs/SourceStub.php b/tests/Stubs/SourceStub.php
@@ -11,10 +11,7 @@ class SourceStub implements SourceAdapter
      */
     private $objects;
 
-    /**
-     * @param $objects
-     */
-    public function __construct(\Iterator $objects = null)
+    public function __construct(?\Iterator $objects = null)
     {
         $this->objects = $objects ?: new \ArrayIterator();
     }