From ad35a22a82ecb169b93d0088b049e20ec5f5e9c8 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Fri, 22 Jul 2022 18:09:53 +0900
Subject: [PATCH] =?UTF-8?q?php-cs-fixer=20=E3=81=8C=E5=8B=95=E4=BD=9C?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                             | 4 ++--
 .php_cs.dist => .php-cs-fixer.dist.php | 9 +++++++--
 package.sh                             | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
 rename .php_cs.dist => .php-cs-fixer.dist.php (83%)

diff --git a/.gitignore b/.gitignore
index 2b2772f3873..a6304bbd8f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,6 @@ node_modules
 ###< symfony/phpunit-bridge ###
 
 ###> friendsofphp/php-cs-fixer ###
-.php_cs
-.php_cs.cache
+/.php-cs-fixer.cache
+/.php-cs-fixer.*.php
 ###< friendsofphp/php-cs-fixer ###
diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php
similarity index 83%
rename from .php_cs.dist
rename to .php-cs-fixer.dist.php
index 4d557478ac2..bc4dec4989c 100644
--- a/.php_cs.dist
+++ b/.php-cs-fixer.dist.php
@@ -1,5 +1,9 @@
 <?php
 
+if (php_sapi_name() !== 'cli') {
+    throw new \LogicException();
+}
+
 $header = <<<EOL
 This file is part of EC-CUBE
 
@@ -24,14 +28,15 @@
     'header_comment' => ['header' => $header],
 ];
 
-$finder = PhpCsFixer\Finder::create()
+$finder = \PhpCsFixer\Finder::create()
     ->in(__DIR__.'/src')
     ->in(__DIR__.'/tests')
     ->in(__DIR__.'/app')
     ->in(__DIR__.'/codeception')
     ->name('*.php')
 ;
-return PhpCsFixer\Config::create()
+$config = new \PhpCsFixer\Config();
+return $config
     ->setRules($rules)
     ->setFinder($finder)
     ;
diff --git a/package.sh b/package.sh
index f97c361ff05..8bd3356d088 100755
--- a/package.sh
+++ b/package.sh
@@ -12,7 +12,7 @@ rm -rf $WORKSPACE/.editorconfig
 rm -rf $WORKSPACE/.gitignore
 rm -rf $WORKSPACE/.buildpath
 rm -rf $WORKSPACE/.gitmodules
-rm -rf $WORKSPACE/.php_cs.dist
+rm -rf $WORKSPACE/.php-cs-fixler.*
 rm -rf $WORKSPACE/phpunit.xml.dist
 rm -rf $WORKSPACE/phpstan.neon.dist
 rm -rf $WORKSPACE/app.json