Merge branch 'master' into package-installation

whitecube · Apr 12, 2023 · 2169174 · 2169174
2 parents f7fdb56 + c6b00d2
commit 2169174
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/src/Codestyle.php b/src/Codestyle.php
@@ -2,6 +2,7 @@
 
 namespace Whitecube\LaravelPreset;
 
+use Illuminate\Support\Facades\File;
 use Laravel\Ui\UiCommand;
 
 class Codestyle
@@ -11,7 +12,15 @@ public static function install(UiCommand $command)
     {
         $command->info('Installing code style fixer...');
 
+        static::copyStubs();
+    }
+
+    public static function copyStubs()
+    {
         copy(__DIR__.'/stubs/pint.json', base_path('pint.json'));
+
+        File::ensureDirectoryExists('.githooks');
+        copy(__DIR__.'/stubs/pre-commit', base_path('.githooks/pre-commit'));
     }
 
 }
diff --git a/src/Composer.php b/src/Composer.php
@@ -17,7 +17,6 @@ public static function install(UiCommand $command)
 
         static::installPackages($command);
         static::copyStub();
-        static::addComposerScripts();
     }
 
     public static function installPackages()

diff --git a/src/Preset.php b/src/Preset.php
@@ -10,7 +10,8 @@ class Preset extends LaravelPreset
 {
     public static function install(UiCommand $command)
     {
-        static::updatePackages($command);
+        static::updatePackages();
+        static::addComposerScripts();
         Codestyle::install($command);
         Gitignore::install($command);
         Mix::install($command);
@@ -51,4 +52,23 @@ public static function updatePackageArray($packages)
             ])
         );
     }
+
+    public static function addComposerScripts()
+    {
+        $composer = app()->make(\Whitecube\LaravelPreset\Support\Composer::class);
+
+        $composer->run([
+            'config',
+            'scripts.pre-install-cmd',
+            'App\\Console\\Commands\\ComposerEnv::loadLocalRepositories',
+            'git config core.hooksPath .githooks'
+        ]);
+
+        $composer->run([
+            'config',
+            'scripts.pre-update-cmd',
+            'App\\Console\\Commands\\ComposerEnv::loadLocalRepositories',
+            'git config core.hooksPath .githooks'
+        ]);
+    }
 }
diff --git a/src/stubs/pre-commit b/src/stubs/pre-commit
@@ -0,0 +1,10 @@
+# store list of staged files to variable except deleted file since it won't work at re-add
+files=$(git diff --name-only --cached --diff-filter=ACMR -- '*.php')
+
+if [ -n "$files" ]; then
+    # run pint, this will unstage any files that pint will fix
+    ./vendor/bin/pint $files
+
+    # re-add unstaged files caused by pint back to staging
+    printf $files | xargs git add
+fi