Fix tests

markuspoerschke · Dec 18, 2023 · 76d2a8d · 76d2a8d
1 parent 092aabc
commit 76d2a8d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,7 +39,12 @@ jobs:
         if: ${{ matrix.php-version == '7.4' || matrix.php-version == '8.0' || matrix.php-version == '8.1' }}
         run: "composer up --prefer-lowest"
 
+      - name: "Run tests (old PHP versions)"
+        if: ${{ matrix.php-version == '7.4' || matrix.php-version == '8.0' || matrix.php-version == '8.1' }}
+        run: "make test-phpunit test-psalm php-examples"
+
       - name: "Run tests"
+        if: ${{ matrix.php-version == '8.2' }}
         run: "make -j -O test"
 
       - name: "Send code coverage"

diff --git a/src/Domain/Collection/Events.php b/src/Domain/Collection/Events.php
@@ -14,7 +14,6 @@
 use Eluceo\iCal\Domain\Entity\Event;
 use Iterator;
 use IteratorAggregate;
-use ReturnTypeWillChange;
 
 /**
  * @implements IteratorAggregate<Event>
@@ -24,8 +23,7 @@ abstract class Events implements IteratorAggregate
     /**
      * @return Iterator<Event>
      */
-    #[ReturnTypeWillChange]
-    abstract public function getIterator();
+    abstract public function getIterator(): Iterator;
 
     abstract public function addEvent(Event $event): void;
 }
diff --git a/src/Domain/Collection/EventsArray.php b/src/Domain/Collection/EventsArray.php
@@ -13,7 +13,7 @@
 
 use ArrayIterator;
 use Eluceo\iCal\Domain\Entity\Event;
-use ReturnTypeWillChange;
+use Iterator;
 
 final class EventsArray extends Events
 {
@@ -30,8 +30,7 @@ public function __construct(array $events)
         array_walk($events, [$this, 'addEvent']);
     }
 
-    #[ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): Iterator
     {
         return new ArrayIterator($this->events);
     }

diff --git a/src/Domain/Collection/EventsGenerator.php b/src/Domain/Collection/EventsGenerator.php
@@ -14,7 +14,6 @@
 use BadMethodCallException;
 use Eluceo\iCal\Domain\Entity\Event;
 use Iterator;
-use ReturnTypeWillChange;
 
 final class EventsGenerator extends Events
 {
@@ -31,8 +30,7 @@ public function __construct(Iterator $generator)
         $this->generator = $generator;
     }
 
-    #[ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): Iterator
     {
         return $this->generator;
     }

diff --git a/src/Presentation/Component.php b/src/Presentation/Component.php
@@ -14,7 +14,6 @@
 use Eluceo\iCal\Presentation\Component\Property;
 use Generator;
 use IteratorAggregate;
-use ReturnTypeWillChange;
 use Traversable;
 
 /**
@@ -64,7 +63,6 @@ public function __toString(): string
     /**
      * @return Traversable<ContentLine>
      */
-    #[ReturnTypeWillChange]
     public function getIterator(): Traversable
     {
         return $this->getContentLines();