- aligned PHP-CS-Fixer and Rector format style configurations

- fixed some coding styles for PHP-CS-Fixer check

Author: akky

.php-cs-fixer.dist.php

@@ -3,11 +3,49 @@
 $finder = (new PhpCsFixer\Finder())
     ->in(__DIR__)
     ->exclude('var')
-;
+    ->exclude('vendor')
+    ->exclude('migrations');
 
-return (new PhpCsFixer\Config())
+$config = (new PhpCsFixer\Config())
     ->setRules([
-        '@Symfony' => true,
+        '@PSR12' => true,
+        // コーディングスタイルの統一
+        'single_quote' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'concat_space' => ['spacing' => 'one'],
+        // Formatting only, let Rector handle all import logic
+        'blank_line_after_opening_tag' => false,
+        'linebreak_after_opening_tag' => false,
+        // PHPDoc設定
+        'phpdoc_order' => true,
+        'phpdoc_separation' => true,
+        'phpdoc_single_line_var_spacing' => true,
+        // クラス属性の分離
+        'class_attributes_separation' => [
+            'elements' => [
+                'method' => 'one',
+                'property' => 'one',
+            ],
+        ],
+        // Basic formatting rules
+        'indentation_type' => true,
+        'line_ending' => true,
+        'lowercase_keywords' => true,
+        'method_argument_space' => true,
+        'no_closing_tag' => true,
+        'no_spaces_after_function_name' => true,
+        'no_spaces_inside_parenthesis' => true,
+        'no_trailing_whitespace' => true,
+        'no_trailing_whitespace_in_comment' => true,
+        'single_blank_line_at_eof' => true,
+        'single_class_element_per_statement' => true,
+        'single_import_per_statement' => true,
+        'single_line_after_imports' => true,
+        'visibility_required' => true,
+        'encoding' => true,
+        'full_opening_tag' => true,
     ])
-    ->setFinder($finder)
-;
+    ->setRiskyAllowed(true)
+    ->setFinder($finder);
+
+return $config;

composer.json

@@ -95,7 +95,8 @@
             "bin/console lint:twig templates",
             "bin/console lint:container",
             "./vendor/bin/phpstan analyse --memory-limit=-1",
-            "./vendor/bin/rector --dry-run"
+            "./vendor/bin/rector --dry-run",
+            "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run --diff"
         ],
         "security-check": [
             "symfony check:security"
@@ -125,4 +126,4 @@
         "symfony/stopwatch": "7.3.*",
         "symfony/web-profiler-bundle": "7.3.*"
     }
-}
+}

config/preload.php

@@ -1,5 +1,5 @@
 <?php
 
-if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
-    require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
+if (file_exists(dirname(__DIR__) . '/var/cache/prod/App_KernelProdContainer.preload.php')) {
+    require dirname(__DIR__) . '/var/cache/prod/App_KernelProdContainer.preload.php';
 }

public/index.php

@@ -2,7 +2,7 @@
 
 use App\Kernel;
 
-require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
+require_once dirname(__DIR__) . '/vendor/autoload_runtime.php';
 
 $environment = $_SERVER['APP_ENV'] ?? 'dev';
 if (!is_string($environment)) {

tests/bootstrap.php

@@ -2,10 +2,10 @@
 
 use Symfony\Component\Dotenv\Dotenv;
 
-require dirname(__DIR__).'/vendor/autoload.php';
+require dirname(__DIR__) . '/vendor/autoload.php';
 
 // if (method_exists(Dotenv::class, 'bootEnv')) {
-(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+(new Dotenv())->bootEnv(dirname(__DIR__) . '/.env');
 // }
 
 if ($_SERVER['APP_DEBUG']) {