chore: prepare for PHP 8.1

.github/workflows/continuous-integration.yml

@@ -2,12 +2,7 @@
 
 name: "CI"
 
-on:
-  pull_request:
-  push:
-    branches:
-      - "main"
-      - "2.x"
+on: ["pull_request", "push"]
 
 env:
   COMPOSER_ROOT_VERSION: "1.99.99"
@@ -21,10 +16,9 @@ jobs:
       - uses: "actions/checkout@v2"
       - uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "7.4"
+          php-version: "latest"
           coverage: "none"
           ini-values: "memory_limit=-1"
-          tools: "composer:v2"
       - uses: "ramsey/composer-install@v1"
       - name: "Check coding standards"
         run: "composer br:lint"
@@ -36,10 +30,9 @@ jobs:
       - uses: "actions/checkout@v2"
       - uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "7.4"
+          php-version: "latest"
           coverage: "none"
           ini-values: "memory_limit=-1"
-          tools: "composer:v2"
       - uses: "ramsey/composer-install@v1"
       - name: "Run PHPStan"
         run: "composer br:analyze:phpstan"
@@ -57,23 +50,23 @@ jobs:
           - "7.2"
           - "7.3"
           - "7.4"
+          - "8.0"
         operating-system:
           - "ubuntu-latest"
         experimental:
           - false
         include:
-          - php-version: "8.0"
+          - php-version: "8.1"
             operating-system: "ubuntu-latest"
             experimental: true
-            composer-options: "--ignore-platform-reqs"
+            composer-options: "--ignore-platform-req=php"
     steps:
       - uses: "actions/checkout@v2"
       - uses: "shivammathur/setup-php@v2"
         with:
           php-version: "${{ matrix.php-version }}"
           coverage: "pcov"
           ini-values: "memory_limit=-1"
-          tools: "composer:v2"
       - uses: "ramsey/composer-install@v1"
         with:
           composer-options: "${{ matrix.composer-options }}"

composer.json

@@ -19,7 +19,8 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8"
+        "php": "^7.2 || ^8",
+        "symfony/polyfill-php81": "^1.23"
     },
     "require-dev": {
         "captainhook/captainhook": "^5.3",
@@ -29,6 +30,7 @@
         "hamcrest/hamcrest-php": "^2",
         "jangregor/phpstan-prophecy": "^0.8",
         "mockery/mockery": "^1.3",
+        "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/extension-installer": "^1",
         "phpstan/phpstan": "^0.12.32",
         "phpstan/phpstan-mockery": "^0.12.5",

phpcs.xml.dist

@@ -5,6 +5,7 @@
 
     <description>Project coding standards.</description>
 
+    <arg name="bootstrap" value="./tests/bootstrap.php"/>
     <arg name="extensions" value="php"/>
     <arg name="colors"/>
     <arg value="sp"/>

phpstan.neon.dist

@@ -7,3 +7,5 @@ parameters:
         - ./src
         - ./tests
         - ./resources/console
+    bootstrapFiles:
+        - ./tests/bootstrap.php

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="./vendor/autoload.php"
+         bootstrap="./tests/bootstrap.php"
          cacheResultFile="./build/cache/phpunit.result.cache"
          colors="true"
          verbose="true">

psalm.xml

@@ -4,13 +4,15 @@
        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
        totallyTyped="true"
        cacheDirectory="./build/cache/psalm"
-       errorBaseline="psalm-baseline.xml">
+       errorBaseline="psalm-baseline.xml"
+       autoloader="./tests/bootstrap.php">
 
     <projectFiles>
         <directory name="./src"/>
         <directory name="./resources/console"/>
         <ignoreFiles>
             <directory name="./tests"/>
+            <directory name="./vendor"/>
         </ignoreFiles>
     </projectFiles>
 

src/AbstractArray.php

@@ -83,7 +83,10 @@ public function offsetExists($offset): bool
      *
      * @return T|null the value stored at the offset, or null if the offset
      *     does not exist.
+     *
+     * @psalm-suppress InvalidAttribute
      */
+    #[\ReturnTypeWillChange] // phpcs:ignore
     public function offsetGet($offset)
     {
         return $this->data[$offset] ?? null;
@@ -123,6 +126,8 @@ public function offsetUnset($offset): void
     /**
      * Returns a serialized string representation of this array object.
      *
+     * @deprecated The Serializable interface will go away in PHP 9.
+     *
      * @link http://php.net/manual/en/serializable.serialize.php Serializable::serialize()
      *
      * @return string a PHP serialized string.
@@ -132,9 +137,24 @@ public function serialize(): string
         return serialize($this->data);
     }
 
+    /**
+     * Returns data suitable for PHP serialization.
+     *
+     * @link https://www.php.net/manual/en/language.oop5.magic.php#language.oop5.magic.serialize
+     * @link https://www.php.net/serialize
+     *
+     * @return array<array-key, T>
+     */
+    public function __serialize(): array
+    {
+        return $this->data;
+    }
+
     /**
      * Converts a serialized string representation into an instance object.
      *
+     * @deprecated The Serializable interface will go away in PHP 9.
+     *
      * @link http://php.net/manual/en/serializable.unserialize.php Serializable::unserialize()
      *
      * @param string $serialized A PHP serialized string to unserialize.
@@ -149,6 +169,16 @@ public function unserialize($serialized): void
         $this->data = $data;
     }
 
+    /**
+     * Adds unserialized data to the object.
+     *
+     * @param array<array-key, T> $data
+     */
+    public function __unserialize(array $data): void
+    {
+        $this->data = $data;
+    }
+
     /**
      * Returns the number of items in this array.
      *

tests/CollectionManipulationTest.php

@@ -4,6 +4,7 @@
 
 namespace Ramsey\Collection\Test;
 
+use Prophecy\PhpUnit\ProphecyTrait;
 use Ramsey\Collection\Collection;
 use Ramsey\Collection\Exception\CollectionMismatchException;
 use Ramsey\Collection\Exception\InvalidSortOrderException;
@@ -20,6 +21,8 @@
  */
 class CollectionManipulationTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testSortNameAscWithAscendingIdAndNames(): void
     {
         $bar1 = new Bar(1, 'a');

tests/bootstrap.php

@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+error_reporting(E_ALL ^ E_DEPRECATED);
+
+require_once __DIR__ . '/../vendor/autoload.php';