Merge branch '2.8' into 3.0

* 2.8:
  fixed CS
  fixed form tests
  [Console] Fix formatting of SymfonyStyle::comment()
  [Form] fix post max size translation type extension for >= 2.8
  removed dots at the end of @param and @return
  fixed typo

Author: fabpot

src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

@@ -69,9 +69,9 @@ public function dispatchEvent($eventName, EventArgs $eventArgs = null)
     /**
      * Gets the listeners of a specific event or all listeners.
      *
-     * @param string $event The name of the event.
+     * @param string $event The name of the event
      *
-     * @return array The event listeners for the specified event, or all event listeners.
+     * @return array The event listeners for the specified event, or all event listeners
      */
     public function getListeners($event = null)
     {
@@ -83,7 +83,7 @@ public function getListeners($event = null)
      *
      * @param string $event
      *
-     * @return bool TRUE if the specified event has any listeners, FALSE otherwise.
+     * @return bool TRUE if the specified event has any listeners, FALSE otherwise
      */
     public function hasListeners($event)
     {
@@ -93,8 +93,8 @@ public function hasListeners($event)
     /**
      * Adds an event listener that listens on the specified events.
      *
-     * @param string|array  $events   The event(s) to listen on.
-     * @param object|string $listener The listener object.
+     * @param string|array  $events   The event(s) to listen on
+     * @param object|string $listener The listener object
      *
      * @throws \RuntimeException
      */

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

@@ -40,7 +40,7 @@ abstract class AbstractDoctrineExtension extends Extension
     protected $drivers = array();
 
     /**
-     * @param array            $objectManager A configured object manager.
+     * @param array            $objectManager A configured object manager
      * @param ContainerBuilder $container     A ContainerBuilder instance
      *
      * @throws \InvalidArgumentException
@@ -300,8 +300,8 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
     /**
      * Loads a configured object manager metadata, query or result cache driver.
      *
-     * @param array            $objectManager A configured object manager.
-     * @param ContainerBuilder $container     A ContainerBuilder instance.
+     * @param array            $objectManager A configured object manager
+     * @param ContainerBuilder $container     A ContainerBuilder instance
      * @param string           $cacheName
      *
      * @throws \InvalidArgumentException In case of unknown driver type.
@@ -314,10 +314,10 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
     /**
      * Loads a cache driver.
      *
-     * @param string                                                  $cacheDriverServiceId The cache driver name.
-     * @param string                                                  $objectManagerName    The object manager name.
-     * @param array                                                   $cacheDriver          The cache driver mapping.
-     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container            The ContainerBuilder instance.
+     * @param string                                                  $cacheDriverServiceId The cache driver name
+     * @param string                                                  $objectManagerName    The object manager name
+     * @param array                                                   $cacheDriver          The cache driver mapping
+     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container            The ContainerBuilder instance
      *
      * @return string
      *
@@ -403,12 +403,12 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
     /**
      * Returns a modified version of $managerConfigs.
      *
-     * The manager called $autoMappedManager will map all bundles that are not mepped by other managers.
+     * 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.
+     * @return array The modified version of $managerConfigs
      */
     protected function fixManagersAutoMappings(array $managerConfigs, array $bundles)
     {

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

@@ -106,18 +106,18 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      * The $aliasMap parameter can be used to define bundle namespace shortcuts like the
      * DoctrineBundle provides automatically for objects in the default Entity/Document folder.
      *
-     * @param Definition|Reference $driver                  Driver DI definition or reference.
-     * @param string[]             $namespaces              List of namespaces handled by $driver.
+     * @param Definition|Reference $driver                  Driver DI definition or reference
+     * @param string[]             $namespaces              List of namespaces handled by $driver
      * @param string[]             $managerParameters       List of container parameters that could
      *                                                      hold the manager name.
-     * @param string               $driverPattern           Pattern for the metadata driver service name.
+     * @param string               $driverPattern           Pattern for the metadata driver service name
      * @param string               $enabledParameter        Service container parameter that must be
      *                                                      present to enable the mapping. Set to false
      *                                                      to not do any check, optional.
-     * @param string               $configurationPattern    Pattern for the Configuration service name.
+     * @param string               $configurationPattern    Pattern for the Configuration service name
      * @param string               $registerAliasMethodName Name of Configuration class method to
      *                                                      register alias.
-     * @param string[]             $aliasMap                Map of alias to namespace.
+     * @param string[]             $aliasMap                Map of alias to namespace
      *
      * @since Support for bundle alias was added in Symfony 2.6
      */
@@ -219,7 +219,7 @@ private function getConfigurationServiceName(ContainerBuilder $container)
      *
      * @param ContainerBuilder $container
      *
-     * @return string The name of the active manager.
+     * @return string The name of the active manager
      *
      * @throws ParameterNotFoundException If none of the managerParameters is found in the container.
      */

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

@@ -21,7 +21,7 @@ interface EntityLoaderInterface
     /**
      * Returns an array of entities that are valid choices in the corresponding choice list.
      *
-     * @return array The entities.
+     * @return array The entities
      */
     public function getEntities();
 
@@ -31,9 +31,9 @@ public function getEntities();
      * @param string $identifier The identifier field of the object. This method
      *                           is not applicable for fields with multiple
      *                           identifiers.
-     * @param array  $values     The values of the identifiers.
+     * @param array  $values     The values of the identifiers
      *
-     * @return array The entities.
+     * @return array The entities
      */
     public function getEntitiesByIds($identifier, array $values);
 }

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

@@ -105,9 +105,9 @@ public function isIntId()
      *
      * This method assumes that the object has a single-column ID.
      *
-     * @param object $object The object.
+     * @param object $object The object
      *
-     * @return mixed The ID value.
+     * @return mixed The ID value
      */
     public function getIdValue($object)
     {
@@ -138,7 +138,7 @@ public function getIdValue($object)
      *
      * This method assumes that the object has a single-column ID.
      *
-     * @return string The name of the ID field.
+     * @return string The name of the ID field
      */
     public function getIdField()
     {

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

@@ -56,9 +56,9 @@ abstract class DoctrineType extends AbstractType
      *
      * For backwards compatibility, objects are cast to strings by default.
      *
-     * @param object $choice The object.
+     * @param object $choice The object
      *
-     * @return string The string representation of the object.
+     * @return string The string representation of the object
      *
      * @internal This method is public to be usable as callback. It should not
      *           be used in user code.
@@ -75,12 +75,12 @@ public static function createChoiceLabel($choice)
      * a single-column integer ID. In that case, the value of the field is
      * the ID of the object. That ID is also used as field name.
      *
-     * @param object     $choice The object.
-     * @param int|string $key    The choice key.
+     * @param object     $choice The object
+     * @param int|string $key    The choice key
      * @param string     $value  The choice value. Corresponds to the object's
      *                           ID here.
      *
-     * @return string The field name.
+     * @return string The field name
      *
      * @internal This method is public to be usable as callback. It should not
      *           be used in user code.

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

@@ -168,7 +168,7 @@ protected function getDefaultFormatter()
     /**
      * Updates the logging level based on the verbosity setting of the console output.
      *
-     * @return bool Whether the handler is enabled and verbosity is not set to quiet.
+     * @return bool Whether the handler is enabled and verbosity is not set to quiet
      */
     private function updateLevel()
     {

src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

@@ -32,7 +32,7 @@ class DeprecationErrorHandler
      * - use a number to define the upper bound of allowed deprecations,
      *   making the test suite fail whenever more notices are trigerred.
      *
-     * @param int|string|false $mode The reporting mode. Defaults to not allowing any deprecations.
+     * @param int|string|false $mode The reporting mode, defaults to not allowing any deprecations
      */
     public static function register($mode = 0)
     {

src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php

@@ -27,7 +27,7 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
     private $isSkipped = array();
 
     /**
-     * @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive).
+     * @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive)
      */
     public function __construct(array $mockedNamespaces = array())
     {

src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php

@@ -33,7 +33,7 @@ public function __construct()
      *
      * @param bool $lazyLoad whether to try lazy-loading the service with a proxy
      *
-     * @return stdClass A stdClass instance.
+     * @return stdClass A stdClass instance
      */
     public function getFooService($lazyLoad = true)
     {