Merge branch '2.5.x' into 3.1.x

* 2.5.x: Bump tools and workflows (#321)
doctrine · Dec 19, 2022 · 2db671b · 2db671b
2 parents d87426f + 4d90b67
commit 2db671b
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 20 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -12,6 +12,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0"
     with:
       composer-root-version: "3.0"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@2.1.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.0.0"
     with:
       composer-root-version: "3.0"
       php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]'
diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@2.1.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.0.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -12,6 +12,6 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@2.1.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0"
     with:
       composer-root-version: "3.0"
diff --git a/composer.json b/composer.json
@@ -26,15 +26,15 @@
     },
     "require-dev": {
         "composer/package-versions-deprecated": "^1.11",
-        "phpstan/phpstan": "1.8.8",
+        "phpstan/phpstan": "1.9.4",
         "phpstan/phpstan-phpunit": "^1",
         "phpstan/phpstan-strict-rules": "^1.1",
         "doctrine/annotations": "^1.7",
-        "doctrine/coding-standard": "^10",
+        "doctrine/coding-standard": "^11",
         "doctrine/common": "^3.0",
         "phpunit/phpunit": "^8.5 || ^9.5",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
-        "vimeo/psalm": "4.29.0"
+        "vimeo/psalm": "4.30.0 || 5.3.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.7 || >=2.0",

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
-  <file src="tests/Persistence/Mapping/ColocatedMappingDriverTest.php">
-    <UndefinedInterfaceMethod occurrences="9">
-      <code>addExcludePaths</code>
-      <code>addPaths</code>
-      <code>getExcludePaths</code>
-      <code>getExcludePaths</code>
-      <code>getFileExtension</code>
-      <code>getFileExtension</code>
-      <code>getPaths</code>
-      <code>getPaths</code>
-      <code>setFileExtension</code>
-    </UndefinedInterfaceMethod>
+<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>
   </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
@@ -43,6 +43,12 @@
                 <file name="tests/Persistence/Mapping/FileDriverTest.php"/>
             </errorLevel>
         </MoreSpecificReturnType>
+        <RedundantCast>
+            <errorLevel type="suppress">
+                <!-- We're filtering invalid input- -->
+                <file name="src/Persistence/Mapping/Driver/SymfonyFileLocator.php"/>
+            </errorLevel>
+        </RedundantCast>
         <UndefinedClass>
             <errorLevel type="suppress">
                 <!-- We are testing what happens when calling the API with a non existent class -->

diff --git a/src/Persistence/Reflection/RuntimePublicReflectionProperty.php b/src/Persistence/Reflection/RuntimePublicReflectionProperty.php
@@ -53,7 +53,9 @@ public function setValue($object, $value = null)
 
         $originalInitializer = $object->__getInitializer();
         $object->__setInitializer(null);
+
         parent::setValue($object, $value);
+
         $object->__setInitializer($originalInitializer);
     }
 }
diff --git a/src/Persistence/Reflection/RuntimeReflectionProperty.php b/src/Persistence/Reflection/RuntimeReflectionProperty.php
@@ -25,6 +25,7 @@ class RuntimeReflectionProperty extends ReflectionProperty
     public function __construct(string $class, string $name)
     {
         parent::__construct($class, $name);
+
         $this->key = $this->isPrivate() ? "\0" . $class . "\0" . $name : ($this->isProtected() ? "\0*\0" . $name : $name);
     }
 
@@ -63,7 +64,9 @@ public function setValue($object, $value = null)
         if ($object instanceof CommonProxy) {
             $originalInitializer = $object->__getInitializer();
             $object->__setInitializer(null);
+
             parent::setValue($object, $value);
+
             $object->__setInitializer($originalInitializer);
 
             return;
@@ -74,7 +77,9 @@ public function setValue($object, $value = null)
         }
 
         $object->__setInitialized(true);
+
         parent::setValue($object, $value);
+
         $object->__setInitialized(false);
     }
 }