Merge 2.3.x into 2.4.x (#242)

* Assert AnnotationDriver works with winding paths

This has been broken on the 3.0.x branch. Let us add a test that ensure
this cannot be broken.

* Whitelist Composer plugins used by this repository (#240)

* Bump dev dependencies (#241)

Co-authored-by: Grégoire Paris <[email protected]>

Author: derrabus

.github/workflows/coding-standards.yml

@@ -14,5 +14,5 @@ jobs:
     name: "Coding Standards"
     uses: "doctrine/.github/.github/workflows/[email protected]"
     with:
-      composer-root-version: "2.2"
-      php-version: "7.4"
+      composer-root-version: "2.3"
+      php-version: "8.1"

.github/workflows/static-analysis.yml

@@ -14,5 +14,5 @@ jobs:
     name: "Static Analysis"
     uses: "doctrine/.github/.github/workflows/[email protected]"
     with:
-      composer-root-version: "2.2"
-      php-version: "7.4"
+      composer-root-version: "2.3"
+      php-version: "8.1"

composer.json

@@ -29,17 +29,17 @@
     },
     "require-dev": {
         "composer/package-versions-deprecated": "^1.11",
-        "phpstan/phpstan": "1.2.0",
+        "phpstan/phpstan": "1.4.6",
         "doctrine/annotations": "^1.0",
-        "doctrine/coding-standard": "^6.0 || ^9.0",
+        "doctrine/coding-standard": "^9.0",
         "doctrine/common": "^3.0",
-        "phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0",
-        "symfony/cache": "^4.4 || ^5.0 || ^6.0",
-        "vimeo/psalm": "4.20.0"
+        "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.5",
+        "symfony/cache": "^4.4 || ^5.4 || ^6.0",
+        "vimeo/psalm": "4.21.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.0 || >=2.0",
-        "doctrine/common": "<2.10@dev"
+        "doctrine/common": "<2.10"
     },
     "autoload": {
         "psr-4": {
@@ -52,5 +52,10 @@
             "Doctrine\\Tests\\": "tests/Doctrine/Tests",
             "Doctrine\\Tests_PHP74\\": "tests/Doctrine/Tests_PHP74"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

lib/Doctrine/Persistence/Mapping/Driver/AnnotationDriver.php

@@ -220,7 +220,7 @@ public function getAllClassNames()
             foreach ($iterator as $file) {
                 $sourceFile = $file[0];
 
-                if (! preg_match('(^phar:)i', $sourceFile)) {
+                if (preg_match('(^phar:)i', $sourceFile) === 0) {
                     $sourceFile = realpath($sourceFile);
                 }
 

phpcs.xml.dist

@@ -9,6 +9,8 @@
     <!-- Ignore warnings and show progress of the run -->
     <arg value="nps"/>
 
+    <config name="php_version" value="70100"/>
+
     <file>lib</file>
     <file>tests</file>
 

phpstan.neon

@@ -3,6 +3,7 @@ includes:
 
 parameters:
     level: 7
+    phpVersion: 80100
 
     paths:
         - lib

psalm.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="3"
+    phpVersion="8.1"
     findUnusedPsalmSuppress="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

tests/Doctrine/Tests/Persistence/Mapping/AnnotationDriverTest.php

@@ -7,11 +7,15 @@
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Persistence\Mapping\Driver\AnnotationDriver;
 use Doctrine\TestClass;
+use Generator;
 use PHPUnit\Framework\TestCase;
 
 class AnnotationDriverTest extends TestCase
 {
-    public function testGetAllClassNames(): void
+    /**
+     * @dataProvider pathProvider
+     */
+    public function testGetAllClassNames(string $path): void
     {
         $reader = new AnnotationReader();
         $driver = new SimpleAnnotationDriver($reader, [__DIR__ . '/_files/annotation']);
@@ -20,6 +24,15 @@ public function testGetAllClassNames(): void
 
         self::assertSame([TestClass::class], $classes);
     }
+
+    /**
+     * @return Generator<string, array{string}>
+     */
+    public function pathProvider(): Generator
+    {
+        yield 'straigthforward path' => [__DIR__ . '/_files/annotation'];
+        yield 'winding path' => [__DIR__ . '/../Mapping/_files/annotation'];
+    }
 }
 
 class SimpleAnnotationDriver extends AnnotationDriver