Skip to content

Commit 7fb9f61

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.3
* 2.8: [DI] minor docblock fixes
2 parents c73ee30 + 2b95ba3 commit 7fb9f61

File tree

390 files changed

+43
-2450
lines changed

Some content is hidden

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

390 files changed

+43
-2450
lines changed

‎src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php

-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ class ProxyCacheWarmer implements CacheWarmerInterface
2626
{
2727
private $registry;
2828

29-
/**
30-
* @param ManagerRegistry $registry A ManagerRegistry instance
31-
*/
3229
public function __construct(ManagerRegistry $registry)
3330
{
3431
$this->registry = $registry;

‎src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ class ContainerAwareEventManager extends EventManager
2626
* Map of registered listeners.
2727
*
2828
* <event> => <listeners>
29-
*
30-
* @var array
3129
*/
3230
private $listeners = array();
3331
private $initialized = array();

‎src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php

-6
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,8 @@
2525
*/
2626
class ContainerAwareLoader extends Loader
2727
{
28-
/**
29-
* @var ContainerInterface
30-
*/
3128
private $container;
3229

33-
/**
34-
* @param ContainerInterface $container A ContainerInterface instance
35-
*/
3630
public function __construct(ContainerInterface $container)
3731
{
3832
$this->container = $container;

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

-13
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,11 @@ abstract class AbstractDoctrineExtension extends Extension
2626
{
2727
/**
2828
* Used inside metadata driver method to simplify aggregation of data.
29-
*
30-
* @var array
3129
*/
3230
protected $aliasMap = array();
3331

3432
/**
3533
* Used inside metadata driver method to simplify aggregation of data.
36-
*
37-
* @var array
3834
*/
3935
protected $drivers = array();
4036

@@ -141,10 +137,6 @@ protected function setMappingDriverConfig(array $mappingConfig, $mappingName)
141137
*
142138
* Returns false when autodetection failed, an array of the completed information otherwise.
143139
*
144-
* @param array $bundleConfig
145-
* @param \ReflectionClass $bundle
146-
* @param ContainerBuilder $container A ContainerBuilder instance
147-
*
148140
* @return array|false
149141
*/
150142
protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container)
@@ -405,9 +397,6 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
405397
*
406398
* The manager called $autoMappedManager will map all bundles that are not mapped by other managers.
407399
*
408-
* @param array $managerConfigs
409-
* @param array $bundles
410-
*
411400
* @return array The modified version of $managerConfigs
412401
*/
413402
protected function fixManagersAutoMappings(array $managerConfigs, array $bundles)
@@ -467,8 +456,6 @@ abstract protected function getMappingResourceExtension();
467456
/**
468457
* Search for a manager that is declared as 'auto_mapping' = true.
469458
*
470-
* @param array $managerConfigs
471-
*
472459
* @return null|string The name of the manager. If no one manager is found, returns null
473460
*
474461
* @throws \LogicException

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

-10
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ public function __construct($driver, array $namespaces, array $managerParameters
134134

135135
/**
136136
* Register mappings and alias with the metadata drivers.
137-
*
138-
* @param ContainerBuilder $container
139137
*/
140138
public function process(ContainerBuilder $container)
141139
{
@@ -167,8 +165,6 @@ public function process(ContainerBuilder $container)
167165
* Get the service name of the metadata chain driver that the mappings
168166
* should be registered with.
169167
*
170-
* @param ContainerBuilder $container
171-
*
172168
* @return string The name of the chain driver service
173169
*
174170
* @throws InvalidArgumentException if non of the managerParameters has a
@@ -195,8 +191,6 @@ protected function getDriver(ContainerBuilder $container)
195191
/**
196192
* Get the service name from the pattern and the configured manager name.
197193
*
198-
* @param ContainerBuilder $container
199-
*
200194
* @return string a service definition name
201195
*
202196
* @throws InvalidArgumentException if none of the managerParameters has a
@@ -213,8 +207,6 @@ private function getConfigurationServiceName(ContainerBuilder $container)
213207
* The default implementation loops over the managerParameters and returns
214208
* the first non-empty parameter.
215209
*
216-
* @param ContainerBuilder $container
217-
*
218210
* @return string The name of the active manager
219211
*
220212
* @throws InvalidArgumentException if none of the managerParameters is found in the container
@@ -243,8 +235,6 @@ private function getManagerName(ContainerBuilder $container)
243235
* This default implementation checks if the class has the enabledParameter
244236
* configured and if so if that parameter is present in the container.
245237
*
246-
* @param ContainerBuilder $container
247-
*
248238
* @return bool whether this compiler pass really should register the mappings
249239
*/
250240
protected function enabled(ContainerBuilder $container)

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

-2
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-
* @param Collection $collection A collection of entities
28-
*
2927
* @return mixed An array of entities
3028
*
3129
* @throws TransformationFailedException

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

-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ public function getQueryBuilderPartsForCachingHash($queryBuilder)
8787
/**
8888
* Converts a query parameter to an array.
8989
*
90-
* @param Parameter $parameter The query parameter
91-
*
9290
* @return array The array representation of the parameter
9391
*/
9492
private function parameterToArray(Parameter $parameter)

‎src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php

-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ class DbalLogger implements SQLLogger
2626
protected $logger;
2727
protected $stopwatch;
2828

29-
/**
30-
* @param LoggerInterface $logger A LoggerInterface instance
31-
* @param Stopwatch $stopwatch A Stopwatch instance
32-
*/
3329
public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch = null)
3430
{
3531
$this->logger = $logger;

‎src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php

-5
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ class DoctrineTokenProvider implements TokenProviderInterface
4545
*/
4646
private $conn;
4747

48-
/**
49-
* new DoctrineTokenProvider for the RememberMe authentication service.
50-
*
51-
* @param Connection $conn
52-
*/
5348
public function __construct(Connection $conn)
5449
{
5550
$this->conn = $conn;

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

-2
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,6 @@ protected function invokeLoadCacheDriver(array $objectManager, ContainerBuilder
268268
}
269269

270270
/**
271-
* @param array $data
272-
*
273271
* @return \Symfony\Component\DependencyInjection\ContainerBuilder
274272
*/
275273
protected function createContainer(array $data = array())

‎src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
*/
2323
class ChromePhpHandler extends BaseChromePhpHandler
2424
{
25-
/**
26-
* @var array
27-
*/
2825
private $headers = array();
2926

3027
/**

‎src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php

-13
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,7 @@
4242
*/
4343
class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface
4444
{
45-
/**
46-
* @var OutputInterface|null
47-
*/
4845
private $output;
49-
50-
/**
51-
* @var array
52-
*/
5346
private $verbosityLevelMap = array(
5447
OutputInterface::VERBOSITY_QUIET => Logger::ERROR,
5548
OutputInterface::VERBOSITY_NORMAL => Logger::WARNING,
@@ -95,8 +88,6 @@ public function handle(array $record)
9588

9689
/**
9790
* Sets the console output to use for printing logs.
98-
*
99-
* @param OutputInterface $output The console output to use
10091
*/
10192
public function setOutput(OutputInterface $output)
10293
{
@@ -116,8 +107,6 @@ public function close()
116107
/**
117108
* Before a command is executed, the handler gets activated and the console output
118109
* is set in order to know where to write the logs.
119-
*
120-
* @param ConsoleCommandEvent $event
121110
*/
122111
public function onCommand(ConsoleCommandEvent $event)
123112
{
@@ -131,8 +120,6 @@ public function onCommand(ConsoleCommandEvent $event)
131120

132121
/**
133122
* After a command has been executed, it disables the output.
134-
*
135-
* @param ConsoleTerminateEvent $event
136123
*/
137124
public function onTerminate(ConsoleTerminateEvent $event)
138125
{

‎src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
*/
2323
class FirePHPHandler extends BaseFirePHPHandler
2424
{
25-
/**
26-
* @var array
27-
*/
2825
private $headers = array();
2926

3027
/**

‎src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php

-7
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,13 @@ class SwiftMailerHandler extends BaseSwiftMailerHandler
2626

2727
protected $instantFlush = false;
2828

29-
/**
30-
* @param \Swift_Transport $transport
31-
*/
3229
public function setTransport(\Swift_Transport $transport)
3330
{
3431
$this->transport = $transport;
3532
}
3633

3734
/**
3835
* After the kernel has been terminated we will always flush messages.
39-
*
40-
* @param PostResponseEvent $event
4136
*/
4237
public function onKernelTerminate(PostResponseEvent $event)
4338
{
@@ -46,8 +41,6 @@ public function onKernelTerminate(PostResponseEvent $event)
4641

4742
/**
4843
* After the CLI application has been terminated we will always flush messages.
49-
*
50-
* @param ConsoleTerminateEvent $event
5144
*/
5245
public function onCliTerminate(ConsoleTerminateEvent $event)
5346
{

‎src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ public function getProxyCode(Definition $definition)
113113
/**
114114
* Produces the proxy class name for the given definition.
115115
*
116-
* @param Definition $definition
117-
*
118116
* @return string
119117
*/
120118
private function getProxyClassName(Definition $definition)

‎src/Symfony/Bridge/Twig/NodeVisitor/Scope.php

-14
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,10 @@
1616
*/
1717
class Scope
1818
{
19-
/**
20-
* @var Scope|null
21-
*/
2219
private $parent;
23-
24-
/**
25-
* @var array
26-
*/
2720
private $data = array();
28-
29-
/**
30-
* @var bool
31-
*/
3221
private $left = false;
3322

34-
/**
35-
* @param Scope $parent
36-
*/
3723
public function __construct(Scope $parent = null)
3824
{
3925
$this->parent = $parent;

‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php

-2
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ private function getReadDomainFromArguments(Node $arguments, $index)
123123
}
124124

125125
/**
126-
* @param Node $node
127-
*
128126
* @return string|null
129127
*/
130128
private function getReadDomainFromNode(Node $node)

‎src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ class FormThemeTokenParser extends AbstractTokenParser
2727
/**
2828
* Parses a token and returns a node.
2929
*
30-
* @param Token $token
31-
*
3230
* @return Node
3331
*/
3432
public function parse(Token $token)

‎src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ class TransChoiceTokenParser extends TransTokenParser
2929
/**
3030
* Parses a token and returns a node.
3131
*
32-
* @param Token $token
33-
*
3432
* @return Node
3533
*
3634
* @throws SyntaxError

‎src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ class TransDefaultDomainTokenParser extends AbstractTokenParser
2626
/**
2727
* Parses a token and returns a node.
2828
*
29-
* @param Token $token
30-
*
3129
* @return Node
3230
*/
3331
public function parse(Token $token)

‎src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class TransTokenParser extends AbstractTokenParser
3030
/**
3131
* Parses a token and returns a node.
3232
*
33-
* @param Token $token
34-
*
3533
* @return Node
3634
*
3735
* @throws SyntaxError

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

-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ class RouterCacheWarmer implements CacheWarmerInterface
2424
{
2525
protected $router;
2626

27-
/**
28-
* @param RouterInterface $router A Router instance
29-
*/
3027
public function __construct(RouterInterface $router)
3128
{
3229
$this->router = $router;

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

-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ class TemplatePathsCacheWarmer extends CacheWarmer
2525
protected $finder;
2626
protected $locator;
2727

28-
/**
29-
* @param TemplateFinderInterface $finder A template finder
30-
* @param TemplateLocator $locator The template locator
31-
*/
3228
public function __construct(TemplateFinderInterface $finder, TemplateLocator $locator)
3329
{
3430
$this->finder = $finder;

‎src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php

-2
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
149149
/**
150150
* Validates input arguments and options.
151151
*
152-
* @param InputInterface $input
153-
*
154152
* @throws \InvalidArgumentException
155153
*/
156154
protected function validateInput(InputInterface $input)

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

-6
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ class Application extends BaseApplication
2929
private $kernel;
3030
private $commandsRegistered = false;
3131

32-
/**
33-
* @param KernelInterface $kernel A KernelInterface instance
34-
*/
3532
public function __construct(KernelInterface $kernel)
3633
{
3734
$this->kernel = $kernel;
@@ -55,9 +52,6 @@ public function getKernel()
5552
/**
5653
* Runs the current application.
5754
*
58-
* @param InputInterface $input An Input instance
59-
* @param OutputInterface $output An Output instance
60-
*
6155
* @return int 0 if everything went fine, or an error code
6256
*/
6357
public function doRun(InputInterface $input, OutputInterface $output)

0 commit comments

Comments
 (0)