10000 [Workflow] Make many internal services as hidden by lyrixx · Pull Request #35321 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Workflow] Make many internal services as hidden #35321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2020
Merged

[Workflow] Make many internal services as hidden #35321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
if ('workflow' === $type) {
$transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $transition['from'], $transition['to']]);
$transitionDefinition->setPublic(false);
$transitionId = sprintf('%s.transition.%s', $workflowId, $transitionCounter++);
$transitionId = sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
$container->setDefinition($transitionId, $transitionDefinition);
$transitions[] = new Reference($transitionId);
if (isset($transition['guard'])) {
Expand All @@ -654,7 +654,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
foreach ($transition['to'] as $to) {
$transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $from, $to]);
$transitionDefinition->setPublic(false);
$transitionId = sprintf('%s.transition.%s', $workflowId, $transitionCounter++);
$transitionId = sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
$container->setDefinition($transitionId, $transitionDefinition);
$transitions[] = new Reference($transitionId);
if (isset($transition['guard'])) {
Expand Down Expand Up @@ -750,7 +750,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
$listener->addTag('kernel.event_listener', ['event' => sprintf('workflow.%s.transition', $name), 'method' => 'onTransition']);
$listener->addTag('kernel.event_listener', ['event' => sprintf('workflow.%s.enter', $name), 'method' => 'onEnter']);
$listener->addArgument(new Reference('logger'));
$container->setDefinition(sprintf('%s.listener.audit_trail', $workflowId), $listener);
$container->setDefinition(sprintf('.%s.listener.audit_trail', $workflowId), $listener);
}

// Add Guard Listener
Expand Down Expand Up @@ -779,7 +779,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
$guard->addTag('kernel.event_listener', ['event' => $eventName, 'method' => 'onTransition']);
}

$container->setDefinition(sprintf('%s.listener.guard', $workflowId), $guard);
$container->setDefinition(sprintf('.%s.listener.guard', $workflowId), $guard);
$container->setParameter('workflow.has_guard_listeners', true);
}
}
Expand Down
20 changes: 10 additions & 10 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ public function testWorkflows()
$params = $transitionsMetadataCall[1];
$this->assertCount(2, $params);
$this->assertInstanceOf(Reference::class, $params[0]);
$this->assertSame('state_machine.pull_request.transition.0', (string) $params[0]);
$this->assertSame('.state_machine.pull_request.transition.0', (string) $params[0]);

$serviceMarkingStoreWorkflowDefinition = $container->getDefinition('workflow.service_marking_store_workflow');
/** @var Reference $markingStoreRef */
Expand Down Expand Up @@ -311,7 +311,7 @@ public function testWorkflowMultipleTransitionsWithSameName()

$this->assertCount(5, $transitions);

$this->assertSame('workflow.article.transition.0', (string) $transitions[0]);
$this->assertSame('.workflow.article.transition.0', (string) $transitions[0]);
$this->assertSame([
'request_review',
[
Expand All @@ -322,7 +322,7 @@ public function testWorkflowMultipleTransitionsWithSameName()
],
], $container->getDefinition($transitions[0])->getArguments());

$this->assertSame('workflow.article.transition.1', (string) $transitions[1]);
$this->assertSame('.workflow.article.transition.1', (string) $transitions[1]);
$this->assertSame([
'journalist_approval',
[
Expand All @@ -333,7 +333,7 @@ public function testWorkflowMultipleTransitionsWithSameName()
],
], $container->getDefinition($transitions[1])->getArguments());

$this->assertSame('workflow.article.transition.2', (string) $transitions[2]);
$this->assertSame('.workflow.article.transition.2', (string) $transitions[2]);
$this->assertSame([
'spellchecker_approval',
[
Expand All @@ -344,7 +344,7 @@ public function testWorkflowMultipleTransitionsWithSameName()
],
], $container->getDefinition($transitions[2])->getArguments());

$this->assertSame('workflow.article.transition.3', (string) $transitions[3]);
$this->assertSame('.workflow.article.transition.3', (string) $transitions[3]);
$this->assertSame([
'publish',
[
Expand All @@ -356,7 +356,7 @@ public function testWorkflowMultipleTransitionsWithSameName()
],
], $container->getDefinition($transitions[3])->getArguments());

$this->assertSame('workflow.article.transition.4', (string) $transitions[4]);
$this->assertSame('.workflow.article.transition.4', (string) $transitions[4]);
$this->assertSame([
'publish',
[
Expand All @@ -372,10 +372,10 @@ public function testWorkflowGuardExpressions()
{
$container = $this->createContainerFromFile('workflow_with_guard_expression');

$this->assertTrue($container->hasDefinition('workflow.article.listener.guard'), 'Workflow guard listener is registered as a service');
$this->assertTrue($container->hasDefinition('.workflow.article.listener.guard'), 'Workflow guard listener is registered as a service');
$this->assertTrue($container->hasParameter('workflow.has_guard_listeners'), 'Workflow guard listeners parameter exists');
$this->assertTrue(true === $container->getParameter('workflow.has_guard_listeners'), 'Workflow guard listeners parameter is enabled');
$guardDefinition = $container->getDefinition('workflow.article.listener.guard');
$guardDefinition = $container->getDefinition('.workflow.article.listener.guard');
$this->assertSame([
[
'event' => 'workflow.article.guard.publish',
Expand All @@ -385,9 +385,9 @@ public function testWorkflowGuardExpressions()
$guardsConfiguration = $guardDefinition->getArgument(0);
$this->assertTrue(1 === \count($guardsConfiguration), 'Workflow guard configuration contains one element per transition name');
$transitionGuardExpressions = $guardsConfiguration['workflow.article.guard.publish'];
$this->assertSame('workflow.article.transition.3', (string) $transitionGuardExpressions[0]->getArgument(0));
$this->assertSame('.workflow.article.transition.3', (string) $transitionGuardExpressions[0]->getArgument(0));
$this->assertSame('!!true', $transitionGuardExpressions[0]->getArgument(1));
$this->assertSame('workflow.article.transition.4', (string) $transitionGuardExpressions[1]->getArgument(0));
$this->assertSame('.workflow.article.transition.4', (string) $transitionGuardExpressions[1]->getArgument(0));
$this->assertSame('!!false', $transitionGuardExpressions[1]->getArgument(1));
}

Expand Down
0