Merge pull request #4 from Elao/update-cs-fixer

Fix cs-fixer v2

Author: ogizanagi

.php_cs

@@ -19,15 +19,12 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony' => true,
         'psr0' => false,
-        'concat_without_spaces' => false,
-        'concat_with_spaces' => true,
+        'concat_space' => ['spacing' => 'one'],
         'phpdoc_short_description' => false,
         'phpdoc_order' => true,
         'array_syntax' => ['syntax' => 'short'],
         'ordered_imports' => true,
         'simplified_null_return' => false,
-        'header_comment' => [
-            'header' => $header,
-        ],
+        'header_comment' => ['header' => $header],
     ])
 ;

composer.json

@@ -30,7 +30,7 @@
         "symfony/form": "^2.8|^3.1"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "2.x@dev",
+        "friendsofphp/php-cs-fixer": "^2.0",
         "phpunit/phpunit": "^5.6",
         "symfony/browser-kit": "^2.8|^3.1",
         "symfony/css-selector": "^2.8|^3.1",
@@ -41,7 +41,8 @@
         "symfony/phpunit-bridge": "^2.8|^3.1",
         "symfony/twig-bundle": "^2.8|^3.1",
         "symfony/validator": "^2.8|^3.1",
-        "symfony/var-dumper": "^2.8.11|^3.1"
+        "symfony/var-dumper": "^2.8.11|^3.1",
+        "symfony/templating": "^2.8|^3.1"
     },
     "extra": {
         "branch-alias": {

tests/Fixtures/Integration/Symfony/app/config/config.yml

@@ -9,3 +9,5 @@ framework:
         storage_id:                    'session.storage.mock_file'
     templating:
         engines:                       ['twig']
+    assets: false
+    annotations: false