minor #40586 [Config][FrameworkBundle] Hint to use PHP 8+ or to install Annotations for using attributes/annots (dunglas)

chalasr · chalasr · commit 481222f54545 · 2021-03-29T17:18:19.000+02:00
This PR was merged into the 5.2 branch. Discussion ---------- [Config][FrameworkBundle] Hint to use PHP 8+ or to install Annotations for using attributes/annots …s to use attributes/annots | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | See symfony/recipes#916 | License | MIT | Doc PR | n/a Improve the error message to hint that you can upgrade to PHP 8 instead of using `doctrine/annotations`. Commits ------- af6f3c2 [Config][FrameworkBundle] Hint to use PHP 8+ or to install Annotations to use attributes/annots
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1319,7 +1319,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
 
         if (\array_key_exists('enable_annotations', $config) && $config['enable_annotations']) {
             if (!$this->annotationsConfigEnabled && \PHP_VERSION_ID < 80000) {
-                throw new \LogicException('"enable_annotations" on the validator cannot be set as Doctrine Annotations support is disabled.');
+                throw new \LogicException('"enable_annotations" on the validator cannot be set as the PHP version is lower than 8 and Doctrine Annotations support is disabled. Consider upgrading PHP.');
             }
 
             $validatorBuilder->addMethodCall('enableAnnotationMapping', [true]);
@@ -1583,7 +1583,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         $serializerLoaders = [];
         if (isset($config['enable_annotations']) && $config['enable_annotations']) {
             if (\PHP_VERSION_ID < 80000 && !$this->annotationsConfigEnabled) {
-                throw new \LogicException('"enable_annotations" on the serializer cannot be set as Annotations support is disabled.');
+                throw new \LogicException('"enable_annotations" on the serializer cannot be set as the PHP version is lower than 8 and Annotations support is disabled. Consider upgrading PHP.');
             }
 
             $annotationLoader = new Definition(
diff --git a/src/Symfony/Component/Config/Exception/LoaderLoadException.php b/src/Symfony/Component/Config/Exception/LoaderLoadException.php
@@ -64,7 +64,7 @@ public function __construct(string $resource, string $sourceResource = null, ?in
         } elseif (null !== $type) {
             // maybe there is no loader for this specific type
             if ('annotation' === $type) {
-                $message .= ' Make sure annotations are installed and enabled.';
+                $message .= ' Make sure to use PHP 8+ or that annotations are installed and enabled.';
             } else {
                 $message .= sprintf(' Make sure there is a loader supporting the "%s" type.', $type);
             }
diff --git a/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php b/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php
@@ -31,7 +31,7 @@ public function testMessageCannotLoadResourceWithType()
     public function testMessageCannotLoadResourceWithAnnotationType()
     {
         $exception = new LoaderLoadException('resource', null, 0, null, 'annotation');
-        $this->assertEquals('Cannot load resource "resource". Make sure annotations are installed and enabled.', $exception->getMessage());
+        $this->assertEquals('Cannot load resource "resource". Make sure to use PHP 8+ or that annotations are installed and enabled.', $exception->getMessage());
     }
 
     public function testMessageCannotImportResourceFromSource()
diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json
@@ -38,8 +38,7 @@
         "symfony/http-foundation": "For using a Symfony Request object",
         "symfony/config": "For using the all-in-one router or any loader",
         "symfony/yaml": "For using the YAML loader",
-        "symfony/expression-language": "For using expression matching",
-        "doctrine/annotations": "For using the annotation loader"
+        "symfony/expression-language": "For using expression matching"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Routing\\": "" },
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
@@ -55,8 +55,6 @@
         "symfony/config": "For using the XML mapping loader.",
         "symfony/property-access": "For using the ObjectNormalizer.",
         "symfony/mime": "For using a MIME type guesser within the DataUriNormalizer.",
-        "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-        "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
         "symfony/var-exporter": "For using the metadata compiler."
     },
     "autoload": {
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -56,8 +56,6 @@
     },
     "suggest": {
         "psr/cache-implementation": "For using the mapping cache.",
-        "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-        "doctrine/cache": "For using the default cached annotation reader.",
         "symfony/http-foundation": "",
         "symfony/intl": "",
         "symfony/translation": "For translating validation errors.",

Original file line number	Diff line number	Diff line change
`@@ -1319,7 +1319,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder`
`1319`	`1319`
`1320`	`1320`	`if (\array_key_exists('enable_annotations', $config) && $config['enable_annotations']) {`
`1321`	`1321`	`if (!$this->annotationsConfigEnabled && \PHP_VERSION_ID < 80000) {`
`1322`		`- throw new \LogicException('"enable_annotations" on the validator cannot be set as Doctrine Annotations support is disabled.');`
	`1322`	`+ throw new \LogicException('"enable_annotations" on the validator cannot be set as the PHP version is lower than 8 and Doctrine Annotations support is disabled. Consider upgrading PHP.');`
`1323`	`1323`	`}`
`1324`	`1324`
`1325`	`1325`	`$validatorBuilder->addMethodCall('enableAnnotationMapping', [true]);`
`@@ -1583,7 +1583,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1583`	`1583`	`$serializerLoaders = [];`
`1584`	`1584`	`if (isset($config['enable_annotations']) && $config['enable_annotations']) {`
`1585`	`1585`	`if (\PHP_VERSION_ID < 80000 && !$this->annotationsConfigEnabled) {`
`1586`		`- throw new \LogicException('"enable_annotations" on the serializer cannot be set as Annotations support is disabled.');`
	`1586`	`+ throw new \LogicException('"enable_annotations" on the serializer cannot be set as the PHP version is lower than 8 and Annotations support is disabled. Consider upgrading PHP.');`
`1587`	`1587`	`}`
`1588`	`1588`
`1589`	`1589`	`$annotationLoader = new Definition(`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function __construct(string $resource, string $sourceResource = null, ?in`
`64`	`64`	`} elseif (null !== $type) {`
`65`	`65`	`// maybe there is no loader for this specific type`
`66`	`66`	`if ('annotation' === $type) {`
`67`		`- $message .= ' Make sure annotations are installed and enabled.';`
	`67`	`+ $message .= ' Make sure to use PHP 8+ or that annotations are installed and enabled.';`
`68`	`68`	`} else {`
`69`	`69`	`$message .= sprintf(' Make sure there is a loader supporting the "%s" type.', $type);`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function testMessageCannotLoadResourceWithType()`
`31`	`31`	`public function testMessageCannotLoadResourceWithAnnotationType()`
`32`	`32`	`{`
`33`	`33`	`$exception = new LoaderLoadException('resource', null, 0, null, 'annotation');`
`34`		`- $this->assertEquals('Cannot load resource "resource". Make sure annotations are installed and enabled.', $exception->getMessage());`
	`34`	`+ $this->assertEquals('Cannot load resource "resource". Make sure to use PHP 8+ or that annotations are installed and enabled.', $exception->getMessage());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function testMessageCannotImportResourceFromSource()`