Merge pull request #359 from doctrine/3.4.x

Merge 3.4.x up into 4.0.x

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "CI"

.github/workflows/coding-standards.yml

@@ -12,6 +12,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"
     with:
       composer-root-version: "3.0"

.github/workflows/continuous-integration.yml

@@ -12,7 +12,9 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.0.1"
     with:
       composer-root-version: "3.0"
       php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'
+    secrets:
+      CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

.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@3.0.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.0.1"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -12,6 +12,6 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.0.1"
     with:
       composer-root-version: "3.0"

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"

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>

src/Persistence/Reflection/EnumReflectionProperty.php

@@ -168,4 +168,14 @@ public function getDocComment(): string|false
     {
         return $this->originalReflectionProperty->getDocComment();
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @psalm-external-mutation-free
+     */
+    public function isPrivate(): bool
+    {
+        return $this->originalReflectionProperty->isPrivate();
+    }
 }

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);

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'
         );
 

tests_php81/Persistence/Reflection/EnumReflectionPropertyTest.php

@@ -125,6 +125,12 @@ public function testGetDocComment(): void
         $reflProperty = new EnumReflectionProperty(new ReflectionProperty(TypedEnumClass::class, 'suit'), Suit::class);
         self::assertStringContainsString('@MyDoc', $reflProperty->getDocComment());
     }
+
+    public function testIsPrivate(): void
+    {
+        $reflProperty = new EnumReflectionProperty(new ReflectionProperty(TypedEnumClass::class, 'suit'), Suit::class);
+        self::assertFalse($reflProperty->isPrivate());
+    }
 }
 
 #[Attribute(Attribute::TARGET_PROPERTY)]