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 b2d0a5b

Browse filesBrowse files
committed
fixes
1 parent 2aa54b8 commit b2d0a5b
Copy full SHA for b2d0a5b

File tree

232 files changed

+598
-903
lines changed
Filter options

Some content is hidden

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

232 files changed

+598
-903
lines changed

‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public function __construct(ManagerRegistry $registry)
4444
/**
4545
* Adds the stack logger for a connection.
4646
*
47-
* @param string $name
48-
* @param DebugStack $logger
47+
*
48+
* @param string $name
4949
*/
5050
public function addLogger($name, DebugStack $logger)
5151
{

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+14-15Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ abstract class AbstractDoctrineExtension extends Extension
3535
protected $drivers = array();
3636

3737
/**
38-
* @param array $objectManager A configured object manager
39-
* @param ContainerBuilder $container A ContainerBuilder instance
38+
* @param array $objectManager A configured object manager
4039
*
4140
* @throws \InvalidArgumentException
4241
*/
@@ -117,7 +116,7 @@ protected function setMappingDriverAlias($mappingConfig, $mappingName)
117116
/**
118117
* Register the mapping driver configuration for later use with the object managers metadata driver chain.
119118
*
120-
* @param array $mappingConfig
119+
*
121120
* @param string $mappingName
122121
*
123122
* @throws \InvalidArgumentException
@@ -172,8 +171,8 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re
172171
/**
173172
* Register all the collected mapping information with the object manager by registering the appropriate mapping drivers.
174173
*
175-
* @param array $objectManager
176-
* @param ContainerBuilder $container A ContainerBuilder instance
174+
*
175+
* @param array $objectManager
177176
*/
178177
protected function registerMappingDrivers($objectManager, ContainerBuilder $container)
179178
{
@@ -225,7 +224,7 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont
225224
/**
226225
* Assertion if the specified mapping information is valid.
227226
*
228-
* @param array $mappingConfig
227+
*
229228
* @param string $objectManagerName
230229
*
231230
* @throws \InvalidArgumentException
@@ -252,8 +251,8 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
252251
/**
253252
* Detects what metadata driver to use for the supplied directory.
254253
*
255-
* @param string $dir A directory path
256-
* @param ContainerBuilder $container A ContainerBuilder instance
254+
*
255+
* @param string $dir A directory path
257256
*
258257
* @return string|null A metadata driver short name, if one can be detected
259258
*/
@@ -286,9 +285,9 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
286285
/**
287286
* Loads a configured object manager metadata, query or result cache driver.
288287
*
289-
* @param array $objectManager A configured object manager
290-
* @param ContainerBuilder $container A ContainerBuilder instance
291-
* @param string $cacheName
288+
*
289+
* @param array $objectManager A configured object manager
290+
* @param string $cacheName
292291
*
293292
* @throws \InvalidArgumentException in case of unknown driver type
294293
*/
@@ -300,10 +299,10 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
300299
/**
301300
* Loads a cache driver.
302301
*
303-
* @param string $cacheName The cache driver name
304-
* @param string $objectManagerName The object manager name
305-
* @param array $cacheDriver The cache driver mapping
306-
* @param ContainerBuilder $container The ContainerBuilder instance
302+
*
303+
* @param string $cacheName The cache driver name
304+
* @param string $objectManagerName The object manager name
305+
* @param array $cacheDriver The cache driver mapping
307306
*
308307
* @return string
309308
*

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
4040
* passed which optimizes the object loading for one of the Doctrine
4141
* mapper implementations.
4242
*
43-
* @param ObjectManager $manager The object manager
44-
* @param string $class The class name of the loaded objects
45-
* @param IdReader $idReader The reader for the object IDs
43+
*
44+
* @param string $class The class name of the loaded objects
45+
* @param IdReader $idReader The reader for the object IDs
4646
* @param null|EntityLoaderInterface $objectLoader The objects loader
4747
*/
4848
public function __construct(ObjectManager $manager, string $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null)

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ public function configureOptions(OptionsResolver $resolver)
268268
/**
269269
* Return the default loader object.
270270
*
271-
* @param ObjectManager $manager
272-
* @param mixed $queryBuilder
273-
* @param string $class
271+
*
272+
* @param mixed $queryBuilder
273+
* @param string $class
274274
*
275275
* @return EntityLoaderInterface
276276
*/

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public function configureOptions(OptionsResolver $resolver)
4646
/**
4747
* Return the default loader object.
4848
*
49-
* @param ObjectManager $manager
50-
* @param QueryBuilder $queryBuilder
51-
* @param string $class
49+
*
50+
* @param QueryBuilder $queryBuilder
51+
* @param string $class
5252
*
5353
* @return ORMQueryBuilderLoader
5454
*/

‎src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ public function __construct(ManagerRegistry $registry)
3434
}
3535

3636
/**
37-
* @param object $entity
38-
* @param Constraint $constraint
37+
* @param object $entity
3938
*
4039
* @throws UnexpectedTypeException
4140
* @throws ConstraintDefinitionException

‎src/Symfony/Bridge/Twig/Extension/CodeExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Extension/CodeExtension.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ class CodeExtension extends AbstractExtension
2828

2929
/**
3030
* @param string|FileLinkFormatter $fileLinkFormat The format for links to source files
31-
* @param string $rootDir The project root directory
32-
* @param string $charset The charset
31+
* @param string $rootDir The project root directory
3332
*/
3433
public function __construct($fileLinkFormat, string $rootDir, string $charset)
3534
{

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array
8383
}
8484

8585
/**
86-
* @param string $cacheDir
87-
* @param ArrayAdapter $arrayAdapter
86+
* @param string $cacheDir
8887
*
8988
* @return bool false if there is nothing to warm-up
9089
*/

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer
3030
private $excludeRegexp;
3131

3232
/**
33-
* @param Reader $annotationReader
34-
* @param string $phpArrayFile The PHP file where annotations are cached
35-
* @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered annotations are cached
33+
* @param string $phpArrayFile The PHP file where annotations are cached
34+
* @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered annotations are cached
3635
*/
3736
public function __construct(Reader $annotationReader, string $phpArrayFile, CacheItemPoolInterface $fallbackPool, string $excludeRegexp = null)
3837
{

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ class TemplateFinder implements TemplateFinderInterface
3030
private $templates;
3131

3232
/**
33-
* @param KernelInterface $kernel A KernelInterface instance
34-
* @param TemplateNameParserInterface $parser A TemplateNameParserInterface instance
35-
* @param string $rootDir The directory where global templates can be stored
33+
* @param string $rootDir The directory where global templates can be stored
3634
*/
3735
public function __construct(KernelInterface $kernel, TemplateNameParserInterface $parser, string $rootDir)
3836
{

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
3333
private $validatorBuilder;
3434

3535
/**
36-
* @param ValidatorBuilderInterface $validatorBuilder
37-
* @param string $phpArrayFile The PHP file where metadata are cached
38-
* @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached
36+
* @param string $phpArrayFile The PHP file where metadata are cached
37+
* @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached
3938
*/
4039
public function __construct(ValidatorBuilderInterface $validatorBuilder, string $phpArrayFile, CacheItemPoolInterface $fallbackPool)
4140
{

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+5-7Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr
126126
* Common options are:
127127
* * name: name of described service
128128
*
129+
*
129130
* @param Definition|Alias|object $service
130-
* @param array $options
131-
* @param ContainerBuilder|null $builder
131+
* @param ContainerBuilder|null $builder
132132
*/
133133
abstract protected function describeContainerService($service, array $options = array(), ContainerBuilder $builder = null);
134134

@@ -166,8 +166,8 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte
166166
/**
167167
* Describes a callable.
168168
*
169+
*
169170
* @param callable $callable
170-
* @param array $options
171171
*/
172172
abstract protected function describeCallable($callable, array $options = array());
173173

@@ -214,8 +214,7 @@ protected function formatParameter($value)
214214
}
215215

216216
/**
217-
* @param ContainerBuilder $builder
218-
* @param string $serviceId
217+
* @param string $serviceId
219218
*
220219
* @return mixed
221220
*/
@@ -235,8 +234,7 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
235234
}
236235

237236
/**
238-
* @param ContainerBuilder $builder
239-
* @param bool $showPrivate
237+
* @param bool $showPrivate
240238
*
241239
* @return array
242240
*/

‎src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public function __construct(UrlGeneratorInterface $router = null, int $httpPort
4646
* In case the route name is empty, the status code will be 404 when permanent is false
4747
* and 410 otherwise.
4848
*
49-
* @param Request $request The request instance
50-
* @param string $route The route name to redirect to
51-
* @param bool $permanent Whether the redirection is permanent
49+
*
50+
* @param string $route The route name to redirect to
51+
* @param bool $permanent Whether the redirection is permanent
5252
* @param bool|array $ignoreAttributes Whether to ignore attributes or an array of attributes to ignore
5353
*
5454
* @throws HttpException In case the route name is empty
@@ -80,12 +80,12 @@ public function redirectAction(Request $request, string $route, bool $permanent
8080
* In case the path is empty, the status code will be 404 when permanent is false
8181
* and 410 otherwise.
8282
*
83-
* @param Request $request The request instance
84-
* @param string $path The absolute path or URL to redirect to
85-
* @param bool $permanent Whether the redirect is permanent or not
86-
* @param string|null $scheme The URL scheme (null to keep the current one)
87-
* @param int|null $httpPort The HTTP port (null to keep the current one for the same scheme or the default configured port)
88-
* @param int|null $httpsPort The HTTPS port (null to keep the current one for the same scheme or the default configured port)
83+
*
84+
* @param string $path The absolute path or URL to redirect to
85+
* @param bool $permanent Whether the redirect is permanent or not
86+
* @param string|null $scheme The URL scheme (null to keep the current one)
87+
* @param int|null $httpPort The HTTP port (null to keep the current one for the same scheme or the default configured port)
88+
* @param int|null $httpsPort The HTTPS port (null to keep the current one for the same scheme or the default configured port)
8989
*
9090
* @throws HttpException In case the path is empty
9191
*/

‎src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
+4-5Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ abstract class HttpCache extends BaseHttpCache
2929
protected $kernel;
3030

3131
/**
32-
* @param HttpKernelInterface $kernel An HttpKernelInterface instance
33-
* @param string $cacheDir The cache directory (default used if null)
32+
* @param string $cacheDir The cache directory (default used if null)
3433
*/
3534
public function __construct(HttpKernelInterface $kernel, string $cacheDir = null)
3635
{
@@ -43,9 +42,9 @@ public function __construct(HttpKernelInterface $kernel, string $cacheDir = null
4342
/**
4443
* Forwards the Request to the backend and returns the Response.
4544
*
46-
* @param Request $request A Request instance
47-
* @param bool $raw Whether to catch exceptions or not
48-
* @param Response $entry A Response instance (the stale entry if present, null otherwise)
45+
*
46+
* @param bool $raw Whether to catch exceptions or not
47+
* @param Response $entry A Response instance (the stale entry if present, null otherwise)
4948
*
5049
* @return Response A Response instance
5150
*/

‎src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ class DelegatingLoader extends BaseDelegatingLoader
2929
protected $parser;
3030
private $loading = false;
3131

32-
/**
33-
* @param ControllerNameParser $parser A ControllerNameParser instance
34-
* @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
35-
*/
3632
public function __construct(ControllerNameParser $parser, LoaderResolverInterface $resolver)
3733
{
3834
$this->parser = $parser;

‎src/Symfony/Bundle/FrameworkBundle/Routing/Router.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
+3-5Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
3636
private $paramFetcher;
3737

3838
/**
39-
* @param ContainerInterface $container A ContainerInterface instance
40-
* @param mixed $resource The main resource to load
41-
* @param array $options An array of options
42-
* @param RequestContext $context The context
39+
* @param mixed $resource The main resource to load
40+
* @param array $options An array of options
4341
* @param ContainerInterface|null $parameters A ContainerInterface instance allowing to fetch parameters
44-
* @param LoggerInterface|null $logger
42+
* @param LoggerInterface|null $logger
4543
*/
4644
public function __construct(ContainerInterface $container, $resource, array $options = array(), RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null)
4745
{

‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ class CodeHelper extends Helper
2525

2626
/**
2727
* @param string|FileLinkFormatter $fileLinkFormat The format for links to source files
28-
* @param string $rootDir The project root directory
29-
* @param string $charset The charset
28+
* @param string $rootDir The project root directory
3029
*/
3130
public function __construct($fileLinkFormat, string $rootDir, string $charset)
3231
{

‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public function getName()
4343
*
4444
* The theme format is "<Bundle>:<Controller>".
4545
*
46-
* @param FormView $view A FormView instance
47-
* @param string|array $themes A theme or an array of theme
48-
* @param bool $useDefaultThemes If true, will use default themes defined in the renderer
46+
*
47+
* @param string|array $themes A theme or an array of theme
48+
* @param bool $useDefaultThemes If true, will use default themes defined in the renderer
4949
*/
5050
public function setTheme(FormView $view, $themes, $useDefaultThemes = true)
5151
{

‎src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ class TemplateLocator implements FileLocatorInterface
2727
private $cacheHits = array();
2828

2929
/**
30-
* @param FileLocatorInterface $locator A FileLocatorInterface instance
31-
* @param string $cacheDir The cache path
30+
* @param string $cacheDir The cache path
3231
*/
3332
public function __construct(FileLocatorInterface $locator, string $cacheDir = null)
3433
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ public function testGetUserWithEmptyContainer()
9898
}
9999

100100
/**
101-
* @param $token
102101
*
103102
* @return Container
104103
*/

‎src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+6-8Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,13 @@ class Translator extends BaseTranslator implements WarmableInterface
5151
*
5252
* Available options:
5353
*
54-
* * cache_dir: The cache directory (or null to disable caching)
55-
* * debug: Whether to enable debugging or not (false by default)
56-
* * resource_files: List of translation resources available grouped by locale.
54+
* * cache_dir: The cache directory (or null to disable caching)
55+
* * debug: Whether to enable debugging or not (false by default)
56+
* * resource_files: List of translation resources available grouped by locale.
5757
*
58-
* @param ContainerInterface $container A ContainerInterface instance
59-
* @param MessageFormatterInterface $formatter The message formatter
60-
* @param string $defaultLocale
61-
* @param array $loaderIds An array of loader Ids
62-
* @param array $options An array of options
58+
*
59+
* @param array $loaderIds An array of loader Ids
60+
* @param array $options An array of options
6361
*
6462
* @throws InvalidArgumentException
6563
*/

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ final public function addOption($name, $default = null)
9898
* Subclasses must return the id of a service which implements the
9999
* AuthenticationProviderInterface.
100100
*
101-
* @param ContainerBuilder $container
102-
* @param string $id The unique id of the firewall
103-
* @param array $config The options array for this listener
104-
* @param string $userProviderId The id of the user provider
101+
*
102+
* @param string $id The unique id of the firewall
103+
* @param array $config The options array for this listener
104+
* @param string $userProviderId The id of the user provider
105105
*
106106
* @return string never null, the id of the authentication provider
107107
*/

0 commit comments

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