Merge branch '2.8' into 3.0

fabpot · fabpot · commit ecc19f62de55 · 2016-06-29T07:40:00.000+02:00
* 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
diff --git a/ContainerAwareEventManager.php b/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
      */
diff --git a/DependencyInjection/AbstractDoctrineExtension.php b/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)
     {
diff --git a/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/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.
      */
diff --git a/Form/ChoiceList/EntityLoaderInterface.php b/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);
 }
diff --git a/Form/ChoiceList/IdReader.php b/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()
     {
diff --git a/Form/Type/DoctrineType.php b/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.

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,9 @@ public function dispatchEvent($eventName, EventArgs $eventArgs = null)`
`69`	`69`	`/**`
`70`	`70`	`* Gets the listeners of a specific event or all listeners.`
`71`	`71`	`*`
`72`		`- * @param string $event The name of the event.`
	`72`	`+ * @param string $event The name of the event`
`73`	`73`	`*`
`74`		`- * @return array The event listeners for the specified event, or all event listeners.`
	`74`	`+ * @return array The event listeners for the specified event, or all event listeners`
`75`	`75`	`*/`
`76`	`76`	`public function getListeners($event = null)`
`77`	`77`	`{`
`@@ -83,7 +83,7 @@ public function getListeners($event = null)`
`83`	`83`	`*`
`84`	`84`	`* @param string $event`
`85`	`85`	`*`
`86`		`- * @return bool TRUE if the specified event has any listeners, FALSE otherwise.`
	`86`	`+ * @return bool TRUE if the specified event has any listeners, FALSE otherwise`
`87`	`87`	`*/`
`88`	`88`	`public function hasListeners($event)`
`89`	`89`	`{`
`@@ -93,8 +93,8 @@ public function hasListeners($event)`
`93`	`93`	`/**`
`94`	`94`	`* Adds an event listener that listens on the specified events.`
`95`	`95`	`*`
`96`		`- * @param string\|array $events The event(s) to listen on.`
`97`		`- * @param object\|string $listener The listener object.`
	`96`	`+ * @param string\|array $events The event(s) to listen on`
	`97`	`+ * @param object\|string $listener The listener object`
`98`	`98`	`*`
`99`	`99`	`* @throws \RuntimeException`
`100`	`100`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ abstract class AbstractDoctrineExtension extends Extension`
`40`	`40`	`protected $drivers = array();`
`41`	`41`
`42`	`42`	`/**`
`43`		`- * @param array $objectManager A configured object manager.`
	`43`	`+ * @param array $objectManager A configured object manager`
`44`	`44`	`* @param ContainerBuilder $container A ContainerBuilder instance`
`45`	`45`	`*`
`46`	`46`	`* @throws \InvalidArgumentException`
`@@ -300,8 +300,8 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)`
`300`	`300`	`/**`
`301`	`301`	`* Loads a configured object manager metadata, query or result cache driver.`
`302`	`302`	`*`
`303`		`- * @param array $objectManager A configured object manager.`
`304`		`- * @param ContainerBuilder $container A ContainerBuilder instance.`
	`303`	`+ * @param array $objectManager A configured object manager`
	`304`	`+ * @param ContainerBuilder $container A ContainerBuilder instance`
`305`	`305`	`* @param string $cacheName`
`306`	`306`	`*`
`307`	`307`	`* @throws \InvalidArgumentException In case of unknown driver type.`
`@@ -314,10 +314,10 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB`
`314`	`314`	`/**`
`315`	`315`	`* Loads a cache driver.`
`316`	`316`	`*`
`317`		`- * @param string $cacheDriverServiceId The cache driver name.`
`318`		`- * @param string $objectManagerName The object manager name.`
`319`		`- * @param array $cacheDriver The cache driver mapping.`
`320`		`- * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container The ContainerBuilder instance.`
	`317`	`+ * @param string $cacheDriverServiceId The cache driver name`
	`318`	`+ * @param string $objectManagerName The object manager name`
	`319`	`+ * @param array $cacheDriver The cache driver mapping`
	`320`	`+ * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container The ContainerBuilder instance`
`321`	`321`	`*`
`322`	`322`	`* @return string`
`323`	`323`	`*`
`@@ -403,12 +403,12 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD`
`403`	`403`	`/**`
`404`	`404`	`* Returns a modified version of $managerConfigs.`
`405`	`405`	`*`
`406`		`- * The manager called $autoMappedManager will map all bundles that are not mepped by other managers.`
	`406`	`+ * The manager called $autoMappedManager will map all bundles that are not mapped by other managers.`
`407`	`407`	`*`
`408`	`408`	`* @param array $managerConfigs`
`409`	`409`	`* @param array $bundles`
`410`	`410`	`*`
`411`		`- * @return array The modified version of $managerConfigs.`
	`411`	`+ * @return array The modified version of $managerConfigs`
`412`	`412`	`*/`
`413`	`413`	`protected function fixManagersAutoMappings(array $managerConfigs, array $bundles)`
`414`	`414`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ interface EntityLoaderInterface`
`21`	`21`	`/**`
`22`	`22`	`* Returns an array of entities that are valid choices in the corresponding choice list.`
`23`	`23`	`*`
`24`		`- * @return array The entities.`
	`24`	`+ * @return array The entities`
`25`	`25`	`*/`
`26`	`26`	`public function getEntities();`
`27`	`27`
`@@ -31,9 +31,9 @@ public function getEntities();`
`31`	`31`	`* @param string $identifier The identifier field of the object. This method`
`32`	`32`	`* is not applicable for fields with multiple`
`33`	`33`	`* identifiers.`
`34`		`- * @param array $values The values of the identifiers.`
	`34`	`+ * @param array $values The values of the identifiers`
`35`	`35`	`*`
`36`		`- * @return array The entities.`
	`36`	`+ * @return array The entities`
`37`	`37`	`*/`
`38`	`38`	`public function getEntitiesByIds($identifier, array $values);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,9 @@ public function isIntId()`
`105`	`105`	`*`
`106`	`106`	`* This method assumes that the object has a single-column ID.`
`107`	`107`	`*`
`108`		`- * @param object $object The object.`
	`108`	`+ * @param object $object The object`
`109`	`109`	`*`
`110`		`- * @return mixed The ID value.`
	`110`	`+ * @return mixed The ID value`
`111`	`111`	`*/`
`112`	`112`	`public function getIdValue($object)`
`113`	`113`	`{`
`@@ -138,7 +138,7 @@ public function getIdValue($object)`
`138`	`138`	`*`
`139`	`139`	`* This method assumes that the object has a single-column ID.`
`140`	`140`	`*`
`141`		`- * @return string The name of the ID field.`
	`141`	`+ * @return string The name of the ID field`
`142`	`142`	`*/`
`143`	`143`	`public function getIdField()`
`144`	`144`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,9 @@ abstract class DoctrineType extends AbstractType`
`56`	`56`	`*`
`57`	`57`	`* For backwards compatibility, objects are cast to strings by default.`
`58`	`58`	`*`
`59`		`- * @param object $choice The object.`
	`59`	`+ * @param object $choice The object`
`60`	`60`	`*`
`61`		`- * @return string The string representation of the object.`
	`61`	`+ * @return string The string representation of the object`
`62`	`62`	`*`
`63`	`63`	`* @internal This method is public to be usable as callback. It should not`
`64`	`64`	`* be used in user code.`
`@@ -75,12 +75,12 @@ public static function createChoiceLabel($choice)`
`75`	`75`	`* a single-column integer ID. In that case, the value of the field is`
`76`	`76`	`* the ID of the object. That ID is also used as field name.`
`77`	`77`	`*`
`78`		`- * @param object $choice The object.`
`79`		`- * @param int\|string $key The choice key.`
	`78`	`+ * @param object $choice The object`
	`79`	`+ * @param int\|string $key The choice key`
`80`	`80`	`* @param string $value The choice value. Corresponds to the object's`
`81`	`81`	`* ID here.`
`82`	`82`	`*`
`83`		`- * @return string The field name.`
	`83`	`+ * @return string The field name`
`84`	`84`	`*`
`85`	`85`	`* @internal This method is public to be usable as callback. It should not`
`86`	`86`	`* be used in user code.`