Merge pull request #1 from jordisala1991/hotfix/improve-core

Improve deprecation messages
sonata-project · Jun 2, 2020 · 984e56a · 984e56a
2 parents 7ebdaa6 + 0a2d6ef
commit 984e56a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 38 deletions.
diff --git a/src/CoreBundle/DependencyInjection/Compiler/FormCompilerPass.php b/src/CoreBundle/DependencyInjection/Compiler/FormCompilerPass.php
@@ -19,7 +19,7 @@
 /**
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
- * @deprecated since sonata-project/core-bundle 3.19, to be removed in 4.0.
+ * @deprecated since sonata-project/core-bundle 3.x, to be removed in 4.0.
  */
 class FormCompilerPass implements CompilerPassInterface
 {
@@ -32,95 +32,95 @@ public function process(ContainerBuilder $container)
 
     public function registerDateAliases(ContainerBuilder $container)
     {
-        $momentFormatConventerAlias = $container
+        $container
             ->setAlias('sonata.core.date.moment_format_converter', 'sonata.form.date.moment_format_converter')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.date.moment_format_converter" instead.'
             );
     }
 
     public function registerFormTypeAlias(ContainerBuilder $container)
     {
-        $arrayTypeAlias = $container
+        $container
             ->setAlias('sonata.core.form.type.array', 'sonata.form.type.array')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.type.array" instead.'
             );
 
-        $boolenTypeAlias = $container
+        $container
             ->setAlias('sonata.core.form.type.boolean', 'sonata.form.type.boolean')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.type.boolean" instead.'
             );
 
-        $collectionTypeAlias = $container
+        $container
             ->setAlias('sonata.core.form.type.collection', 'sonata.form.type.collection')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.type.collection" instead.'
             );
 
-        $dateRangeAlias = $container
+        $container
             ->setAlias('sonata.core.form.type.date_range', 'sonata.form.type.date_range')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.type.date_range" instead.'
             );
 
-        $datetimeRangeAlias = $container
+        $container
             ->setAlias('sonata.core.form.type.datetime_range', 'sonata.form.type.datetime_range')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.type.datetime_range" instead.'
             );
 
-        $datePickerAlias = $container
+        $container
             ->setAlias('sonata.core.form.type.date_picker', 'sonata.form.type.date_picker')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.type.date_picker" instead.'
             );
 
-        $datetimePickerAlias = $container
+        $container
             ->setAlias('sonata.core.form.type.datetime_picker', 'sonata.form.type.datetime_picker')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.type.datetime_picker" instead.'
             );
 
-        $dateRangePickerAlias = $container
+        $container
             ->setAlias('sonata.core.form.type.date_range_picker', 'sonata.form.type.date_range_picker')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.type.date_range_picker" instead.'
             );
 
-        $datetimeRangePickerAlias = $container
+        $container
             ->setAlias('sonata.core.form.type.datetime_range_picker', 'sonata.form.type.datetime_range_picker')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.type.datetime_range_picker" instead.'
             );
 
-        $equalTypeAlias = $container
+        $container
             ->setAlias('sonata.core.form.type.equal', 'sonata.form.type.equal')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.form.type.equal" instead.'
             );
     }
 

diff --git a/src/CoreBundle/DependencyInjection/Compiler/TwigCompilerPass.php b/src/CoreBundle/DependencyInjection/Compiler/TwigCompilerPass.php
@@ -19,7 +19,7 @@
 /**
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
- * @deprecated since sonata-project/core-bundle 3.19, to be removed in 4.0.
+ * @deprecated since sonata-project/core-bundle 3.x, to be removed in 4.0.
  */
 class TwigCompilerPass implements CompilerPassInterface
 {
@@ -32,63 +32,63 @@ public function process(ContainerBuilder $container)
 
     public function registerFlashAliases(ContainerBuilder $container)
     {
-        $flashManagerAlias = $container
+        $container
             ->setAlias('sonata.core.flashmessage.manager', 'sonata.twig.flashmessage.manager')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.twig.flashmessage.manager" instead.'
             );
 
-        $flashRuntimeAlias = $container
+        $container
             ->setAlias('sonata.core.flashmessage.twig.runtime', 'sonata.twig.flashmessage.twig.runtime')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.twig.flashmessage.twig.runtime" instead.'
             );
 
-        $flashExtensionAlias = $container
+        $container
             ->setAlias('sonata.core.flashmessage.twig.extension', 'sonata.twig.flashmessage.twig.extension')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.twig.flashmessage.twig.extension" instead.'
             );
     }
 
     public function registerTwigAliases(ContainerBuilder $container)
     {
-        $extensionWrapping = $container
+        $container
             ->setAlias('sonata.core.twig.extension.wrapping', 'sonata.twig.extension.wrapping')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.twig.extension.wrapping" instead.'
             );
 
-        $runtimeStatus = $container
+        $container
             ->setAlias('sonata.core.twig.status_runtime', 'sonata.twig.status_runtime')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.twig.status_runtime" instead.'
             );
 
-        $extensionDeprecatedTemplate = $container
+        $container
             ->setAlias('sonata.core.twig.deprecated_template_extension', 'sonata.twig.deprecated_template_extension')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.twig.deprecated_template_extension" instead.'
             );
 
-        $extensionTemplate = $container
+        $container
             ->setAlias('sonata.core.twig.template_extension', 'sonata.twig.template_extension')
             ->setPublic(true)
             ->setDeprecated(
                 true,
-                'The "%service_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "%alias_id%" instead.'
+                'The "%alias_id%" service is deprecated since sonata-project/core-bundle 3.19 and will be removed in 4.0. Use "sonata.twig.template_extension" instead.'
             );
     }