ci: Migrate to PHP-CS-Fixer (#230)

meyfa · Mar 30, 2024 · cd666e3 · cd666e3
1 parent 6207bde
commit cd666e3
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 60 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,6 +7,7 @@
 /.codeclimate.yml export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/phpcs.xml export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/rector.php export-ignore
 /phpmd.xml export-ignore
 /phpunit.xml export-ignore
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -12,11 +12,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup PHP and PHPCS
+      - name: Setup PHP and PHP-CS-Fixer
         uses: shivammathur/setup-php@v2
         with:
           php-version: '7.4'
-          tools: phpcs
+          tools: php-cs-fixer
           coverage: none
 
       - name: Validate composer.json and composer.lock
@@ -36,8 +36,8 @@ jobs:
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress
 
-      - name: Run PHPCS
-        run: phpcs
+      - name: Run PHP-CS-Fixer
+        run: php-cs-fixer check --diff
 
   test:
     runs-on: ubuntu-latest

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,18 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())
+    ->in(__DIR__)
+;
+
+return (new PhpCsFixer\Config())
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR12' => true,
+        'yoda_style' => [
+            'equal' => false,
+            'identical' => false,
+            'less_and_greater' => false,
+        ],
+    ])
+    ->setFinder($finder)
+;
diff --git a/phpcs.xml b/phpcs.xml
diff --git a/src/Nodes/SVGNode.php b/src/Nodes/SVGNode.php
@@ -266,7 +266,7 @@ public function getSerializableNamespaces(): array
     public function getIdAndClassPattern(): ?string
     {
         $id = $this->getAttribute('id') != null ? Str::trim($this->getAttribute('id')) : '';
-        $class = $this->getAttribute('class') != null  ? Str::trim($this->getAttribute('class')) : '';
+        $class = $this->getAttribute('class') != null ? Str::trim($this->getAttribute('class')) : '';
 
         $pattern = '';
         if ($id !== '') {

diff --git a/src/Rasterization/Path/ArcApproximator.php b/src/Rasterization/Path/ArcApproximator.php
@@ -156,8 +156,8 @@ private static function endpointToCenter(
             ($y1prime - $cyprime) / $radiusY
         );
         $angleDelta = self::vectorAngle2(
-            ( $x1prime - $cxprime) / $radiusX,
-            ( $y1prime - $cyprime) / $radiusY,
+            ($x1prime - $cxprime) / $radiusX,
+            ($y1prime - $cyprime) / $radiusY,
             (-$x1prime - $cxprime) / $radiusX,
             (-$y1prime - $cyprime) / $radiusY
         );

diff --git a/src/Rasterization/Renderers/PathRendererImplementation.php b/src/Rasterization/Renderers/PathRendererImplementation.php
@@ -74,7 +74,7 @@ public static function fillMultipath($image, array $subpaths, int $color, string
         // Loop over the path area from bottom to top, so that we can make good use of the sort order of $edges.
         for ($scanline = $maxY; $scanline >= $minY; --$scanline) {
             // An edge becomes irrelevant when the scanline is higher up than the edge's minY.
-            $activeEdges = array_values(array_filter($activeEdges, fn($edge) => $edge->minY < $scanline));
+            $activeEdges = array_values(array_filter($activeEdges, fn ($edge) => $edge->minY < $scanline));
 
             // An edge becomes relevant when its y range starts to include $scanline.
             for ($n = count($edges); $lastActiveEdge < $n; ++$lastActiveEdge) {