diff --git a/.php_cs.dist b/.php_cs.dist
index 04eb34114..edafec3af 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -30,6 +30,7 @@ return PhpCsFixer\Config::create()
         'linebreak_after_opening_tag' => true,
         'mb_str_functions' => true,
         'no_php4_constructor' => true,
+        'no_superfluous_phpdoc_tags' => true,
         'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
diff --git a/composer.json b/composer.json
index 2b58cef8d..235876c71 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
     "require-dev": {
         "dama/doctrine-test-bundle": "^5.0",
         "doctrine/doctrine-fixtures-bundle": "^3.0",
-        "friendsofphp/php-cs-fixer": "^2.7",
+        "friendsofphp/php-cs-fixer": "^2.12",
         "symfony/browser-kit": "^4.1",
         "symfony/css-selector": "^4.1",
         "symfony/debug-bundle": "^4.1",
diff --git a/composer.lock b/composer.lock
index 1588e74df..dc1f13cd8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f15e4f7f83bfa577f980f2d6a64f87d2",
+    "content-hash": "7528d6e1a96f81aa7d082ecd8cb0653d",
     "packages": [
         {
             "name": "composer/ca-bundle",
@@ -4726,16 +4726,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.12.1",
+            "version": "v2.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "beef6cbe6dec7205edcd143842a49f9a691859a6"
+                "reference": "dcc87d5414e9d0bd316fce81a5bedb9ce720b183"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/beef6cbe6dec7205edcd143842a49f9a691859a6",
-                "reference": "beef6cbe6dec7205edcd143842a49f9a691859a6",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/dcc87d5414e9d0bd316fce81a5bedb9ce720b183",
+                "reference": "dcc87d5414e9d0bd316fce81a5bedb9ce720b183",
                 "shasum": ""
             },
             "require": {
@@ -4769,7 +4769,7 @@
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1",
                 "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
-                "phpunitgoodpractices/traits": "^1.5",
+                "phpunitgoodpractices/traits": "^1.5.1",
                 "symfony/phpunit-bridge": "^4.0"
             },
             "suggest": {
@@ -4813,7 +4813,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2018-06-10T08:26:56+00:00"
+            "time": "2018-07-06T10:37:40+00:00"
         },
         {
             "name": "paragonie/random_compat",
diff --git a/tests/Form/DataTransformer/TagArrayToStringTransformerTest.php b/tests/Form/DataTransformer/TagArrayToStringTransformerTest.php
index 3563a7d48..2ea609a79 100644
--- a/tests/Form/DataTransformer/TagArrayToStringTransformerTest.php
+++ b/tests/Form/DataTransformer/TagArrayToStringTransformerTest.php
@@ -102,8 +102,6 @@ public function testTransform()
      * simplify the tests. See https://phpunit.de/manual/current/en/test-doubles.html.
      *
      * @param array $findByReturnValues The values returned when calling to the findBy() method
-     *
-     * @return TagArrayToStringTransformer
      */
     private function getMockedTransformer(array $findByReturnValues = []): TagArrayToStringTransformer
     {
@@ -121,8 +119,6 @@ private function getMockedTransformer(array $findByReturnValues = []): TagArrayT
      * This helper method creates a Tag instance for the given tag name.
      *
      * @param string $name
-     *
-     * @return Tag
      */
     private function createTag($name): Tag
     {