chore: update coding style (#1)

rekalogika · Sep 16, 2024 · 6b2d544 · 6b2d544
1 parent 5b9a887
commit 6b2d544
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 28 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.26.0" installed="3.26.0" location="./tools/php-cs-fixer" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.64.0" installed="3.64.0" location="./tools/php-cs-fixer" copy="false"/>
 </phive>
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -8,27 +8,22 @@
 
 $config = new PhpCsFixer\Config();
 return $config->setRules([
-    '@PSR12' => true,
-    'array_syntax' => ['syntax' => 'short'],
-
-    // imports
+    '@PER-CS2.0' => true,
+    '@PER-CS2.0:risky' => true,
     'fully_qualified_strict_types' => true,
     'global_namespace_import' => [
         'import_classes' => false,
         'import_constants' => false,
         'import_functions' => false,
     ],
-    'no_leading_import_slash' => true,
     'no_unneeded_import_alias' => true,
     'no_unused_imports' => true,
     'ordered_imports' => [
         'sort_algorithm' => 'alpha',
-        'imports_order' => ['const', 'class', 'function']
+        'imports_order' => ['class', 'function', 'const']
     ],
-    'single_line_after_imports' => true,
-    'no_useless_else' => true,
-    'no_useless_return' => true,
     'declare_strict_types' => true,
+    'native_function_invocation' => ['include' => ['@compiler_optimized']],
     'header_comment' => [
             'header' => <<<EOF
 This file is part of rekalogika/print-src package.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 * test: update phpstan and psalm
 
+## 1.2.0
+
+* chore: update coding style
+
 ## 1.1.0
 
 * Supports Symfony 7

diff --git a/packages/gotenberg-pdf-bundle/src/DependencyInjection/RekalogikaGotenbergPdfExtension.php b/packages/gotenberg-pdf-bundle/src/DependencyInjection/RekalogikaGotenbergPdfExtension.php
@@ -25,7 +25,7 @@ public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new PhpFileLoader(
             $container,
-            new FileLocator(__DIR__ . '/../../config')
+            new FileLocator(__DIR__ . '/../../config'),
         );
 
         $loader->load('services.php');

diff --git a/packages/gotenberg-pdf-bundle/src/GotenbergPdfGenerator.php b/packages/gotenberg-pdf-bundle/src/GotenbergPdfGenerator.php
@@ -27,20 +27,19 @@ class GotenbergPdfGenerator implements PdfGeneratorInterface
     public function __construct(
         private ClientInterface $httpClient,
         private string $gotenbergUrl = 'http://localhost:3000',
-    ) {
-    }
+    ) {}
 
     public function generatePdfFromHtml(
         string $htmlContent,
         PaperInterface $paper,
         PageLayoutInterface $pageLayout,
         ?string $header = null,
-        ?string $footer = null
+        ?string $footer = null,
     ): StreamInterface {
         $chromium = Gotenberg::chromium($this->gotenbergUrl)
             ->paperSize(
                 $paper->getWidth() * 39.3701,
-                $paper->getHeight() * 39.3701
+                $paper->getHeight() * 39.3701,
             )
             ->margins(
                 $pageLayout->getTopMargin() * 39.3701,

diff --git a/packages/print/src/PageLayout.php b/packages/print/src/PageLayout.php
@@ -31,31 +31,31 @@ public static function inMm(
                 $a / 1000,
                 $a / 1000,
                 $a / 1000,
-                $pageOrientation
+                $pageOrientation,
             );
         } elseif ($c === null) {
             return new self(
                 $a / 1000,
                 $b / 1000,
                 $a / 1000,
                 $b / 1000,
-                $pageOrientation
+                $pageOrientation,
             );
         } elseif ($d === null) {
             return new self(
                 $a / 1000,
                 $b / 1000,
                 $c / 1000,
                 $b / 1000,
-                $pageOrientation
+                $pageOrientation,
             );
         }
         return new self(
             $a / 1000,
             $b / 1000,
             $c / 1000,
             $d / 1000,
-            $pageOrientation
+            $pageOrientation,
         );
 
     }
@@ -81,9 +81,8 @@ private function __construct(
         private float $rightMargin,
         private float $bottomMargin,
         private float $leftMargin,
-        private PageOrientation $pageOrientation
-    ) {
-    }
+        private PageOrientation $pageOrientation,
+    ) {}
 
     public function getTopMargin(): float
     {

diff --git a/packages/print/src/Paper.php b/packages/print/src/Paper.php
@@ -206,8 +206,7 @@ public static function tabloid(): self
     private function __construct(
         private float $width,
         private float $height,
-    ) {
-    }
+    ) {}
 
     public function getWidth(): float
     {

diff --git a/tests/PageLayoutTest.php b/tests/PageLayoutTest.php
@@ -23,7 +23,7 @@ public function testOneMargin(): void
     {
         $pageLayout = PageLayout::inMm(
             PageOrientation::Portrait,
-            10
+            10,
         );
 
         $this->assertEquals(0.01, $pageLayout->getTopMargin());
@@ -37,7 +37,7 @@ public function testTwoMargins(): void
         $pageLayout = PageLayout::inMm(
             PageOrientation::Portrait,
             10,
-            20
+            20,
         );
 
         $this->assertEquals(0.01, $pageLayout->getTopMargin());
@@ -52,7 +52,7 @@ public function testThreeMargins(): void
             PageOrientation::Portrait,
             10,
             20,
-            30
+            30,
         );
 
         $this->assertEquals(0.01, $pageLayout->getTopMargin());
@@ -68,7 +68,7 @@ public function testFourMargins(): void
             10,
             20,
             30,
-            40
+            40,
         );
 
         $this->assertEquals(0.01, $pageLayout->getTopMargin());