Merge pull request #85 from aeviiq/add-github-workflow-and-drop-suppo…

…rt-for-php-below-8.1 Add GitHub workflow and drop support for php below 8.1
aeviiq · Dec 7, 2023 · abbfdca · abbfdca
2 parents 972bdc9 + f4b3147
commit abbfdca
Show file tree

Hide file tree

Showing 26 changed files with 104 additions and 44 deletions.
diff --git a/composer.json b/composer.json
@@ -27,10 +27,10 @@
         }
     },
     "require": {
-        "php": "^7.2 || ^8.0"
+        "php": "^8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.2"
+        "phpunit/phpunit": "^10.0"
     },
     "scripts": {
         "test": "vendor/bin/phpunit tests"

diff --git a/phpunit.xml b/phpunit.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" colors="true" failOnRisky="true" failOnWarning="true" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache">
+    <coverage/>
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
+</phpunit>
diff --git a/src/Collection.php b/src/Collection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 
@@ -206,8 +208,7 @@ public function exchangeArray(array $elements): void
     /**
      * {@inheritDoc}
      */
-    #[\ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         $iteratorClass = $this->iteratorClass;
 
@@ -246,8 +247,7 @@ public function offsetExists($offset): bool
     /**
      * {@inheritDoc}
      */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->elements[$offset] ?? null;
     }

diff --git a/src/CollectionInterface.php b/src/CollectionInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Exception;
 

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Exception;
 

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Exception;
 

diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Exception;
 

diff --git a/src/FloatCollection.php b/src/FloatCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/src/ImmutableCollection.php b/src/ImmutableCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/src/ImmutableFloatCollection.php b/src/ImmutableFloatCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/src/ImmutableIntCollection.php b/src/ImmutableIntCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/src/ImmutableObjectCollection.php b/src/ImmutableObjectCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/src/ImmutableStringCollection.php b/src/ImmutableStringCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/src/IntCollection.php b/src/IntCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/src/ObjectCollection.php b/src/ObjectCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/src/SortableInterface.php b/src/SortableInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/src/StringCollection.php b/src/StringCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection;
 

diff --git a/tests/BaseCollectionTest.php → tests/BaseCollection.php b/tests/BaseCollectionTest.php → tests/BaseCollection.php
@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Tests;
 
 use Aeviiq\Collection\Exception\InvalidArgumentException;
 
-abstract class BaseCollectionTest extends CollectionTest
+abstract class BaseCollection extends CollectionTest
 {
     /**
      * @dataProvider invalidDataProvider
@@ -87,7 +89,7 @@ public function testMergeWithInvalidDataTypes($value): void
     /**
      * @return mixed[]
      */
-    public function invalidDataProvider(): array
+    public static function invalidDataProvider(): array
     {
         return [];
     }

diff --git a/tests/CollectionTest.php b/tests/CollectionTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Tests;
 

diff --git a/tests/FloatCollectionTest.php b/tests/FloatCollectionTest.php
@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Tests;
 
 use Aeviiq\Collection\FloatCollection;
 
-final class FloatCollectionTest extends BaseCollectionTest
+final class FloatCollectionTest extends BaseCollection
 {
     public function testMap(): void
     {
@@ -19,7 +21,7 @@ public function testMap(): void
     /**
      * {@inheritDoc}
      */
-    public function invalidDataProvider(): array
+    public static function invalidDataProvider(): array
     {
         return [
             'string' => ['some random string'],

diff --git a/tests/ImmutableCollectionTest.php b/tests/ImmutableCollectionTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Tests;
 
@@ -91,7 +93,7 @@ public function testIterator(): void
     /**
      * @return mixed[]
      */
-    public function invalidDataProvider(): array
+    public static function invalidDataProvider(): array
     {
         return [
             'string' => ['some random string'],

diff --git a/tests/ImmutableObjectCollectionTest.php b/tests/ImmutableObjectCollectionTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Tests;
 
@@ -83,7 +85,7 @@ public function testInstanceCreationWithInvalidObjectInstance($value): void
     /**
      * @return mixed[]
      */
-    public function invalidObjectInstanceDataProvider(): array
+    public static function invalidObjectInstanceDataProvider(): array
     {
         return [
             'std_class' => [new \stdClass()],
@@ -93,7 +95,7 @@ public function invalidObjectInstanceDataProvider(): array
     /**
      * @return mixed[]
      */
-    public function invalidDataProvider(): array
+    public static function invalidDataProvider(): array
     {
         return [
             'int' => [1],

diff --git a/tests/IntCollectionTest.php b/tests/IntCollectionTest.php
@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Tests;
 
 use Aeviiq\Collection\IntCollection;
 
-final class IntCollectionTest extends BaseCollectionTest
+final class IntCollectionTest extends BaseCollection
 {
     public function testMap(): void
     {
@@ -19,7 +21,7 @@ public function testMap(): void
     /**
      * {@inheritDoc}
      */
-    public function invalidDataProvider(): array
+    public static function invalidDataProvider(): array
     {
         return [
             'string' => ['some random string'],

diff --git a/tests/ObjectCollectionTest.php b/tests/ObjectCollectionTest.php
@@ -1,11 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Tests;
 
 use Aeviiq\Collection\Exception\InvalidArgumentException;
 use Aeviiq\Collection\ObjectCollection;
 
-class ObjectCollectionTest extends BaseCollectionTest
+class ObjectCollectionTest extends BaseCollection
 {
     /**
      * @var \IteratorAggregate
@@ -123,7 +125,7 @@ public function testMergeWithInvalidObjectInstance($value): void
     /**
      * @return mixed[]
      */
-    public function invalidObjectInstanceDataProvider(): array
+    public static function invalidObjectInstanceDataProvider(): array
     {
         return [
             'std_class' => [new \stdClass()],
@@ -133,7 +135,7 @@ public function invalidObjectInstanceDataProvider(): array
     /**
      * {@inheritDoc}
      */
-    public function invalidDataProvider(): array
+    public static function invalidDataProvider(): array
     {
         return [
             'int' => [1],

diff --git a/tests/StringCollectionTest.php b/tests/StringCollectionTest.php
@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Aeviiq\Collection\Tests;
 
 use Aeviiq\Collection\StringCollection;
 
-final class StringCollectionTest extends BaseCollectionTest
+final class StringCollectionTest extends BaseCollection
 {
     public function testMap(): void
     {
@@ -19,7 +21,7 @@ public function testMap(): void
     /**
      * {@inheritDoc}
      */
-    public function invalidDataProvider(): array
+    public static function invalidDataProvider(): array
     {
         return [
             'int' => [1],