Merge branch '2.7' into 2.8

* 2.7:
  [DI] minor docblock fixes

Author: nicolas-grekas

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

@@ -26,9 +26,6 @@ class ProxyCacheWarmer implements CacheWarmerInterface
 {
     private $registry;
 
-    /**
-     * @param ManagerRegistry $registry A ManagerRegistry instance
-     */
     public function __construct(ManagerRegistry $registry)
     {
         $this->registry = $registry;

src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

@@ -26,8 +26,6 @@ class ContainerAwareEventManager extends EventManager
      * Map of registered listeners.
      *
      * <event> => <listeners>
-     *
-     * @var array
      */
     private $listeners = array();
     private $initialized = array();

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

@@ -25,14 +25,8 @@
  */
 class ContainerAwareLoader extends Loader
 {
-    /**
-     * @var ContainerInterface
-     */
     private $container;
 
-    /**
-     * @param ContainerInterface $container A ContainerInterface instance
-     */
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;

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

@@ -27,15 +27,11 @@ abstract class AbstractDoctrineExtension extends Extension
 {
     /**
      * Used inside metadata driver method to simplify aggregation of data.
-     *
-     * @var array
      */
     protected $aliasMap = array();
 
     /**
      * Used inside metadata driver method to simplify aggregation of data.
-     *
-     * @var array
      */
     protected $drivers = array();
 
@@ -142,10 +138,6 @@ protected function setMappingDriverConfig(array $mappingConfig, $mappingName)
      *
      * Returns false when autodetection failed, an array of the completed information otherwise.
      *
-     * @param array            $bundleConfig
-     * @param \ReflectionClass $bundle
-     * @param ContainerBuilder $container    A ContainerBuilder instance
-     *
      * @return array|false
      */
     protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container)
@@ -402,9 +394,6 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
      *
      * The manager called $autoMappedManager will map all bundles that are not mapped by other managers.
      *
-     * @param array $managerConfigs
-     * @param array $bundles
-     *
      * @return array The modified version of $managerConfigs
      */
     protected function fixManagersAutoMappings(array $managerConfigs, array $bundles)
@@ -464,8 +453,6 @@ abstract protected function getMappingResourceExtension();
     /**
      * Search for a manager that is declared as 'auto_mapping' = true.
      *
-     * @param array $managerConfigs
-     *
      * @return null|string The name of the manager. If no one manager is found, returns null
      *
      * @throws \LogicException

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

@@ -134,8 +134,6 @@ public function __construct($driver, array $namespaces, array $managerParameters
 
     /**
      * Register mappings and alias with the metadata drivers.
-     *
-     * @param ContainerBuilder $container
      */
     public function process(ContainerBuilder $container)
     {
@@ -167,8 +165,6 @@ public function process(ContainerBuilder $container)
      * Get the service name of the metadata chain driver that the mappings
      * should be registered with.
      *
-     * @param ContainerBuilder $container
-     *
      * @return string The name of the chain driver service
      *
      * @throws ParameterNotFoundException if non of the managerParameters has a
@@ -195,8 +191,6 @@ protected function getDriver(ContainerBuilder $container)
     /**
      * Get the service name from the pattern and the configured manager name.
      *
-     * @param ContainerBuilder $container
-     *
      * @return string a service definition name
      *
      * @throws ParameterNotFoundException if none of the managerParameters has a
@@ -213,8 +207,6 @@ private function getConfigurationServiceName(ContainerBuilder $container)
      * The default implementation loops over the managerParameters and returns
      * the first non-empty parameter.
      *
-     * @param ContainerBuilder $container
-     *
      * @return string The name of the active manager
      *
      * @throws ParameterNotFoundException if none of the managerParameters is found in the container
@@ -240,8 +232,6 @@ private function getManagerName(ContainerBuilder $container)
      * This default implementation checks if the class has the enabledParameter
      * configured and if so if that parameter is present in the container.
      *
-     * @param ContainerBuilder $container
-     *
      * @return bool whether this compiler pass really should register the mappings
      */
     protected function enabled(ContainerBuilder $container)

src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php

@@ -214,8 +214,6 @@ public function getRemainingViews()
     /**
      * Returns the entities corresponding to the given values.
      *
-     * @param array $values
-     *
      * @return array
      *
      * @see ChoiceListInterface
@@ -267,8 +265,6 @@ public function getChoicesForValues(array $values)
     /**
      * Returns the values corresponding to the given entities.
      *
-     * @param array $entities
-     *
      * @return array
      *
      * @see ChoiceListInterface

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

@@ -24,8 +24,6 @@ class CollectionToArrayTransformer implements DataTransformerInterface
     /**
      * Transforms a collection into an array.
      *
-     * @param Collection $collection A collection of entities
-     *
      * @return mixed An array of entities
      *
      * @throws TransformationFailedException

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

@@ -95,8 +95,6 @@ public function getQueryBuilderPartsForCachingHash($queryBuilder)
     /**
      * Converts a query parameter to an array.
      *
-     * @param Parameter $parameter The query parameter
-     *
      * @return array The array representation of the parameter
      */
     private function parameterToArray(Parameter $parameter)

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

@@ -26,10 +26,6 @@ class DbalLogger implements SQLLogger
     protected $logger;
     protected $stopwatch;
 
-    /**
-     * @param LoggerInterface $logger    A LoggerInterface instance
-     * @param Stopwatch       $stopwatch A Stopwatch instance
-     */
     public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch = null)
     {
         $this->logger = $logger;

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

@@ -45,11 +45,6 @@ class DoctrineTokenProvider implements TokenProviderInterface
      */
     private $conn;
 
-    /**
-     * new DoctrineTokenProvider for the RememberMe authentication service.
-     *
-     * @param Connection $conn
-     */
     public function __construct(Connection $conn)
     {
         $this->conn = $conn;