Merge branch '2.8' into 3.3

* 2.8:
  [CS] Apply phpdoc_annotation_without_dot

Author: fabpot

.php_cs.dist

@@ -12,7 +12,6 @@ return PhpCsFixer\Config::create()
         'no_unreachable_default_argument_value' => false,
         'braces' => array('allow_single_line_closure' => true),
         'heredoc_to_nowdoc' => false,
-        'phpdoc_annotation_without_dot' => false,
         'protected_to_private' => false,
     ))
     ->setRiskyAllowed(true)

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

@@ -298,7 +298,7 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
      * @param ContainerBuilder $container     A ContainerBuilder instance
      * @param string           $cacheName
      *
-     * @throws \InvalidArgumentException In case of unknown driver type.
+     * @throws \InvalidArgumentException in case of unknown driver type
      */
     protected function loadObjectManagerCacheDriver(array $objectManager, ContainerBuilder $container, $cacheName)
     {

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

@@ -108,15 +108,15 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      *
      * @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[]             $managerParameters       list of container parameters that could
+     *                                                      hold the manager name
      * @param string               $driverPattern           Pattern for the metadata driver service name
      * @param string|false         $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               $registerAliasMethodName Name of Configuration class method to
-     *                                                      register alias.
+     * @param string               $registerAliasMethodName name of Configuration class method to
+     *                                                      register alias
      * @param string[]             $aliasMap                Map of alias to namespace
      */
     public function __construct($driver, array $namespaces, array $managerParameters, $driverPattern, $enabledParameter = false, $configurationPattern = '', $registerAliasMethodName = '', array $aliasMap = array())
@@ -174,7 +174,7 @@ public function process(ContainerBuilder $container)
      * @return string The name of the chain driver service
      *
      * @throws InvalidArgumentException if non of the managerParameters has a
-     *                                  non-empty value.
+     *                                  non-empty value
      */
     protected function getChainDriverServiceName(ContainerBuilder $container)
     {
@@ -185,7 +185,7 @@ protected function getChainDriverServiceName(ContainerBuilder $container)
      * Create the service definition for the metadata driver.
      *
      * @param ContainerBuilder $container passed on in case an extending class
-     *                                    needs access to the container.
+     *                                    needs access to the container
      *
      * @return Definition|Reference the metadata driver to add to all chain drivers
      */
@@ -202,7 +202,7 @@ protected function getDriver(ContainerBuilder $container)
      * @return string a service definition name
      *
      * @throws InvalidArgumentException if none of the managerParameters has a
-     *                                  non-empty value.
+     *                                  non-empty value
      */
     private function getConfigurationServiceName(ContainerBuilder $container)
     {
@@ -219,7 +219,7 @@ private function getConfigurationServiceName(ContainerBuilder $container)
      *
      * @return string The name of the active manager
      *
-     * @throws InvalidArgumentException If none of the managerParameters is found in the container.
+     * @throws InvalidArgumentException if none of the managerParameters is found in the container
      */
     private function getManagerName(ContainerBuilder $container)
     {

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

@@ -59,8 +59,8 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
      * @param ObjectManager              $manager      The object manager
      * @param string                     $class        The class name of the
      *                                                 loaded objects
-     * @param IdReader                   $idReader     The reader for the object
-     *                                                 IDs.
+     * @param IdReader                   $idReader     the reader for the object
+     *                                                 IDs
      * @param null|EntityLoaderInterface $objectLoader The objects loader
      * @param ChoiceListFactoryInterface $factory      The factory for creating
      *                                                 the loaded choice list

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

@@ -20,7 +20,7 @@
  *
  * @author Bernhard Schussek <[email protected]>
  *
- * @internal This class is meant for internal use only.
+ * @internal this class is meant for internal use only
  */
 class IdReader
 {
@@ -79,8 +79,8 @@ public function __construct(ObjectManager $om, ClassMetadata $classMetadata)
     /**
      * Returns whether the class has a single-column ID.
      *
-     * @return bool Returns `true` if the class has a single-column ID and
-     *              `false` otherwise.
+     * @return bool returns `true` if the class has a single-column ID and
+     *              `false` otherwise
      */
     public function isSingleId()
     {
@@ -90,8 +90,8 @@ public function isSingleId()
     /**
      * Returns whether the class has a single-column integer ID.
      *
-     * @return bool Returns `true` if the class has a single-column integer ID
-     *              and `false` otherwise.
+     * @return bool returns `true` if the class has a single-column integer ID
+     *              and `false` otherwise
      */
     public function isIntId()
     {

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php

@@ -236,7 +236,7 @@ public function block(FormView $view, $blockName, array $variables = array())
      *
      * @return string A CSRF token
      *
-     * @throws \BadMethodCallException When no CSRF provider was injected in the constructor.
+     * @throws \BadMethodCallException when no CSRF provider was injected in the constructor
      */
     public function csrfToken($tokenId)
     {

src/Symfony/Component/Config/Definition/BaseNode.php

@@ -38,7 +38,7 @@ abstract class BaseNode implements NodeInterface
      * @param string        $name   The name of the node
      * @param NodeInterface $parent The parent of this node
      *
-     * @throws \InvalidArgumentException if the name contains a period.
+     * @throws \InvalidArgumentException if the name contains a period
      */
     public function __construct($name, NodeInterface $parent = null)
     {

src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php

@@ -154,10 +154,10 @@ public function addDefaultsIfNotSet()
     /**
      * Adds children with a default value when none are defined.
      *
-     * @param int|string|array|null $children The number of children|The child name|The children names to be added
-     *
      * This method is applicable to prototype nodes only.
      *
+     * @param int|string|array|null $children the number of children|The child name|The children names to be added
+     *
      * @return $this
      */
     public function addDefaultChildrenIfNoneSet($children = null)

src/Symfony/Component/Console/Question/Question.php

@@ -190,7 +190,7 @@ public function getValidator()
      *
      * @return $this
      *
-     * @throws InvalidArgumentException In case the number of attempts is invalid.
+     * @throws InvalidArgumentException in case the number of attempts is invalid
      */
     public function setMaxAttempts($attempts)
     {

src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php

@@ -204,7 +204,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
 
         $xError = array(
             'type' => E_USER_DEPRECATED,
-            'message' => 'The "Test\Symfony\Component\Debug\Tests\\'.$class.'" class '.$type.' "Symfony\Component\Debug\Tests\Fixtures\\'.$super.'" that is deprecated but this is a test deprecation notice.',
+            'message' => 'The "Test\Symfony\Component\Debug\Tests\\'.$class.'" class '.$type.' "Symfony\Component\Debug\Tests\Fixtures\\'.$super.'" that is deprecated but this is a test deprecation notice',
         );
 
         $this->assertSame($xError, $lastError);