Skip to content

Commit 7463344

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.0
* 5.4: [Serializer] cs fix Cleanup more `@return` annotations [Form] Fix phpdoc on FormBuilderInterface
2 parents cce4ed3 + c91322d commit 7463344

File tree

365 files changed

+204
-1817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+204
-1817
lines changed

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,6 @@ protected function assertValidMappingConfiguration(array $mappingConfig, string
258258

259259
/**
260260
* Detects what metadata driver to use for the supplied directory.
261-
*
262-
* @return string|null A metadata driver short name, if one can be detected
263261
*/
264262
protected function detectMetadataDriver(string $dir, ContainerBuilder $container): ?string
265263
{
@@ -376,8 +374,6 @@ protected function loadCacheDriver(string $cacheName, string $objectManagerName,
376374
* Returns a modified version of $managerConfigs.
377375
*
378376
* The manager called $autoMappedManager will map all bundles that are not mapped by other managers.
379-
*
380-
* @return array The modified version of $managerConfigs
381377
*/
382378
protected function fixManagersAutoMappings(array $managerConfigs, array $bundles): array
383379
{

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ public function process(ContainerBuilder $container)
165165
* Get the service name of the metadata chain driver that the mappings
166166
* should be registered with.
167167
*
168-
* @return string The name of the chain driver service
169-
*
170168
* @throws InvalidArgumentException if non of the managerParameters has a
171169
* non-empty value
172170
*/
@@ -180,8 +178,6 @@ protected function getChainDriverServiceName(ContainerBuilder $container): strin
180178
*
181179
* @param ContainerBuilder $container Passed on in case an extending class
182180
* needs access to the container
183-
*
184-
* @return Definition|Reference the metadata driver to add to all chain drivers
185181
*/
186182
protected function getDriver(ContainerBuilder $container): Definition|Reference
187183
{
@@ -227,8 +223,6 @@ private function getManagerName(ContainerBuilder $container): string
227223
*
228224
* This default implementation checks if the class has the enabledParameter
229225
* configured and if so if that parameter is present in the container.
230-
*
231-
* @return bool whether this compiler pass really should register the mappings
232226
*/
233227
protected function enabled(ContainerBuilder $container): bool
234228
{

‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityLoaderInterface.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,11 @@ interface EntityLoaderInterface
2020
{
2121
/**
2222
* Returns an array of entities that are valid choices in the corresponding choice list.
23-
*
24-
* @return array The entities
2523
*/
2624
public function getEntities(): array;
2725

2826
/**
2927
* Returns an array of entities matching the given identifiers.
30-
*
31-
* @return array The entities
3228
*/
3329
public function getEntitiesByIds(string $identifier, array $values): array;
3430
}

‎src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class CollectionToArrayTransformer implements DataTransformerInterface
2424
/**
2525
* Transforms a collection into an array.
2626
*
27-
* @return mixed An array of entities
28-
*
2927
* @throws TransformationFailedException
3028
*/
3129
public function transform(mixed $collection): mixed
@@ -51,8 +49,6 @@ public function transform(mixed $collection): mixed
5149
* Transforms choice keys into entities.
5250
*
5351
* @param mixed $array An array of entities
54-
*
55-
* @return Collection A collection of entities
5652
*/
5753
public function reverseTransform(mixed $array): Collection
5854
{

‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ public static function createChoiceName(object $choice, int|string $key, string
8484
* @param object $queryBuilder A query builder, type declaration is not present here as there
8585
* is no common base class for the different implementations
8686
*
87-
* @return array|null Array with important QueryBuilder parts or null if
88-
* they can't be determined
89-
*
9087
* @internal This method is public to be usable as callback. It should not
9188
* be used in user code.
9289
*/

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ private function getPackage($path)
310310
}
311311

312312
/**
313-
* @return string[] an array of paths
313+
* @return string[]
314314
*/
315315
private static function getVendors()
316316
{

‎src/Symfony/Bridge/Twig/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
{

‎src/Symfony/Bridge/Twig/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
{

‎src/Symfony/Bridge/Twig/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
{

‎src/Symfony/Bridge/Twig/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)