Merge pull request #134 from shopware/ntr/switched-to-cs-fixer

NTR - Switched to cs fixer

.php-cs-fixer.dist.php

@@ -1,13 +1,66 @@
 <?php
 
-$finder = (new PhpCsFixer\Finder())
-    ->in(__DIR__)
-    ->exclude('var')
-;
+declare(strict_types=1);
 
-return (new PhpCsFixer\Config())
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
+return (new Config())
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'linebreak_after_opening_tag' => false,
+        'blank_line_after_opening_tag' => false,
+        'phpdoc_summary' => false,
+        'phpdoc_annotation_without_dot' => false,
+        'phpdoc_to_comment' => false,
+        'declare_strict_types' => true,
+        'strict_comparison' => true,
+        'strict_param' => true,
+        'no_useless_else' => true,
+        'void_return' => true,
+        'phpdoc_line_span' => true,
+        'php_unit_dedicate_assert_internal_type' => true,
+        'php_unit_mock' => true,
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'static'],
+        'no_useless_return' => true,
+        'yoda_style' => [
+            'equal' => false,
+            'identical' => false,
+            'less_and_greater' => false,
+        ],
+        'single_line_throw' => false,
+        'fopen_flags' => false,
+        'self_accessor' => false,
+        'phpdoc_align' => ['align' => 'left'],
+        'phpdoc_order' => ['order' => ['param', 'throws', 'return']],
+        'class_attributes_separation' => ['elements' => ['property' => 'one', 'method' => 'one']],
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+        'concat_space' => ['spacing' => 'one'],
+        'native_function_invocation' => [
+            'scope' => 'namespaced',
+            'strict' => false,
+            'exclude' => ['ini_get'],
+        ],
+        'general_phpdoc_annotation_remove' => ['annotations' => ['copyright', 'category']],
+        'no_superfluous_phpdoc_tags' => ['allow_unused_params' => true, 'allow_mixed' => true],
+        'php_unit_dedicate_assert' => ['target' => 'newest'],
+        'single_quote' => ['strings_containing_single_quote_chars' => true],
     ])
-    ->setFinder($finder)
-;
+    ->setUsingCache(true)
+    ->setCacheFile('var/cache/cs_fixer.cache')
+    ->setFinder(
+        (new Finder())->in([
+            __DIR__ . '/src',
+            __DIR__ . '/tests',
+            __DIR__ . '/public',
+            __DIR__ . '/config',
+            __DIR__ . '/bin',
+        ])->exclude([
+            'node_modules',
+            '*/vendor/*',
+        ])
+    );

composer.json

@@ -70,8 +70,8 @@
         "@auto-scripts"
     ],
     "scripts": {
-        "ecs": "ecs check src tests",
-        "ecs-fix": "ecs check --fix src tests",
+        "ecs": "php-cs-fixer fix --dry-run --diff",
+        "ecs-fix": "php-cs-fixer fix",
         "phpstan": "phpstan analyze --memory-limit=2G",
         "phpunit": "phpunit",
         "infection": "infection -j10 -s",
@@ -97,6 +97,7 @@
         }
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.63",
         "infection/infection": "^0.29.6",
         "kubawerlos/php-cs-fixer-custom-fixers": "^3.16",
         "phpstan/extension-installer": "^1.3",
@@ -106,7 +107,6 @@
         "symfony/debug-bundle": "^7.1",
         "symfony/stopwatch": "^7.1",
         "symfony/web-profiler-bundle": "^7.1",
-        "symplify/easy-coding-standard": "^12.0",
         "symplify/phpstan-rules": "13.0.1",
         "tomasvotruba/type-coverage": "^1.0.0"
     }

config/bundles.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],

config/services.php

@@ -12,5 +12,5 @@
         ->load('Swag\\Braintree\\', '../src/*')
         ->exclude('../src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}');
 
-    $container->import(__DIR__.'/services/braintree.xml', 'xml');
+    $container->import(__DIR__ . '/services/braintree.xml', 'xml');
 };

src/Framework/Exception/BraintreeHttpException.php

@@ -21,7 +21,7 @@ abstract class BraintreeHttpException extends HttpException
     public function __construct(
         string $message,
         array $parameters = [],
-        ?\Throwable $e = null
+        ?\Throwable $e = null,
     ) {
         $this->parameters = $parameters;
         $message = $this->parse($message, $parameters);

src/Framework/Serializer/EntityNormalizer.php

@@ -16,7 +16,7 @@ class EntityNormalizer implements NormalizerInterface
     private const REGEX = '/.*(Swag.*)/';
 
     public function __construct(
-        private readonly NormalizerInterface $normalizer
+        private readonly NormalizerInterface $normalizer,
     ) {
     }
 

src/Repository/ConfigRepository.php

@@ -11,7 +11,7 @@
 /**
  * @method ConfigEntity|null find($id, $lockMode = null, $lockVersion = null)
  * @method ConfigEntity|null findOneBy(array $criteria, array $orderBy = null)
- * @method ConfigEntity[]    findAll()
+ * @method ConfigEntity[] findAll()
  *
  * @extends AbstractRepository<ConfigEntity>
  */

src/Repository/CurrencyMappingRepository.php

@@ -8,7 +8,7 @@
 /**
  * @method CurrencyMappingEntity|null find($id, $lockMode = null, $lockVersion = null)
  * @method CurrencyMappingEntity|null findOneBy(array $criteria, array $orderBy = null)
- * @method CurrencyMappingEntity[]    findAll()
+ * @method CurrencyMappingEntity[] findAll()
  *
  * @extends AbstractRepository<CurrencyMappingEntity>
  */

src/Repository/ShopRepository.php

@@ -9,7 +9,7 @@
 /**
  * @method ShopInterface|null find($id, $lockMode = null, $lockVersion = null)
  * @method ShopInterface|null findOneBy(array $criteria, array $orderBy = null)
- * @method ShopInterface[]    findAll()
+ * @method ShopInterface[] findAll()
  *
  * @extends AbstractRepository<ShopInterface>
  */

src/Repository/TransactionReportRepository.php

@@ -9,7 +9,7 @@
 /**
  * @method TransactionReportEntity|null find($id, $lockMode = null, $lockVersion = null)
  * @method TransactionReportEntity|null findOneBy(array $criteria, array $orderBy = null)
- * @method TransactionReportEntity[]    findAll()
+ * @method TransactionReportEntity[] findAll()
  *
  * @extends ServiceEntityRepository<TransactionReportEntity>
  */