Merge pull request #426 from patchlevel/support-php-8.3

php 8.3 support
patchlevel · Dec 12, 2023 · 3f7344b · 3f7344b
2 parents 80e0a99 + 152b7a2
commit 3f7344b
Show file tree

Hide file tree

Showing 15 changed files with 705 additions and 559 deletions.
diff --git a/.github/workflows/backward-compatibility-check.yml b/.github/workflows/backward-compatibility-check.yml
@@ -16,7 +16,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.2"
+          - "8.3"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -16,7 +16,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.2"
+          - "8.3"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -20,7 +20,7 @@ jobs:
                 dependencies:
                     - "locked"
                 php-version:
-                    - "8.2"
+                    - "8.3"
                 operating-system:
                     - "ubuntu-latest"
 

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -33,7 +33,7 @@ jobs:
                 dependencies:
                     - "locked"
                 php-version:
-                    - "8.2"
+                    - "8.3"
                 operating-system:
                     - "ubuntu-latest"
                 postgres-version:
@@ -87,7 +87,7 @@ jobs:
           dependencies:
             - "locked"
           php-version:
-            - "8.2"
+            - "8.3"
           operating-system:
             - "ubuntu-latest"
           mariadb-version:
@@ -140,7 +140,7 @@ jobs:
           dependencies:
             - "locked"
           php-version:
-            - "8.2"
+            - "8.3"
           operating-system:
             - "ubuntu-latest"
           mysql-version:
@@ -179,7 +179,7 @@ jobs:
           dependencies:
             - "locked"
           php-version:
-            - "8.2"
+            - "8.3"
           operating-system:
             - "ubuntu-latest"
 

diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -20,7 +20,7 @@ jobs:
                 dependencies:
                     - "locked"
                 php-version:
-                    - "8.2"
+                    - "8.3"
                 operating-system:
                     - "ubuntu-latest"
 

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -20,7 +20,7 @@ jobs:
                 dependencies:
                     - "locked"
                 php-version:
-                    - "8.2"
+                    - "8.3"
                 operating-system:
                     - "ubuntu-latest"
 

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -20,7 +20,7 @@ jobs:
                 dependencies:
                     - "locked"
                 php-version:
-                    - "8.2"
+                    - "8.3"
                 operating-system:
                     - "ubuntu-latest"
 

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -23,15 +23,16 @@ jobs:
                 php-version:
                     - "8.1"
                     - "8.2"
+                    - "8.3"
                 operating-system:
                     - "ubuntu-latest"
                     - "windows-latest"
                 include:
                     - dependencies: "locked"
-                      php-version: "8.2"
+                      php-version: "8.3"
                       operating-system: "ubuntu-latest"
                     - dependencies: "locked"
-                      php-version: "8.2"
+                      php-version: "8.3"
                       operating-system: "windows-latest"
 
         steps:

diff --git a/baseline.xml b/baseline.xml
@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.6.0@e784128902dfe01d489c4123d69918a9f3c1eac5">
+<files psalm-version="5.17.0@c620f6e80d0abfca532b00bda366062aaedf6e5d">
   <file src="src/Clock/FrozenClock.php">
     <PossiblyFalsePropertyAssignmentValue>
-      <code>$this-&gt;frozenDateTime-&gt;modify(sprintf('+%s seconds', $seconds))</code>
+      <code><![CDATA[$this->frozenDateTime->modify(sprintf('+%s seconds', $seconds))]]></code>
     </PossiblyFalsePropertyAssignmentValue>
   </file>
   <file src="src/Console/Command/ProjectionCommand.php">
     <DeprecatedClass>
       <code>MetadataAwareProjectionHandler</code>
       <code>MetadataAwareProjectionHandler::class</code>
-      <code>new MetadataAwareProjectionHandler(
+      <code><![CDATA[new MetadataAwareProjectionHandler(
             $projections,
-            $projectionHandler-&gt;metadataFactory()
-        )</code>
+            $projectionHandler->metadataFactory()
+        )]]></code>
     </DeprecatedClass>
     <DeprecatedInterface>
       <code>ProjectionHandler</code>
       <code>ProjectionHandler</code>
       <code>ProjectionHandler</code>
       <code>ProjectionHandler</code>
-      <code>non-empty-array&lt;class-string&lt;Projection&gt;&gt;</code>
-      <code>non-empty-array&lt;class-string&lt;Projection&gt;&gt;|null</code>
+      <code><![CDATA[non-empty-array<class-string<Projection>>]]></code>
+      <code><![CDATA[non-empty-array<class-string<Projection>>|null]]></code>
     </DeprecatedInterface>
     <InvalidOperand>
