Optimize PHP CS Fixer rules

s-damian · Aug 8, 2023 · d32a57d · d32a57d
1 parent 2a6407f
commit d32a57d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "laravel/pint": "^1.0",
         "phpunit/phpunit": "9.5.*",
         "orchestra/testbench": "^6",
-        "phpstan/phpstan": "^1.9"
+        "phpstan/phpstan": "^1.10"
     },
     "autoload": {
         "psr-4" : {

diff --git a/pint.json b/pint.json
@@ -1,6 +1,25 @@
 {
     "preset": "laravel",
     "rules": {
+        "explicit_string_variable" : true,
+        "new_with_braces": {
+            "anonymous_class": true,
+            "named_class": true
+        },
+        "ordered_class_elements" : {
+            "order" : [
+                "use_trait",
+                "case",
+                "constant",
+                "property",
+                "construct",
+                "destruct",
+                "magic",
+                "phpunit",
+                "method_abstract",
+                "method"
+            ]
+        },
         "ordered_traits": true
     }
 }
diff --git a/src/LarasortServiceProvider.php b/src/LarasortServiceProvider.php
@@ -39,22 +39,22 @@ public function boot(): void
         // Blade Directives:
 
         Blade::directive('sortableUrl', function ($expression) {
-            return "<?php echo \SDamian\Larasort\LarasortLink::getUrl($expression); ?>";
+            return "<?php echo \SDamian\Larasort\LarasortLink::getUrl({$expression}); ?>";
         });
 
         Blade::directive('sortableHref', function ($expression) {
-            return "<?php echo \SDamian\Larasort\LarasortLink::getHref($expression); ?>";
+            return "<?php echo \SDamian\Larasort\LarasortLink::getHref({$expression}); ?>";
         });
 
         Blade::directive('sortableIcon', function ($expression) {
-            return "<?php echo \SDamian\Larasort\LarasortLink::getIcon($expression); ?>";
+            return "<?php echo \SDamian\Larasort\LarasortLink::getIcon({$expression}); ?>";
         });
 
         Blade::directive('sortableLink', function ($expression) {
             $ex = explode(', ', $expression);
             $label = $ex[1] ?? null;
 
-            return "<?php echo \SDamian\Larasort\LarasortLink::getLink($ex[0], $label); ?>";
+            return "<?php echo \SDamian\Larasort\LarasortLink::getLink({$ex[0]}, {$label}); ?>";
         });
     }
 

diff --git a/src/Relations/Related.php b/src/Relations/Related.php
@@ -178,6 +178,6 @@ final public function getTableColumnByUrl(): ?string
 
         $ex = explode(config('larasort.relation_column_separator'), request()->orderby);
 
-        return  $this->getRelatedTable().'.'.$ex[1];
+        return $this->getRelatedTable().'.'.$ex[1];
     }
 }