Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 7aeb6f5

Browse filesBrowse files
Merge branch '4.2' into 4.3
* 4.2: fix typo Fixes a small doc blocks syntax error Small grammar mistake in documentation [Messenger] Use real memory usage for --memory-limit [Workflow] Do not trigger extra guard
2 parents 94f38d0 + 82a1ebf commit 7aeb6f5
Copy full SHA for 7aeb6f5

File tree

Expand file treeCollapse file tree

4 files changed

+43
-3
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+43
-3
lines changed

‎src/Symfony/Component/HttpFoundation/Request.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Request.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1907,7 +1907,7 @@ private function setPhpDefaultLocale(string $locale)
19071907
}
19081908
}
19091909

1910-
/*
1910+
/**
19111911
* Returns the prefix as encoded in the string when the string starts with
19121912
* the given prefix, false otherwise.
19131913
*

‎src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ interface ControllerResolverInterface
2929
* As several resolvers can exist for a single application, a resolver must
3030
* return false when it is not able to determine the controller.
3131
*
32-
* The resolver must only throw an exception when it should be able to load
32+
* The resolver must only throw an exception when it should be able to load a
3333
* controller but cannot because of some errors made by the developer.
3434
*
3535
* @return callable|false A PHP callable representing the Controller,

‎src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* All URL paths starting with /_fragment are handled as
2525
* content fragments by this listener.
2626
*
27-
* If throws an AccessDeniedHttpException exception if the request
27+
* Throws an AccessDeniedHttpException exception if the request
2828
* is not signed or if it is not an internal sub-request.
2929
*
3030
* @author Fabien Potencier <fabien@symfony.com>

‎src/Symfony/Component/Workflow/Tests/WorkflowTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Workflow/Tests/WorkflowTest.php
+40Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,46 @@ public function testApplyWithEventDispatcher()
419419
$this->assertSame($eventNameExpected, $eventDispatcher->dispatchedEvents);
420420
}
421421

422+
public function testApplyDoesNotTriggerExtraGuardWithEventDispatcher()
423+
{
424+
$transitions[] = new Transition('a-b', 'a', 'b');
425+
$transitions[] = new Transition('a-c', 'a', 'c');
426+
$definition = new Definition(['a', 'b', 'c'], $transitions);
427+
428+
$subject = new Subject();
429+
$eventDispatcher = new EventDispatcherMock();
430+
$workflow = new Workflow($definition, new MultipleStateMarkingStore(), $eventDispatcher, 'workflow_name');
431+
432+
$eventNameExpected = [
433+
'workflow.entered',
434+
'workflow.workflow_name.entered',
435+
'workflow.guard',
436+
'workflow.workflow_name.guard',
437+
'workflow.workflow_name.guard.a-b',
438+
'workflow.leave',
439+
'workflow.workflow_name.leave',
440+
'workflow.workflow_name.leave.a',
441+
'workflow.transition',
442+
'workflow.workflow_name.transition',
443+
'workflow.workflow_name.transition.a-b',
444+
'workflow.enter',
445+
'workflow.workflow_name.enter',
446+
'workflow.workflow_name.enter.b',
447+
'workflow.entered',
448+
'workflow.workflow_name.entered',
449+
'workflow.workflow_name.entered.b',
450+
'workflow.completed',
451+
'workflow.workflow_name.completed',
452+
'workflow.workflow_name.completed.a-b',
453+
'workflow.announce',
454+
'workflow.workflow_name.announce',
455+
];
456+
457+
$marking = $workflow->apply($subject, 'a-b');
458+
459+
$this->assertSame($eventNameExpected, $eventDispatcher->dispatchedEvents);
460+
}
461+
422462
public function testApplyWithContext()
423463
{
424464
$definition = $this->createComplexWorkflowDefinition();

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.