Upgrade to PHP 8.1

.php-version

@@ -1 +1 @@
-7.4
+8.1

composer.json

@@ -1,35 +1,33 @@
 {
-  "name": "subugoe/oai-model",
-  "description": "OAI-PMH Model",
-  "type": "library",
-  "require-dev": {
-    "friendsofphp/php-cs-fixer": "^3.8",
-    "rector/rector": "^0.14",
-    "phpstan/phpstan": "^1.7"
-  },
-  "license": "AGPL-3.0-or-later",
-  "autoload": {
-    "psr-4": {
-      "Subugoe\\OaiModel\\": "src/"
+    "name": "subugoe/oai-model",
+    "description": "OAI-PMH Model",
+    "type": "library",
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.8",
+        "rector/rector": "^0.15.23",
+        "phpstan/phpstan": "^1.7"
+    },
+    "license": "AGPL-3.0-or-later",
+    "autoload": {
+        "psr-4": {
+            "Subugoe\\OaiModel\\": "src/"
+        }
+    },
+    "authors": [{
+        "name": "Ingo Pfennigstorf",
+        "email": "[email protected]"
+    }],
+    "require": {
+        "php": "^8.0",
+        "jms/serializer": "^3.17",
+        "subugoe/iiif-model": "^0.2.4",
+        "doctrine/collections": "^2.0"
+    },
+    "scripts": {
+        "lint": [
+            "php-cs-fixer fix --dry-run",
+            "rector process --dry-run",
+            "phpstan analyze src --level=5"
+        ]
     }
-  },
-  "authors": [
-    {
-      "name": "Ingo Pfennigstorf",
-      "email": "[email protected]"
-    }
-  ],
-  "require": {
-    "php": "^7.4 || ^8.0 || ^8.1",
-    "jms/serializer": "^3.17",
-    "subugoe/iiif-model": "^0.2.4",
-    "doctrine/collections": "^1.6"
-  },
-  "scripts": {
-    "lint": [
-      "php-cs-fixer fix --dry-run",
-      "rector process --dry-run",
-      "phpstan analyze src --level=5"
-    ]
-  }
-}
+}

rector.php