-      <code>$projectionHandler-&gt;projections()</code>
+      <code><![CDATA[$projectionHandler->projections()]]></code>
     </InvalidOperand>
     <RedundantFunctionCall>
       <code>array_values</code>
     </RedundantFunctionCall>
+    <ReservedWord>
+      <code>Projection</code>
+    </ReservedWord>
   </file>
   <file src="src/Console/Command/ProjectionRebuildCommand.php">
     <DeprecatedClass>
@@ -62,13 +65,13 @@
   </file>
   <file src="src/Console/Worker/DefaultWorker.php">
     <TypeDoesNotContainType>
-      <code>$this-&gt;shouldStop</code>
-      <code>$this-&gt;shouldStop</code>
+      <code><![CDATA[$this->shouldStop]]></code>
+      <code><![CDATA[$this->shouldStop]]></code>
     </TypeDoesNotContainType>
   </file>
   <file src="src/Console/Worker/Listener/StopWorkerOnSigtermSignalListener.php">
     <MoreSpecificReturnType>
-      <code>array&lt;class-string, string&gt;</code>
+      <code><![CDATA[array<class-string, string>]]></code>
     </MoreSpecificReturnType>
   </file>
   <file src="src/EventBus/Message.php">
@@ -83,6 +86,9 @@
     <DeprecatedClass>
       <code>Normalize::class</code>
     </DeprecatedClass>
+    <DocblockTypeContradiction>
+      <code>$reflectionType instanceof ReflectionIntersectionType</code>
+    </DocblockTypeContradiction>
   </file>
   <file src="src/Metadata/Event/AttributeEventMetadataFactory.php">
     <DeprecatedClass>
@@ -92,28 +98,28 @@
   <file src="src/Metadata/Projection/AttributeProjectionMetadataFactory.php">
     <DeprecatedInterface>
       <code>array</code>
-      <code>class-string&lt;Projection&gt;</code>
+      <code><![CDATA[class-string<Projection>]]></code>
       <code>private array $projectionMetadata = [];</code>
     </DeprecatedInterface>
   </file>
   <file src="src/Metadata/Projection/DuplicateCreateMethod.php">
     <DeprecatedInterface>
-      <code>class-string&lt;Projection&gt;</code>
+      <code><![CDATA[class-string<Projection>]]></code>
     </DeprecatedInterface>
   </file>
   <file src="src/Metadata/Projection/DuplicateDropMethod.php">
     <DeprecatedInterface>
-      <code>class-string&lt;Projection&gt;</code>
+      <code><![CDATA[class-string<Projection>]]></code>
     </DeprecatedInterface>
   </file>
   <file src="src/Metadata/Projection/DuplicateHandleMethod.php">
     <DeprecatedInterface>
-      <code>class-string&lt;Projection&gt;</code>
+      <code><![CDATA[class-string<Projection>]]></code>
     </DeprecatedInterface>
   </file>
   <file src="src/Metadata/Projection/ProjectionMetadataFactory.php">
     <DeprecatedInterface>
-      <code>class-string&lt;Projection&gt;</code>
+      <code><![CDATA[class-string<Projection>]]></code>
     </DeprecatedInterface>
   </file>
   <file src="src/Pipeline/Source/StoreSource.php">
@@ -144,16 +150,16 @@
     <DeprecatedInterface>
       <code>MetadataAwareProjectionHandler</code>
       <code>iterable</code>
-      <code>iterable&lt;Projection&gt;</code>
-      <code>iterable&lt;Projection&gt;</code>
+      <code><![CDATA[iterable<Projection>]]></code>
+      <code><![CDATA[iterable<Projection>]]></code>
     </DeprecatedInterface>
   </file>
   <file src="src/Projection/Projection/ProjectionCollection.php">
     <InvalidReturnStatement>
-      <code>new ArrayIterator(array_values($this-&gt;projections))</code>
+      <code><![CDATA[new ArrayIterator(array_values($this->projections))]]></code>
     </InvalidReturnStatement>
     <InvalidReturnType>
-      <code>ArrayIterator&lt;int, Projection&gt;</code>
+      <code><![CDATA[ArrayIterator<int, Projection>]]></code>
     </InvalidReturnType>
   </file>
   <file src="src/Projection/ProjectionListener.php">
@@ -164,7 +170,7 @@
   </file>
   <file src="src/Projection/Projector/InMemoryProjectorRepository.php">
     <InvalidOperand>
-      <code>$this-&gt;projectors</code>
+      <code><![CDATA[$this->projectors]]></code>
     </InvalidOperand>
   </file>
   <file src="src/Projection/Projector/MetadataProjectorResolver.php">
