Merge pull request #356 from greg0ire/bump-psalm

Psalm 5.24
doctrine · May 5, 2024 · e757f57 · e757f57
2 parents e9edf8f + 6245cc4
commit e757f57
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "doctrine/common": "^3.0",
         "phpunit/phpunit": "^8.5 || ^9.5",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
-        "vimeo/psalm": "4.30.0 || 5.3.0"
+        "vimeo/psalm": "4.30.0 || 5.24.0"
     },
     "conflict": {
         "doctrine/common": "<2.10"

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.3.0@b6faa3e96b8eb50ec71384c53799b8a107236bb6">
-  <file src="src/Persistence/AbstractManagerRegistry.php">
-    <PossiblyNullReference occurrences="1">
-      <code>getName</code>
-    </PossiblyNullReference>
-    <TypeDoesNotContainType occurrences="1">
-      <code>$parentClass === false</code>
-    </TypeDoesNotContainType>
+<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
+  <file src="src/Persistence/Mapping/AbstractClassMetadataFactory.php">
+    <ArgumentTypeCoercion>
+      <code><![CDATA[$class]]></code>
+    </ArgumentTypeCoercion>
+  </file>
+  <file src="src/Persistence/Mapping/Driver/SymfonyFileLocator.php">
+    <PossiblyInvalidOperand>
+      <code><![CDATA[str_replace($this->nsSeparator, '\\', $fileName)]]></code>
+    </PossiblyInvalidOperand>
   </file>
   <file src="src/Persistence/Reflection/EnumReflectionProperty.php">
-    <InvalidReturnStatement occurrences="1">
-      <code>$value</code>
+    <InvalidArgument>
+      <code><![CDATA[$name]]></code>
+    </InvalidArgument>
+    <InvalidReturnStatement>
+      <code><![CDATA[$value]]></code>
     </InvalidReturnStatement>
-    <PossiblyInvalidArgument occurrences="1">
-      <code>$value</code>
+    <PossiblyInvalidArgument>
+      <code><![CDATA[$value]]></code>
     </PossiblyInvalidArgument>
   </file>
 </files>
diff --git a/src/Persistence/Reflection/RuntimeReflectionProperty.php b/src/Persistence/Reflection/RuntimeReflectionProperty.php
@@ -23,6 +23,7 @@ class RuntimeReflectionProperty extends ReflectionProperty
     /** @var string */
     private $key;
 
+    /** @param class-string $class */
     public function __construct(string $class, string $name)
     {
         parent::__construct($class, $name);

diff --git a/tests/Persistence/RuntimePublicReflectionPropertyTest.php b/tests/Persistence/RuntimePublicReflectionPropertyTest.php
@@ -61,7 +61,7 @@ public function testGetValueOnProxyPublicProperty(): void
         $mockProxy->__setInitializer($initializer);
 
         $reflProperty = new RuntimePublicReflectionProperty(
-            __NAMESPACE__ . '\RuntimePublicReflectionPropertyTestProxyMock',
+            RuntimePublicReflectionPropertyTestProxyMock::class,
             'checkedProperty'
         );
 
@@ -82,7 +82,7 @@ public function testSetValueOnProxyPublicProperty(): void
         $mockProxy->__setInitializer($initializer);
 
         $reflProperty = new RuntimePublicReflectionProperty(
-            __NAMESPACE__ . '\RuntimePublicReflectionPropertyTestProxyMock',
+            RuntimePublicReflectionPropertyTestProxyMock::class,
             'checkedProperty'
         );