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

Lines changed: 0 additions & 3 deletions
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 6 deletions
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

Lines changed: 0 additions & 13 deletions
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

Lines changed: 0 additions & 10 deletions
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

Lines changed: 0 additions & 2 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-
* @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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 4 deletions
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

Lines changed: 0 additions & 5 deletions
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

Lines changed: 0 additions & 2 deletions
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())

0 commit comments

Comments
 (0)