Merge pull request #36 from gsteel/phpunit-10

Remove support for PHP 8.0, Upgrade PHPUnit to 10.x

composer.json

@@ -37,8 +37,8 @@
         "laminas/laminas-stdlib": "^3.2"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~2.4.0",
-        "phpunit/phpunit": "^9.5.25"
+        "laminas/laminas-coding-standard": "~2.5.0",
+        "phpunit/phpunit": "^10.2.6"
     },
     "autoload": {
         "psr-4": {

phpcs.xml.dist

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <ruleset name="Laminas coding standard">
     <rule ref="./vendor/laminas/laminas-coding-standard/src/LaminasCodingStandard/ruleset.xml"/>
+    <arg value="nps" />
 
     <!-- Paths to check -->
     <file>src</file>

phpunit.xml.dist

@@ -8,10 +8,9 @@
             <directory>./test</directory>
         </testsuite>
     </testsuites>
-
-    <coverage includeUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">./src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>

src/Adapter/AbstractAdapter.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Adapter;

src/Adapter/AdapterInterface.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Adapter;

src/Adapter/AdapterOptions.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Adapter;

src/Adapter/IgBinary.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Adapter;

src/Adapter/Json.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Adapter;

src/Adapter/JsonOptions.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Adapter;

src/Adapter/PhpCode.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Adapter;

src/Adapter/PhpSerialize.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Adapter;

src/Adapter/PhpSerializeOptions.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Adapter;

src/AdapterPluginManager.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer;

src/AdapterPluginManagerFactory.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer;

src/ConfigProvider.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer;

src/Exception/ExceptionInterface.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Exception;

src/Exception/ExtensionNotLoadedException.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Exception;

src/Exception/InvalidArgumentException.php

@@ -1,16 +1,9 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Exception;
 
-/**
- * @used       InvalidArgumentException
- */
 class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {

src/Exception/RuntimeException.php

@@ -1,16 +1,9 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer\Exception;
 
-/**
- * @used       RuntimeException
- */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }

src/Module.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer;

src/Serializer.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace Laminas\Serializer;

test/Adapter/IgBinaryTest.php

@@ -1,14 +1,11 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace LaminasTest\Serializer\Adapter;
 
 use Laminas\Serializer;
+use Laminas\Serializer\Adapter\IgBinary;
 use Laminas\Serializer\Exception\ExtensionNotLoadedException;
 use Laminas\Serializer\Exception\RuntimeException;
 use PHPUnit\Framework\TestCase;
@@ -17,10 +14,7 @@
 use function extension_loaded;
 use function igbinary_serialize;
 
-/**
- * @group      Laminas_Serializer
- * @covers \Laminas\Serializer\Adapter\IgBinary
- */
+#[CoversClass(IgBinary::class)]
 class IgBinaryTest extends TestCase
 {
     /** @var Serializer\Adapter\IgBinary */

test/Adapter/JsonTest.php

@@ -1,23 +1,17 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace LaminasTest\Serializer\Adapter;
 
 use Laminas\Json\Json;
 use Laminas\Serializer;
 use Laminas\Serializer\Exception\RuntimeException;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
-/**
- * @group      Laminas_Serializer
- * @covers \Laminas\Serializer\Adapter\Json
- */
+#[CoversClass(Serializer\Adapter\Json::class)]
 class JsonTest extends TestCase
 {
     /** @var Serializer\Adapter\Json */

test/Adapter/PhpCodeTest.php

@@ -1,22 +1,18 @@
 <?php
 
-/**
- * @see https://github.com/laminas/laminas-serializer for the canonical source repository
- */
-
 declare(strict_types=1);
 
 namespace LaminasTest\Serializer\Adapter;
 
 use Laminas\Serializer;
+use Laminas\Serializer\Adapter\PhpCode;
 use LaminasTest\Serializer\TestAsset\Dummy;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 use function var_export;
 
-/**
- * @covers \Laminas\Serializer\Adapter\PhpCode
- */
+#[CoversClass(PhpCode::class)]
 class PhpCodeTest extends TestCase
 {
     /** @var Serializer\Adapter\PhpCode */
@@ -39,29 +35,28 @@ public function testSerializeObject(): void
     }
 
     /* TODO: PHP Fatal error:  Call to undefined method stdClass::__set_state()
-        public function testUnserializeObject()
-        {
-            $value    = "stdClass::__set_state(array(\n))";
-            $expected = new stdClass();
-
-            $data = $this->adapter->unserialize($value);
-            $this->assertEquals($expected, $data);
-        }
-    */
+            public function testUnserializeObject()
+            {
+                $value    = "stdClass::__set_state(array(\n))";
+                $expected = new stdClass();
 
+                $data = $this->adapter->unserialize($value);
+                $this->assertEquals($expected, $data);
+            }
+        */
     /**
-     * @dataProvider serializedValuesProvider
      * @param mixed $unserialized
      */
+    #[DataProvider('serializedValuesProvider')]
     public function testSerialize($unserialized, string $serialized): void
     {
         $this->assertEquals($serialized, $this->adapter->serialize($unserialized));
     }
 
     /**
-     * @dataProvider serializedValuesProvider
      * @param mixed $unserialized
      */
+    #[DataProvider('serializedValuesProvider')]
     public function testUnserialize($unserialized, string $serialized): void
     {
         $this->assertEquals($unserialized, $this->adapter->unserialize($serialized));
@@ -70,7 +65,7 @@ public function testUnserialize($unserialized, string $serialized): void
     /**
      * @return array<string, array<int, string|mixed>>
      */
-    public function serializedValuesProvider(): array
+    public static function serializedValuesProvider(): array
     {
         return [
             // Description => [unserialized, serialized]