feature #51976 [Workflow] Revert deprecation about Registry (lyrixx)

fabpot · fabpot · commit 85fc3f721e80 · 2023-10-10T20:54:53.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Workflow] Revert deprecation about Registry | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | Fix #51662, fix #49199, fix #51400 | License | MIT Commits ------- 56757f3 [workflow] Revert deprecation about Registry
diff --git a/UPGRADE-6.2.md b/UPGRADE-6.2.md
@@ -132,10 +132,6 @@ VarDumper
 Workflow
 --------
 
- * The `Registry` is marked as internal and should not be used directly. use a tagged locator instead
-    ```
-    tagged_locator('workflow', 'name')
-    ```
  * The first argument of `WorkflowDumpCommand` should be a `ServiceLocator` of
    all workflows indexed by names
  * Deprecate calling `Definition::setInitialPlaces()` without arguments
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/workflow.php
@@ -39,11 +39,8 @@
             ->abstract()
         ->set('workflow.marking_store.method', MethodMarkingStore::class)
             ->abstract()
-        ->set('.workflow.registry', Registry::class)
-        ->alias(Registry::class, '.workflow.registry')
-            ->deprecate('symfony/workflow', '6.2', 'The "%alias_id%" alias is deprecated, inject the workflow directly.')
-        ->alias('workflow.registry', '.workflow.registry')
-            ->deprecate('symfony/workflow', '6.2', 'The "%alias_id%" alias is deprecated, inject the workflow directly.')
+        ->set('workflow.registry', Registry::class)
+        ->alias(Registry::class, 'workflow.registry')
         ->set('workflow.security.expression_language', ExpressionLanguage::class)
     ;
 };
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
@@ -144,7 +144,7 @@
             ->tag('translation.extractor', ['alias' => 'twig'])
 
         ->set('workflow.twig_extension', WorkflowExtension::class)
-            ->args([service('.workflow.registry')])
+            ->args([service('workflow.registry')])
 
         ->set('twig.configurator.environment', EnvironmentConfigurator::class)
             ->args([
diff --git a/src/Symfony/Component/Workflow/CHANGELOG.md b/src/Symfony/Component/Workflow/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * Add support for multiline descriptions in PlantUML diagrams
  * Add PHP attributes to register listeners and guards
  * Deprecate `GuardEvent::getContext()` method that will be removed in 7.0
+ * Revert: Mark `Symfony\Component\Workflow\Registry` as internal
 
 6.2
 ---
diff --git a/src/Symfony/Component/Workflow/Registry.php b/src/Symfony/Component/Workflow/Registry.php
@@ -17,8 +17,6 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
- *
- * @internal since Symfony 6.2. Inject the workflow where you need it.
  */
 class Registry
 {

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@`
`17`	`17`	`/**`
`18`	`18`	`* @author Fabien Potencier <fabien@symfony.com>`
`19`	`19`	`* @author Grégoire Pineau <lyrixx@lyrixx.info>`
`20`		`- *`
`21`		`- * @internal since Symfony 6.2. Inject the workflow where you need it.`
`22`	`20`	`*/`
`23`	`21`	`class Registry`
`24`	`22`	`{`