@@ -6,10 +6,10 @@
 use Rector\Set\ValueObject\SetList;
 
 return static function (Rector\Config\RectorConfig $containerConfigurator): void {
-    $containerConfigurator->disableImportShortClasses();
+    $containerConfigurator->importShortClasses(false);
 
     $containerConfigurator->sets([
-        SetList::PHP_74,
+        SetList::PHP_80,
         SetList::CODING_STYLE,
         SetList::CODE_QUALITY,
     ]);

src/Model/Collection.php

@@ -16,7 +16,9 @@ class Collection
 
     /**
      * @Serializer\Expose()
+     *
      * @Serializer\SerializedName("setSpec")
+     *
      * @Serializer\XmlElement(cdata=false)
      */
     private ?string $id = null;
@@ -28,6 +30,7 @@ class Collection
 
     /**
      * @Serializer\Expose()
+     *
      * @Serializer\SerializedName("setName")
      */
     private ?string $label = null;

src/Model/Error.php

@@ -15,6 +15,7 @@ class Error
 
     /**
      * @Serializer\XmlElement(cdata=false)
+     *
      * @Serializer\Inline()
      */
     private string $message;

src/Model/Identify/Identification.php

@@ -8,18 +8,21 @@ class Identification
 {
     /**
      * @Serializer\XmlElement(cdata=false)
+     *
      * @Serializer\SerializedName("adminEmail")
      */
     private ?string $adminEmail = null;
 
     /**
      * @Serializer\XmlElement(cdata=false)
+     *
      * @Serializer\SerializedName("baseURL")
      */
     private ?string $baseUrl = null;
 
     /**
      * @Serializer\XmlElement(cdata=false)
+     *
      * @Serializer\SerializedName("deletedRecord")
      */
     private ?string $deletedRecord = null;
@@ -28,6 +31,7 @@ class Identification
 
     /**
      * @Serializer\XmlElement(cdata=false)
+     *
      * @Serializer\SerializedName("earliestDatestamp")
      */
     private ?\DateTimeImmutable $earliestDatestamp = null;
@@ -39,12 +43,14 @@ class Identification
 
     /**
      * @Serializer\XmlElement(cdata=false)
+     *
      * @Serializer\SerializedName("protocolVersion")
      */
     private ?string $protocolVersion = null;
 
     /**
      * @Serializer\XmlElement(cdata=false)
+     *
      * @Serializer\SerializedName("repositoryName")
      */
     private ?string $repositoryName = null;

src/Model/Identify/OaiIdentifier.php

@@ -13,24 +13,28 @@ class OaiIdentifier
 
     /**
      * @Serializer\SerializedName("xmlns")
+     *
      * @Serializer\XmlAttribute
      */
     private ?string $namespace = null;
 
     /**
      * @Serializer\XmlElement(cdata=false)
+     *
      * @Serializer\SerializedName("repositoryIdentifier")
      */
     private ?string $repositoryIdentifier = null;
 
     /**
      * @Serializer\XmlElement(cdata=false)
+     *
      * @Serializer\SerializedName("sampleIdentifier")
      */
     private ?string $sampleIdentifier = null;
 
     /**
      * @Serializer\SerializedName("xsi:schemaLocation")
+     *
      * @Serializer\XmlAttribute
      */
     private ?string $schemaLocation = null;
@@ -42,6 +46,7 @@ class OaiIdentifier
 
     /**
      * @Serializer\SerializedName("xmlns:xsi")
+     *
      * @Serializer\XmlAttribute
      */
     private ?string $xsi = null;

src/Model/ListRecords.php

@@ -10,6 +10,7 @@ class ListRecords
 {
     /**
      * @Serializer\SerializedName("Record")
+     *
      * @Serializer\XmlList(inline = true, entry = "record")
      */
     private \Doctrine\Common\Collections\Collection $records;

src/Model/Metadata.php

@@ -11,6 +11,7 @@ class Metadata
 {
     /**
      * @Serializer\XmlList(inline = true, entry = "date")
+     *
      * @Serializer\Type("ArrayCollection<string>")
      */
     private \Doctrine\Common\Collections\Collection $dates;

src/Model/MetadataFormat.php

@@ -8,12 +8,14 @@ class MetadataFormat
 {
     /**
      * @Serializer\SerializedName("metadataNamespace")
+     *
      * @Serializer\XmlElement(cdata=false)
      */
     private ?string $namespace = null;
 
     /**
      * @Serializer\SerializedName("metadataPrefix")
+     *
      * @Serializer\XmlElement(cdata=false)
      */
     private ?string $prefix = null;

src/Model/MetadataFormats.php

@@ -11,6 +11,7 @@ class MetadataFormats extends Oai
 {
     /**
      * @Serializer\SerializedName("ListMetadataFormats")
+     *
      * @Serializer\XmlList(entry = "metadataFormat")
      */
     private ?array $metadataFormats = null;

src/Model/Oai.php

@@ -6,6 +6,7 @@
 
 /**
  * @Serializer\XmlRoot("OAI-PMH")
+ *
  * @Serializer\XmlNamespace(uri="https://www.openarchives.org/OAI/2.0/")
  * @Serializer\XmlNamespace(uri="http://www.w3.org/2001/XMLSchema-instance", prefix="xsi")
  * @Serializer\XmlNamespace(uri="https://www.openarchives.org/OAI/2.0/OAI-PMH.xsd", prefix="schemaLocation")
@@ -14,6 +15,7 @@ class Oai
 {
     /**
      * @Serializer\XmlElement(cdata=false)
+     *
      * @Serializer\SerializedName("responseDate")
      */
     private ?\DateTimeImmutable $date = null;

src/Model/Request.php

@@ -21,6 +21,7 @@ class Request
 
     /**
      * @Serializer\XmlValue
+     *
      * @Serializer\XmlElement(cdata=false)
      */
     private ?string $url = null;

src/Model/ResumptionToken.php

@@ -10,6 +10,7 @@ class ResumptionToken
 {
     /**
      * @Serializer\XmlAttribute
+     *
      * @Serializer\SerializedName("completeListSize")
      */
     private int $completeListSize;
@@ -21,6 +22,7 @@ class ResumptionToken
 
     /**
      * @Serializer\XmlAttribute
+     *
      * @Serializer\SerializedName("expirationDate")
      */
     private \DateTimeInterface $expirationDate;

src/Model/Sets.php

@@ -11,6 +11,7 @@ class Sets extends Oai
 {
     /**
      * @Serializer\SerializedName("ListSets")
+     *
      * @Serializer\XmlList(inline = false, entry = "set")
      */
     private ?array $sets = null;