From 2d1776b364ef1b12e17dbbcc78aab00e0115a316 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Thu, 29 Feb 2024 16:30:32 +0000
Subject: [PATCH] Issue #3351563 by Spokje, longwave, smustgrave: [11.x] Update
doctrine/annotations to v2
---
composer.lock | 28 +++++++++----------
.../Metapackage/CoreRecommended/composer.json | 2 +-
core/composer.json | 2 +-
.../Discovery/AnnotatedClassDiscovery.php | 2 --
.../Drupal/Component/Annotation/composer.json | 2 +-
.../AttributeDiscoveryWithAnnotations.php | 3 --
...otatedClassDiscoveryAutomatedProviders.php | 2 --
core/phpstan-baseline.neon | 27 ------------------
.../Annotation/Doctrine/DocParserTest.php | 18 ++++++------
9 files changed, 27 insertions(+), 59 deletions(-)
diff --git a/composer.lock b/composer.lock
index ca6011e482f6..6a5cfd4b5ff1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -290,30 +290,30 @@
},
{
"name": "doctrine/annotations",
- "version": "1.14.3",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af"
+ "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af",
- "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
+ "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
"shasum": ""
},
"require": {
- "doctrine/lexer": "^1 || ^2",
+ "doctrine/lexer": "^2 || ^3",
"ext-tokenizer": "*",
- "php": "^7.1 || ^8.0",
+ "php": "^7.2 || ^8.0",
"psr/cache": "^1 || ^2 || ^3"
},
"require-dev": {
- "doctrine/cache": "^1.11 || ^2.0",
- "doctrine/coding-standard": "^9 || ^10",
- "phpstan/phpstan": "~1.4.10 || ^1.8.0",
+ "doctrine/cache": "^2.0",
+ "doctrine/coding-standard": "^10",
+ "phpstan/phpstan": "^1.8.0",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "symfony/cache": "^4.4 || ^5.4 || ^6",
+ "symfony/cache": "^5.4 || ^6",
"vimeo/psalm": "^4.10"
},
"suggest": {
@@ -360,9 +360,9 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
- "source": "https://github.com/doctrine/annotations/tree/1.14.3"
+ "source": "https://github.com/doctrine/annotations/tree/2.0.1"
},
- "time": "2023-02-01T09:20:38+00:00"
+ "time": "2023-02-02T22:02:53+00:00"
},
{
"name": "doctrine/deprecations",
@@ -495,13 +495,13 @@
"dist": {
"type": "path",
"url": "core",
- "reference": "52e04d4f59d5d77f898e4a3d2a63c1d809f139f7"
+ "reference": "8e8088fe577c4e4e1e961f9c36ce57b4cbb9ce51"
},
"require": {
"asm89/stack-cors": "^2.1",
"composer-runtime-api": "^2.1",
"composer/semver": "^3.3",
- "doctrine/annotations": "^1.14",
+ "doctrine/annotations": "^2.0",
"egulias/email-validator": "^3.2.1|^4.0",
"ext-date": "*",
"ext-dom": "*",
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json
index 1c185da55c5f..9c7df65c6d59 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -10,7 +10,7 @@
"drupal/core": "11.x-dev",
"asm89/stack-cors": "~v2.2.0",
"composer/semver": "~3.4.0",
- "doctrine/annotations": "~1.14.3",
+ "doctrine/annotations": "~2.0.1",
"doctrine/deprecations": "~1.1.2",
"doctrine/lexer": "~2.1.0",
"egulias/email-validator": "~4.0.2",
diff --git a/core/composer.json b/core/composer.json
index 44fe4bada636..d6ab934a7759 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -34,7 +34,7 @@
"symfony/polyfill-iconv": "^1.26",
"symfony/yaml": "^6.4",
"twig/twig": "^3.5.0",
- "doctrine/annotations": "^1.14",
+ "doctrine/annotations": "^2.0",
"guzzlehttp/guzzle": "^7.5",
"guzzlehttp/psr7": "^2.4.5",
"egulias/email-validator": "^3.2.1|^4.0",
diff --git a/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
index fa5fa8c35e88..27ad81572dfe 100644
--- a/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -111,8 +111,6 @@ public function getDefinitions() {
// Clear the annotation loaders of any previous annotation classes.
AnnotationRegistry::reset();
- // Register the namespaces of classes that can be used for annotations.
- AnnotationRegistry::registerLoader('class_exists');
// Search for classes within all PSR-4 namespace locations.
foreach ($this->getPluginNamespaces() as $namespace => $dirs) {
diff --git a/core/lib/Drupal/Component/Annotation/composer.json b/core/lib/Drupal/Component/Annotation/composer.json
index 966b84e06ec9..71c39f8e3ea6 100644
--- a/core/lib/Drupal/Component/Annotation/composer.json
+++ b/core/lib/Drupal/Component/Annotation/composer.json
@@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
- "doctrine/annotations": "^1.14",
+ "doctrine/annotations": "^2.0",
"drupal/core-class-finder": "11.x-dev",
"drupal/core-file-cache": "11.x-dev",
"drupal/core-plugin": "11.x-dev",
diff --git a/core/lib/Drupal/Core/Plugin/Discovery/AttributeDiscoveryWithAnnotations.php b/core/lib/Drupal/Core/Plugin/Discovery/AttributeDiscoveryWithAnnotations.php
index 8bae6730629b..a54e86087552 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/AttributeDiscoveryWithAnnotations.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/AttributeDiscoveryWithAnnotations.php
@@ -63,9 +63,6 @@ protected function getFileCacheSuffix(string $default_suffix):string {
public function getDefinitions() {
// Clear the annotation loaders of any previous annotation classes.
AnnotationRegistry::reset();
- // Register the namespaces of classes that can be used for annotations.
- // @phpstan-ignore-next-line
- AnnotationRegistry::registerLoader('class_exists');
$definitions = parent::getDefinitions();
diff --git a/core/modules/migrate/src/Plugin/Discovery/AnnotatedClassDiscoveryAutomatedProviders.php b/core/modules/migrate/src/Plugin/Discovery/AnnotatedClassDiscoveryAutomatedProviders.php
index dfa32bc7ea36..c51468911645 100644
--- a/core/modules/migrate/src/Plugin/Discovery/AnnotatedClassDiscoveryAutomatedProviders.php
+++ b/core/modules/migrate/src/Plugin/Discovery/AnnotatedClassDiscoveryAutomatedProviders.php
@@ -78,8 +78,6 @@ public function getDefinitions() {
// Clear the annotation loaders of any previous annotation classes.
AnnotationRegistry::reset();
- // Register the namespaces of classes that can be used for annotations.
- AnnotationRegistry::registerLoader('class_exists');
// Search for classes within all PSR-4 namespace locations.
foreach ($this->getPluginNamespaces() as $namespace => $dirs) {
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index a6d44a12408c..5091ae91c221 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -49,15 +49,6 @@ parameters:
count: 1
path: includes/theme.maintenance.inc
- -
- message: """
- #^Call to deprecated method registerLoader\\(\\) of class Doctrine\\\\Common\\\\Annotations\\\\AnnotationRegistry\\:
- This method is deprecated and will be removed in
- doctrine/annotations 2\\.0\\. Annotations will be autoloaded in 2\\.0\\.$#
- """
- count: 1
- path: lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
-
-
message: "#^Call to an undefined method Drupal\\\\Component\\\\Datetime\\\\DateTimePlus\\:\\:getTimeZone\\(\\)\\.$#"
count: 1
@@ -1416,15 +1407,6 @@ parameters:
count: 1
path: modules/migrate/src/MigrateException.php
- -
- message: """
- #^Call to deprecated method registerLoader\\(\\) of class Doctrine\\\\Common\\\\Annotations\\\\AnnotationRegistry\\:
- This method is deprecated and will be removed in
- doctrine/annotations 2\\.0\\. Annotations will be autoloaded in 2\\.0\\.$#
- """
- count: 1
- path: modules/migrate/src/Plugin/Discovery/AnnotatedClassDiscoveryAutomatedProviders.php
-
-
message: "#^Missing cache backend declaration for performance\\.$#"
count: 1
@@ -2590,15 +2572,6 @@ parameters:
count: 1
path: tests/Drupal/Tests/BrowserTestBase.php
- -
- message: """
- #^Call to deprecated method registerAutoloadNamespace\\(\\) of class Doctrine\\\\Common\\\\Annotations\\\\AnnotationRegistry\\:
- This method is deprecated and will be removed in
- doctrine/annotations 2\\.0\\. Annotations will be autoloaded in 2\\.0\\.$#
- """
- count: 1
- path: tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php
-
-
message: "#^Constructor of class Symfony\\\\Component\\\\ExpressionLanguage\\\\Expression has an unused parameter \\$expression\\.$#"
count: 1
diff --git a/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php b/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php
index f52b8fb8dce0..44ee75f5bb9b 100644
--- a/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php
+++ b/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php
@@ -7,6 +7,7 @@
use Drupal\Component\Annotation\Doctrine\DocParser;
use Doctrine\Common\Annotations\AnnotationRegistry;
use Doctrine\Common\Annotations\Annotation\Target;
+use Drupal\Tests\Component\Annotation\Doctrine\Fixtures\Annotation\Autoload;
use Drupal\Tests\Component\Annotation\Doctrine\Fixtures\AnnotationWithConstants;
use Drupal\Tests\Component\Annotation\Doctrine\Fixtures\ClassWithConstants;
use Drupal\Tests\Component\Annotation\Doctrine\Fixtures\IntefaceWithConstants;
@@ -1054,19 +1055,20 @@ public function testAnnotationThrowsExceptionWhenAtSignIsNotFollowedByIdentifier
*/
public function testAutoloadAnnotation()
{
- $this->assertFalse(class_exists('Drupal\Tests\Component\Annotation\Doctrine\Fixture\Annotation\Autoload', false), 'Pre-condition: Drupal\Tests\Component\Annotation\Doctrine\Fixture\Annotation\Autoload not allowed to be loaded.');
+ self::assertFalse(
+ class_exists('Drupal\Tests\Component\Annotation\Doctrine\Fixture\Annotation\Autoload', false),
+ 'Pre-condition: Drupal\Tests\Component\Annotation\Doctrine\Fixture\Annotation\Autoload not allowed to be loaded.'
+ );
$parser = new DocParser();
- AnnotationRegistry::registerAutoloadNamespace('Drupal\Tests\Component\Annotation\Doctrine\Fixtures\Annotation', __DIR__ . '/../../../../');
-
- $parser->setImports(array(
- 'autoload' => 'Drupal\Tests\Component\Annotation\Doctrine\Fixtures\Annotation\Autoload',
- ));
+ $parser->setImports([
+ 'autoload' => Autoload::class,
+ ]);
$annotations = $parser->parse('@Autoload');
- $this->assertCount(1, $annotations);
- $this->assertInstanceOf('Drupal\Tests\Component\Annotation\Doctrine\Fixtures\Annotation\Autoload', $annotations[0]);
+ self::assertCount(1, $annotations);
+ self::assertInstanceOf(Autoload::class, $annotations[0]);
}
public function createTestParser()
--
GitLab