Merge remote-tracking branch 'upstream/master' into issue-325-php8-at…

…tributes

.github/workflows/ci.yaml

@@ -12,18 +12,16 @@ jobs:
   phpunit:
     name: "PHPUnit"
     runs-on: "ubuntu-20.04"
-    continue-on-error: ${{ matrix.experimental }}
 
     strategy:
       fail-fast: false
       matrix:
-        experimental: [false]
-        composer-options: ["--prefer-stable"]
         php-version:
           - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
         dependencies:
           - "highest"
           - "lowest"
@@ -33,11 +31,11 @@ jobs:
           - "^5.0"
         include:
           - php-version: 8.0
-            symfony-require: "6.0.*@dev"
-            experimental: true
+            symfony-require: "^6.0"
           - php-version: 8.1
-            symfony-require: "6.0.*@dev"
-            experimental: true
+            symfony-require: "^6.0"
+          - php-version: 8.2
+            symfony-require: "^6.0"
 
     steps:
       - name: Checkout code
@@ -52,7 +50,7 @@ jobs:
           tools: "flex"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v2"
         env:
           SYMFONY_REQUIRE: "${{ matrix.symfony-require }}"
         with:

composer.json

@@ -18,18 +18,19 @@
     ],
     "require": {
         "php": "^7.2 | ^8.0",
-        "doctrine/annotations": "^1.13.2",
+        "doctrine/annotations": "^1.13.2 || ^2.0",
         "jms/metadata": "^2.0",
-        "jms/serializer": "^3.2",
+        "jms/serializer": "^3.18.2",
         "symfony/expression-language": "~3.0 || ~4.0 || ~5.0 || ~6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^7 | ^9.5.10",
         "doctrine/coding-standard": "^5.0 | ^8.0",
-        "doctrine/persistence": "^1.3.4",
+        "doctrine/persistence": "^1.3.4 | ^2.0 | ^3.0",
         "pagerfanta/core": "^2.4 || ^3.0",
         "phpdocumentor/type-resolver": "^1.5.1",
         "phpspec/prophecy-phpunit": "^2.0.1",
+        "phpspec/prophecy": "^1.16",
         "symfony/routing": "~3.0 || ~4.0 || ~5.0 || ~6.0",
         "symfony/yaml": "~3.0 || ~4.0 || ~5.0 || ~6.0",
         "twig/twig": "^1.43 || ^2.13 || ^3.0"
@@ -45,7 +46,11 @@
     },
     "config": {
         "bin-dir": "bin",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "extra": {
         "branch-alias": {

tests/bootstrap.php

@@ -18,4 +18,7 @@
 
 $loader->add('Hateoas\Tests', __DIR__);
 
-AnnotationRegistry::registerLoader('class_exists');
+// Method has been removed in doctrine/annotations:2
+if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
+    AnnotationRegistry::registerLoader('class_exists');
+}