@@ -181,17 +187,6 @@
       <code>Projection</code>
     </DeprecatedInterface>
   </file>
-  <file src="src/Repository/DefaultRepository.php">
-    <MixedArgument>
-      <code>++$playhead</code>
-    </MixedArgument>
-    <MixedAssignment>
-      <code>$playhead</code>
-    </MixedAssignment>
-    <MixedOperand>
-      <code>$playhead</code>
-    </MixedOperand>
-  </file>
   <file src="src/Schema/DoctrineSchemaDirector.php">
     <DeprecatedMethod>
       <code>createSchema</code>
@@ -233,13 +228,13 @@
   </file>
   <file src="src/Snapshot/DefaultSnapshotStore.php">
     <MixedArgument>
-      <code>$data['payload']</code>
+      <code><![CDATA[$data['payload']]]></code>
     </MixedArgument>
   </file>
   <file src="src/Store/DoctrineStore.php">
     <MixedReturnTypeCoercion>
       <code>$normalizedCustomHeaders</code>
-      <code>array&lt;string, mixed&gt;</code>
+      <code><![CDATA[array<string, mixed>]]></code>
     </MixedReturnTypeCoercion>
   </file>
   <file src="src/Store/MultiTableStore.php">
@@ -366,6 +361,11 @@
       <code>$value</code>
     </MixedArgumentTypeCoercion>
   </file>
+  <file src="tests/Unit/Fixture/ProfileWithBrokenApplyIntersection.php">
+    <ReservedWord>
+      <code><![CDATA[ProfileCreated&ProfileVisited $event]]></code>
+    </ReservedWord>
+  </file>
   <file src="tests/Unit/Fixture/ProfileWithBrokenApplyNoType.php">
     <MissingParamType>
       <code>$event</code>
@@ -387,7 +387,7 @@
   </file>
   <file src="tests/Unit/Pipeline/Target/ProjectionHandlerTargetTest.php">
     <DeprecatedClass>
-      <code>new ProjectionHandlerTarget($projectionHandler-&gt;reveal())</code>
+      <code><![CDATA[new ProjectionHandlerTarget($projectionHandler->reveal())]]></code>
     </DeprecatedClass>
   </file>
   <file src="tests/Unit/Pipeline/Target/ProjectionTargetTest.php">
@@ -415,7 +415,7 @@
   </file>
   <file src="tests/Unit/Projection/ProjectionListenerTest.php">
     <DeprecatedClass>
-      <code>new ProjectionListener($projectionRepository-&gt;reveal())</code>
+      <code><![CDATA[new ProjectionListener($projectionRepository->reveal())]]></code>
     </DeprecatedClass>
   </file>
   <file src="tests/Unit/Projection/Projectionist/DefaultProjectionistTest.php">
@@ -497,7 +497,7 @@
   </file>
   <file src="tests/Unit/Schema/MigrationSchemaProviderTest.php">
     <DeprecatedClass>
-      <code>new MigrationSchemaProvider($store-&gt;reveal())</code>
+      <code><![CDATA[new MigrationSchemaProvider($store->reveal())]]></code>
     </DeprecatedClass>
   </file>
 </files>
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     }
   ],
   "require": {
-    "php": "~8.1.0 || ~8.2.0",
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
     "doctrine/dbal": "^3.4.2",
     "psr/cache": "^2.0.0|^3.0.0",
     "psr/clock": "^1.0",
@@ -31,12 +31,12 @@
     "symfony/lock": "^4.4.34|^5.4.0|^6.0.1"
   },
   "require-dev": {
-    "ext-pdo_sqlite": "~8.1.0 || ~8.2.0",
+    "ext-pdo_sqlite": "~8.1.0 || ~8.2.0 || ~8.3.0",
     "cspray/phinal": "^2.0.0",
     "doctrine/migrations": "^3.3.2",
     "doctrine/orm": "^2.0.0",
     "infection/infection": "^0.27.0",
-    "patchlevel/coding-standard": "^1.2.0",
+    "patchlevel/coding-standard": "^1.3.0",
     "patchlevel/event-sourcing-psalm-plugin": "^2.1.0",
     "phpbench/phpbench": "^1.2.8",
     "phpspec/prophecy-phpunit": "^2.0.1",
@@ -46,7 +46,7 @@
     "roave/infection-static-analysis-plugin": "^1.32.0",
     "symfony/messenger": "^4.4.34|^5.4.0|^6.0.1",
     "symfony/var-dumper": "^5.4.1|^6.0.1",
-    "vimeo/psalm": "^5.6.0"
+    "vimeo/psalm": "^5.17.0"
   },
   "suggest": {
     "doctrine/migrations": "for schema migration support",