Fix CS (#9)

.gitignore

@@ -1,8 +1,9 @@
 /composer.lock
 /coverage.xml
 /.phar/
+/.php-cs-fixer.cache
 /.php_cs.cache
 /phpunit.xml
 /vendor/
 /var/
-.phpunit.result.cache
+/.phpunit.result.cache

.php-cs-fixer.dist.php

@@ -1,8 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Hautelook\AliceBundle package.
+ *
+ * (c) Baldur Rensch <brensch@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
-$header = <<<'HEADER'
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+const HEADER = <<<'HEADER'
 This file is part of the Hautelook\AliceBundle package.
 
 (c) Baldur Rensch <brensch@gmail.com>
@@ -11,76 +23,65 @@
 file that was distributed with this source code.
 HEADER;
 
-$finder = PhpCsFixer\Finder::create()
+$finder = Finder::create()
     ->in(__DIR__.'/src')
     ->in(__DIR__.'/tests')
     ->in(__DIR__.'/fixtures')
-    ->exclude('fixtures/Resolver/cache/')
-    ->exclude('fixtures/Functional/cache/')
+    ->exclude('fixtures/Resolver/cache')
+    ->exclude('fixtures/Functional/cache')
+    ->append([
+        __DIR__.'/.php-cs-fixer.dist.php',
+        __DIR__.'/bin/console',
+    ])
 ;
 
-return PhpCsFixer\Config::create()
+return (new Config())
     ->setRiskyAllowed(true)
     ->setRules([
-        '@DoctrineAnnotation' => true,
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-        'align_multiline_comment' => [
-            'comment_type' => 'phpdocs_only',
-        ],
-        'array_indentation' => true,
-        'array_syntax' => [
-            'syntax' => 'short',
-        ],
-        'braces' => [
-            'allow_single_line_closure' => true,
-        ],
-        //'declare_strict_types' => true,
-        'doctrine_annotation_array_assignment' => [
-            'operator' => '=',
-        ],
-        'doctrine_annotation_spaces' => [
-            'after_array_assignments_equals' => false,
-            'before_array_assignments_equals' => false,
+        '@PSR2' => true,
+        'blank_line_after_opening_tag' => true,
+        'cast_spaces' => true,
+        'combine_consecutive_unsets' => true,
+        'declare_equal_normalize' => true,
+        'declare_strict_types' => true,
+        'general_phpdoc_annotation_remove' => [
+            'annotations' => [
+                'inheritDoc',
+            ],
         ],
         'header_comment' => [
-            'header' => $header,
+            'header' => HEADER,
             'location' => 'after_open',
         ],
-        'native_function_invocation' => [
-            'include' => [
-                '@compiler_optimized',
-            ],
-        ],
-        'no_extra_blank_lines' => [
-            'tokens' => [
-                'break',
-                'continue',
-                'curly_brace_block',
-                'extra',
-                'parenthesis_brace_block',
-                'return',
-                'square_brace_block',
-                'throw',
-                'use',
-            ],
-        ],
+        'include' => true,
+        'lowercase_cast' => true,
+        'modernize_types_casting' => true,
+        'native_function_casing' => true,
+        'new_with_braces' => true,
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_empty_comment' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_multiline_whitespace_around_double_arrow' => true,
         'no_superfluous_phpdoc_tags' => true,
-        'no_useless_else' => true,
-        'no_useless_return' => true,
-        'ordered_imports' => [
-            'importsOrder' => [
-                'class',
-                'function',
-                'const',
-            ],
-            'sortAlgorithm' => 'alpha',
-        ],
+        'no_short_bool_cast' => true,
+        'no_spaces_around_offset' => true,
+        'no_unused_imports' => true,
+        'ordered_imports' => true,
         'phpdoc_order' => true,
-        'single_line_throw' => false,
-        'strict_comparison' => true,
-        'strict_param' => true,
-        'ternary_to_null_coalescing' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_separation' => true,
+        'phpdoc_trim' => true,
+        'php_unit_fqcn_annotation' => true,
+        'php_unit_test_class_requires_covers' => true,
+        'single_quote' => true,
+        'space_after_semicolon' => true,
+        'standardize_not_equals' => true,
+        'trim_array_spaces' => true,
+        'whitespace_after_comma_in_array' => true,
     ])
     ->setFinder($finder)
 ;

fixtures/DataFixtures/Loader/FakeLoader.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\DataFixtures\Loader;
 
 use Fidry\AliceDataFixtures\LoaderInterface as DataFixturesLoaderInterface;

fixtures/DataFixtures/Loader/FakeLoaderPersisterAware.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\DataFixtures\Loader;
 
 use Fidry\AliceDataFixtures\Persistence\PersisterAwareInterface;

fixtures/FixtureLocator/FakeFixtureLocator.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\FixtureLocator;
 
 use Hautelook\AliceBundle\FixtureLocatorInterface;

fixtures/Functional/AppKernel.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional;
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;

fixtures/Functional/ConfigurableKernel.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional;
 
 use Hautelook\AliceBundle\HautelookAliceBundle;

fixtures/Functional/SimpleBundle/SimpleBundle.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\SimpleBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

fixtures/Functional/SimpleKernel.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional;
 
 use Hautelook\AliceBundle\Functional\SimpleBundle\SimpleBundle;

fixtures/Functional/TestBundle/Bundle/ABundle/Entity/Aentity.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Bundle\ABundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

fixtures/Functional/TestBundle/Bundle/ABundle/TestABundle.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Bundle\ABundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

fixtures/Functional/TestBundle/Bundle/BBundle/Entity/Bentity.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Bundle\BBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

fixtures/Functional/TestBundle/Bundle/BBundle/TestBBundle.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Bundle\BBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

fixtures/Functional/TestBundle/Bundle/CBundle/Resources/fixtures/AEnv/DataLoader.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Bundle\CBundle\DataFixtures\ORM\AEnv;
 
 use Hautelook\AliceBundle\Doctrine\DataFixtures\AbstractLoader;

fixtures/Functional/TestBundle/Bundle/CBundle/Resources/fixtures/BEnv/DataLoader.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Bundle\CBundle\DataFixtures\ORM\BEnv;
 
 use Hautelook\AliceBundle\Doctrine\DataFixtures\AbstractLoader;

fixtures/Functional/TestBundle/Bundle/CBundle/Resources/fixtures/DEnv/DataLoader.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Bundle\CBundle\DataFixtures\ORM\DEnv;
 
 use Hautelook\AliceBundle\Doctrine\DataFixtures\AbstractLoader;

fixtures/Functional/TestBundle/Bundle/CBundle/Resources/fixtures/EEnv/DataLoader.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Bundle\CBundle\DataFixtures\ORM\EEnv;
 
 use Hautelook\AliceBundle\Doctrine\DataFixtures\AbstractLoader;

fixtures/Functional/TestBundle/Bundle/CBundle/TestCBundle.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Bundle\CBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

fixtures/Functional/TestBundle/Bundle/EmptyBundle/TestEmptyBundle.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Bundle\EmptyBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

fixtures/Functional/TestBundle/DataFixtures/Faker/Provider/FooProvider.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\DataFixtures\Faker\Provider;
 
 class FooProvider

fixtures/Functional/TestBundle/DataFixtures/Processor/BrandProcessor.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\DataFixtures\Processor;
 
 use Hautelook\AliceBundle\Functional\TestBundle\Entity\Brand;

fixtures/Functional/TestBundle/Entity/Brand.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;

fixtures/Functional/TestBundle/Entity/City.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Entity;
 
 class City

fixtures/Functional/TestBundle/Entity/Dev.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

fixtures/Functional/TestBundle/Entity/Inte.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

fixtures/Functional/TestBundle/Entity/Prod.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

fixtures/Functional/TestBundle/Entity/Product.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;

fixtures/Functional/TestBundle/Entity/Project.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Entity;
 
 class Project

fixtures/Functional/TestBundle/Entity/Shard.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Hautelook\AliceBundle\Functional\TestBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;