Merge branch 'master' into fix/session-shipping-items

.github/workflows/dockerbuild-and-push.yml

@@ -95,7 +95,7 @@ jobs:
         run: |
           sudo chown -R 1001:1000 zap
           sudo chmod -R g+w zap
-          docker-compose up -d
+          docker compose up -d
 
       - run: sleep 1
       - run: |

.github/workflows/penetration-tests.yml

@@ -47,12 +47,12 @@ jobs:
       run: |
         sudo chown -R 1001:1000 zap
         sudo chmod -R g+w zap
-        docker-compose up -d
-        docker-compose exec -T ec-cube composer install
-        docker-compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" -W
-        docker-compose exec -T ec-cube composer update 'symfony/*' -W
-        docker-compose exec -T ec-cube php data/vendor/bin/eccube eccube:fixtures:generate --products=5 --customers=1 --orders=5
-        docker-compose exec -T postgres psql --user=eccube_db_user eccube_db -c "UPDATE dtb_customer SET email = '[email protected]' WHERE customer_id = (SELECT MAX(customer_id) FROM dtb_customer WHERE status = 2 AND del_flg = 0);"
+        docker compose up -d
+        docker compose exec -T ec-cube composer install
+        docker compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" -W
+        docker compose exec -T ec-cube composer update 'symfony/*' -W
+        docker compose exec -T ec-cube php data/vendor/bin/eccube eccube:fixtures:generate --products=5 --customers=1 --orders=5
+        docker compose exec -T postgres psql --user=eccube_db_user eccube_db -c "UPDATE dtb_customer SET email = '[email protected]' WHERE customer_id = (SELECT MAX(customer_id) FROM dtb_customer WHERE status = 2 AND del_flg = 0);"
 
     - run: sleep 1
     - run: |

.php-cs-fixer.dist.php

@@ -0,0 +1,40 @@
+<?php
+
+if (php_sapi_name() !== 'cli') {
+    throw new \LogicException();
+}
+
+$rules = [
+    '@Symfony' => true,
+    '@Symfony:risky' => true,
+    // '@PHP83Migration' => true,
+
+    // @Symfony のうち、以下のルールを無効化
+    'phpdoc_align' => false, // phpdoc の内容が削除されてしまう場合がある
+    'phpdoc_summary' => false, // 日本語なので不要
+    'phpdoc_annotation_without_dot' => false, // 日本語なので不要
+    'no_superfluous_phpdoc_tags' => false, // 副作用があるため
+    'increment_style' => false, // 強制しなくて良い
+    'yoda_style' => false, // 強制しなくて良い
+
+    // @Symfony:risky のうち、以下のルールを無効化
+    'psr_autoloading' => false, // PSR-4 に準拠していないため
+    'is_null' => false, // 副作用があるため
+    'native_constant_invocation' => false, // namespace を使用していないため不要
+    'string_length_to_empty' => false, // 副作用があるため
+    'ternary_to_elvis_operator' => false, // 副作用があるため
+];
+
+$finder = \PhpCsFixer\Finder::create()
+    ->in(__DIR__.'/data/class')
+    ->in(__DIR__.'/data/class_extends')
+    ->in(__DIR__.'/data/module')
+    ->in(__DIR__.'/data/smarty_extends')
+    ->in(__DIR__.'/tests')
+    ->name('*.php')
+;
+$config = new \PhpCsFixer\Config();
+return $config
+    ->setRules($rules)
+    ->setFinder($finder)
+    ;

composer.json

@@ -24,11 +24,12 @@
     "require-dev": {
         "doctrine/instantiator": "~1.5.0",
         "fakerphp/faker": "^1.23",
+        "friendsofphp/php-cs-fixer": "^3.9",
         "nanasess/ec-cube2-class-extends-stubs": "^1.0",
         "nanasess/eccube2-fixture-generator": "^2.0",
-        "php5friends/phpunit48": ">=4.8.41",
         "phpdocumentor/reflection-docblock": "~5.4.0",
         "phpstan/phpstan": "^1.10",
+        "phpunit/phpunit": "^9.6",
         "symfony/yaml": "^5.4 || ^6.4"
     },
     "require": {