.phpcs.xml config fix

RingierIMU · Mar 13, 2023 · 18b5f29 · 18b5f29
1 parent ca7baa4
commit 18b5f29
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/.phpcs.xml b/.phpcs.xml
@@ -6,6 +6,12 @@
         <exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace"/>
     </rule>
 
+    <rule ref="PSR12.ControlStructures.BooleanOperatorPlacement">
+        <properties>
+            <property name="allowOnly" value="first"/>
+        </properties>
+    </rule>
+
     <rule ref="Generic.Files.LineLength">
         <properties>
             <property name="lineLimit" value="120"/>

diff --git a/app/Commands/FixCommand.php b/app/Commands/FixCommand.php
@@ -124,9 +124,13 @@ public function handle()
 
     protected function runPint()
     {
-        $configFile = tempnam(sys_get_temp_dir(), "pint");
-        rename($configFile, $configFile .= '.json');
-        file_put_contents($configFile, file_get_contents(base_path() . '/pint.json'));
+        if (file_exists('pint.json')) {
+            $configFile = 'pint.json';
+        } else {
+            $configFile = tempnam(sys_get_temp_dir(), "pint");
+            rename($configFile, $configFile .= '.json');
+            file_put_contents($configFile, file_get_contents(base_path() . '/pint.json'));
+        }
 
         $bin = tempnam(sys_get_temp_dir(), "pint");
         file_put_contents($bin, file_get_contents(base_path() . '/tools/pint'));
@@ -158,9 +162,13 @@ protected function runPint()
 
     protected function runPHPCS()
     {
-        $configFile = tempnam(sys_get_temp_dir(), "phpcs");
-        rename($configFile, $configFile .= '.xml');
-        file_put_contents($configFile, file_get_contents(base_path() . '/.phpcs.xml'));
+        if (file_exists('.phpcs.xml')) {
+            $configFile = './.phpcs.xml';
+        } else {
+            $configFile = tempnam(sys_get_temp_dir(), "phpcs");
+            rename($configFile, $configFile .= '.xml');
+            file_put_contents($configFile, file_get_contents(base_path() . '/.phpcs.xml'));
+        }
 
         $bin = tempnam(sys_get_temp_dir(), "phpcbf");
         file_put_contents($bin, file_get_contents(base_path() . '/tools/phpcbf'));

diff --git a/builds/ringier-code-style b/builds/ringier-code-style