Add support for PHP 8.2

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.4', '8.0', '8.1']
+        php: ['7.4', '8.0', '8.1', '8.2']
         stability: ['prefer-lowest', 'prefer-stable']
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}

README.md

@@ -1,8 +1,6 @@
 # SaferpayJsonApi
 
 [![Build Status](https://github.com/Ticketpark/SaferpayJsonApi/actions/workflows/tests.yml/badge.svg)](https://github.com/Ticketpark/SaferpayJsonApi/actions)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ticketpark/saferpayjsonapi/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/ticketpark/saferpayjsonapi/?branch=master)
-
 
 A php library to use the [Saferpay Json API](http://saferpay.github.io/jsonapi/).
 

composer.json

@@ -17,14 +17,14 @@
     ],
     "require": {
         "php": "^7.4|^8.0.0|^8.1.0",
-        "doctrine/annotations": "^1.11",
+        "doctrine/annotations": "^1.11|^2.0",
         "jms/serializer": "^3.16",
         "guzzlehttp/guzzle": "^6.3|^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0",
         "phpstan/phpstan": "^1.6",
-        "friendsofphp/php-cs-fixer": "^3.8"
+        "friendsofphp/php-cs-fixer": "^3.16"
     },
     "autoload": {
         "psr-4": {

lib/SaferpayJson/Request/Request.php

@@ -30,18 +30,7 @@ abstract class Request
      */
     private $requestConfig;
 
-    /**
-     * We want the implementation to define the exact return type hint of the response.
-     * In PHP 7.4 the return type hint here in the abstraction would therefore be Ticketpark\SaferpayJson\Response\Response,
-     * as all other responses inherit from that class.
-     * In PHP 7.3 this is not yet allowed. Therefore the return type is omitted and only provided as a PhpDoc in
-     * order to satisfy static code analysis by PhpStan.
-     *
-     * @link https://wiki.php.net/rfc/covariant-returns-and-contravariant-parameters
-     * @link https://stitcher.io/blog/new-in-php-74#improved-type-variance-rfc
-     * @return mixed
-     */
-    abstract public function execute();
+    abstract public function execute(): Response;
 
     abstract public function getApiPath(): string;
 
@@ -153,7 +142,12 @@ private function getContent(): string
 
     private function getSerializer(): SerializerInterface
     {
-        AnnotationRegistry::registerLoader('class_exists');
+        // Support for doctrine/annotations 1.x
+        // @phpstan-ignore-next-line
+        if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
+            // @phpstan-ignore-next-line
+            AnnotationRegistry::registerLoader('class_exists');
+        }
 
         return SerializerBuilder::create()->build();
     }

phpstan.neon

@@ -3,6 +3,7 @@ parameters:
     paths:
         - lib
     checkMissingIterableValueType: false
+    reportUnmatchedIgnoredErrors: false
     ignoreErrors:
         -
             message: '#Property [a-zA-Z0-9\\]+::\$[a-zA-Z0-9]+ is never written, only read.#'

tests/SaferpayJson/Tests/Request/CommonRequestTest.php

@@ -106,7 +106,11 @@ private function getResponseMock(): MockObject
 
     private function getFakedApiResponse(string $class): string
     {
-        AnnotationRegistry::registerLoader('class_exists');
+        // Support for doctrine/annotations 1.x
+        if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
+            AnnotationRegistry::registerLoader('class_exists');
+        }
+
         $serializer = SerializerBuilder::create()->build();
 
         $response = new $class();