Skip to content

Commit 4bfe88a

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Serializer] cs fix Cleanup more `@return` annotations [Form] Fix phpdoc on FormBuilderInterface
2 parents b181991 + 003e322 commit 4bfe88a

File tree

4 files changed

+1
-15
lines changed

4 files changed

+1
-15
lines changed

AppVariable.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ public function getUser(): ?object
8686

8787
/**
8888
* Returns the current request.
89-
*
90-
* @return Request|null The HTTP request object
9189
*/
9290
public function getRequest(): ?Request
9391
{
@@ -100,8 +98,6 @@ public function getRequest(): ?Request
10098

10199
/**
102100
* Returns the current session.
103-
*
104-
* @return Session|null The session
105101
*/
106102
public function getSession(): ?Session
107103
{
@@ -115,8 +111,6 @@ public function getSession(): ?Session
115111

116112
/**
117113
* Returns the current app environment.
118-
*
119-
* @return string The current environment string (e.g 'dev')
120114
*/
121115
public function getEnvironment(): string
122116
{
@@ -129,8 +123,6 @@ public function getEnvironment(): string
129123

130124
/**
131125
* Returns the current app debug mode.
132-
*
133-
* @return bool The current debug mode
134126
*/
135127
public function getDebug(): bool
136128
{

Extension/WorkflowExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function canTransition(object $subject, string $transitionName, string $n
5959
/**
6060
* Returns all enabled transitions.
6161
*
62-
* @return Transition[] All enabled transitions
62+
* @return Transition[]
6363
*/
6464
public function getEnabledTransitions(object $subject, string $name = null): array
6565
{

Form/TwigRendererEngine.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ public function renderBlock(FormView $view, mixed $resource, string $blockName,
6969
* case that the function "block()" is used in the Twig template.
7070
*
7171
* @see getResourceForBlock()
72-
*
73-
* @return bool True if the resource could be loaded, false otherwise
7472
*/
7573
protected function loadResourceForBlockName(string $cacheKey, FormView $view, string $blockName): bool
7674
{

NodeVisitor/Scope.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ public function __construct(self $parent = null)
2727

2828
/**
2929
* Opens a new child scope.
30-
*
31-
* @return self
3230
*/
3331
public function enter(): self
3432
{
@@ -37,8 +35,6 @@ public function enter(): self
3735

3836
/**
3937
* Closes current scope and returns parent one.
40-
*
41-
* @return self|null
4238
*/
4339
public function leave(): ?self
4440
{

0 commit comments

Comments
 (0)