Use Laravel Pint

Author: jasonmccreary

.github/workflows/lint.yml

@@ -0,0 +1,20 @@
+name: Lint
+on:
+  - push
+  - pull_request
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          tools: phplint, laravel/pint
+      - name: Check syntax
+        run: phplint .
+      - name: Check code style
+        run: pint --test

.github/workflows/phplint.yml

@@ -16,6 +16,7 @@
         "symfony/yaml": "^6.0"
     },
     "require-dev": {
+        "laravel/pint": "^1.2",
         "mockery/mockery": "^1.4.4",
         "orchestra/testbench": "^7.0",
         "phpunit/phpunit": "^9.5.10"

composer.json

@@ -0,0 +1,19 @@
+{
+    "preset": "laravel",
+    "rules": {
+        "blank_line_before_statement": {
+            "statements": ["return", "try"]
+        },
+        "cast_spaces": {
+            "space": "none"
+        },
+        "concat_space": {
+            "spacing": "one"
+        },
+        "not_operator_with_successor_space": false,
+        "logical_operators": true
+    },
+    "notPath": [
+        "tests/fixtures"
+    ]
+}

pint.json

@@ -10,6 +10,7 @@
 class Blueprint
 {
     private $lexers = [];
+
     private $generators = [];
 
     public static function relativeNamespace(string $fullyQualifiedClassName)

src/Blueprint.php

@@ -37,8 +37,8 @@ class BuildCommand extends Command
     private $builder;
 
     /**
-     * @param Filesystem $filesystem
-     * @param Builder    $builder
+     * @param  Filesystem  $filesystem
+     * @param  Builder  $builder
      */
     public function __construct(Filesystem $filesystem, Builder $builder)
     {
@@ -54,6 +54,7 @@ public function handle()
 
         if (!$this->filesystem->exists($file)) {
             $this->error('Draft file could not be found: ' . ($file ?: 'draft.yaml'));
+
             return 1;
         }
 

src/Commands/BuildCommand.php

@@ -5,7 +5,6 @@
 use Blueprint\Blueprint;
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Facades\Artisan;
 
 class EraseCommand extends Command
 {

src/Commands/EraseCommand.php

@@ -24,11 +24,11 @@ class NewCommand extends Command
      */
     protected $description = 'Create a draft.yaml file and load existing models';
 
-    /** @var Filesystem $files */
+    /** @var Filesystem */
     protected $filesystem;
 
     /**
-     * @param Filesystem $filesystem
+     * @param  Filesystem  $filesystem
      */
     public function __construct(Filesystem $filesystem)
     {

src/Commands/NewCommand.php

@@ -26,15 +26,15 @@ class TraceCommand extends Command
      */
     protected $description = 'Create definitions for existing models to reference in new drafts';
 
-    /** @var Filesystem $files */
+    /** @var Filesystem */
     protected $filesystem;
 
     /** @var Tracer */
     private $tracer;
 
     /**
-     * @param Filesystem $filesystem
-     * @param Tracer     $tracer
+     * @param  Filesystem  $filesystem
+     * @param  Tracer  $tracer
      */
     public function __construct(Filesystem $filesystem, Tracer $tracer)
     {

src/Commands/TraceCommand.php

@@ -18,7 +18,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform)
             $this->values
         );
 
-        return "ENUM(" . implode(", ", $values) . ")";
+        return 'ENUM(' . implode(', ', $values) . ')';
     }
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
@@ -31,6 +31,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
         if (!in_array($value, $this->values)) {
             throw new \InvalidArgumentException("Invalid '" . $this->getName() . "' value.");
         }
+
         return $value;
     }