Merge remote-tracking branch 'origin/main' into pietrantonio91/main

yondifon · Aug 8, 2023 · 044689d · 044689d
2 parents f80cdd9 + 80a1565
commit 044689d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 228 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
diff --git a/composer.json b/composer.json
@@ -25,8 +25,8 @@
 	"require-dev": {
 		"ext-pdo": "*",
 		"pestphp/pest": "^1.20",
-		"friendsofphp/php-cs-fixer": "^3.1",
-		"orchestra/testbench": "^7.0"
+		"orchestra/testbench": "^7.0",
+		"laravel/pint": "^1.10"
 	},
 	"extra": {
 		"laravel": {

diff --git a/pint.json b/pint.json
@@ -0,0 +1,7 @@
+{
+	"preset": "laravel",
+	"rules": {
+		"use_arrow_functions": true,
+		"psr_autoloading": true
+	}
+}
diff --git a/src/Console/Commands/NanoidMigrateMakeCommand.php b/src/Console/Commands/NanoidMigrateMakeCommand.php
@@ -23,8 +23,7 @@ class NanoidMigrateMakeCommand extends MigrateMakeCommand
     /**
      * Create a new migration install command instance.
      *
-     * @param \Illuminate\Database\Migrations\MigrationCreator $creator
-     *
+     * @param  \Illuminate\Database\Migrations\MigrationCreator  $creator
      * @return void
      */
     public function __construct(MigrationCreator $creator, Composer $composer)

diff --git a/src/Console/Commands/NanoidModelMakeCommand.php b/src/Console/Commands/NanoidModelMakeCommand.php
@@ -33,7 +33,7 @@ class NanoidModelMakeCommand extends ModelMakeCommand
      */
     protected function getStub(): string
     {
-        return realpath(__DIR__ . '/../../Eloquent/stubs/nanoid.model.stub');
+        return realpath(__DIR__.'/../../Eloquent/stubs/nanoid.model.stub');
     }
 
     /**
@@ -58,16 +58,15 @@ protected function createMigration()
         $table = Str::snake(Str::pluralStudly(class_basename($this->argument('name'))));
 
         $this->call(NanoidMigrateMakeCommand::class, [
-            'name'     => "create_{$table}_table",
+            'name' => "create_{$table}_table",
             '--create' => $table,
         ]);
     }
 
     /**
      * Get the value of a command option.
      *
-     * @param null|string $key
-     *
+     * @param  null|string  $key
      * @return null|array|bool|string
      */
     public function option($key = null)

diff --git a/src/Database/Migrations/MigrationCreator.php b/src/Database/Migrations/MigrationCreator.php
@@ -14,6 +14,6 @@ public function __construct(Filesystem $files, $customStubPath = null)
 
     public function stubPath()
     {
-        return __DIR__ . '/stubs';
+        return __DIR__.'/stubs';
     }
 }
diff --git a/src/Eloquent/InteractsWithNanoid.php b/src/Eloquent/InteractsWithNanoid.php
@@ -25,6 +25,6 @@ public function generateNanoid(): string
     {
         $client = new Client();
 
-        return $this->nanoidPrefix . $client->generateId($this->getNanoidLength(), Client::MODE_DYNAMIC);
+        return $this->nanoidPrefix.$client->generateId($this->getNanoidLength(), Client::MODE_DYNAMIC);
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -32,8 +32,7 @@ protected function setUpDatabase(): void
     /**
      * Get package providers.
      *
-     * @param \Illuminate\Foundation\Application $app
-     *
+     * @param  \Illuminate\Foundation\Application  $app
      * @return array
      */
     protected function getPackageProviders($app)