diff --git a/UPGRADE-6.2.md b/UPGRADE-6.2.md index b263ecdeebb3a..cb8f65d3ae112 100644 --- 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 index 85d786537f031..b6c784bdbeaa9 100644 --- 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 index 556cdde3c183f..69d0aa2f03498 100644 --- 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 index 5089019c556c0..da2bcd241f8fb 100644 --- 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 index 287d8b750f9b4..e9d9481fb0655 100644 --- a/src/Symfony/Component/Workflow/Registry.php +++ b/src/Symfony/Component/Workflow/Registry.php @@ -17,8 +17,6 @@ /** * @author Fabien Potencier * @author Grégoire Pineau - * - * @internal since Symfony 6.2. Inject the workflow where you need it. */ class Registry {