Add PHP 8.2 and 8.3 support

jannescb · jannescb · commit e848124df2f5 · 2024-01-26T09:51:52.000+01:00
diff --git a/composer.json b/composer.json
@@ -8,12 +8,12 @@
         "fix": "vendor/bin/php-cs-fixer fix --allow-risky=yes --config=fixer/.php_cs"
     },
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^7.4|^8.0|^8.1|^8.2|^8.3",
         "litstack/lang": "^3.0.4",
         "erusev/parsedown-extra": "^0.8",
         "spatie/laravel-permission": "^2.0|^3.0|^4.0|^5.0",
         "astrotomic/laravel-translatable": "^11.0",
-        "cviebrock/eloquent-sluggable": "^7.0|^8.0|^9.0",
+        "cviebrock/eloquent-sluggable": "^7.0|^8.0|^9.0|^10.0",
         "spatie/laravel-medialibrary": "^8.0|^9.0|^10.0",
         "livewire/livewire": "^1.0|^2.0",
         "friendsofphp/php-cs-fixer": "^2.0|^3.0"
diff --git a/publish/database/migrations/______________________make_permissions.php b/publish/database/migrations/______________________make_permissions.php
@@ -62,10 +62,12 @@ class MakePermissions extends Migration
     protected function buildPermissions()
     {
         $this->combineOperationsAndGroups(
-            ['read', 'update'], $this->editPermissionGroups
+            ['read', 'update'],
+            $this->editPermissionGroups
         );
         $this->combineOperationsAndGroups(
-            ['create', 'read', 'update', 'delete'], $this->crudPermissionGroups
+            ['create', 'read', 'update', 'delete'],
+            $this->crudPermissionGroups
         );
     }
 
@@ -90,7 +92,8 @@ public function up()
     public function down()
     {
         $this->combineOperationsAndGroups(
-            ['create', 'read', 'update', 'delete'], $this->down
+            ['create', 'read', 'update', 'delete'],
+            $this->down
         );
         $this->downPermissions();
     }
diff --git a/resources/views/info.blade.php b/resources/views/info.blade.php
@@ -3,18 +3,21 @@
         <div class="card-body">
             <table>
                 <tr>
-                    <td><strong>PHP-Version:</strong></td><td> {{phpversion()}}</td>
+                    <td><strong>PHP-Version:</strong></td>
+                    <td> {{ phpversion() }}</td>
                 </tr>
-                <tr>
+                {{-- <tr>
                     <td><strong>SERVER_ADDR:</strong></td><td> {{ $_SERVER['SERVER_ADDR'] }}</td>
-                </tr>
+                </tr> --}}
                 <tr>
-                    <td><strong>HTTP_HOST:</strong> </td><td>{{ $_SERVER['HTTP_HOST'] }}</td>
+                    <td><strong>HTTP_HOST:</strong> </td>
+                    <td>{{ $_SERVER['HTTP_HOST'] }}</td>
                 </tr>
                 <tr>
-                    <td><strong>SERVER_SOFTWARE:</strong></td><td> {{ $_SERVER['SERVER_SOFTWARE'] }}</td>
+                    <td><strong>SERVER_SOFTWARE:</strong></td>
+                    <td> {{ $_SERVER['SERVER_SOFTWARE'] }}</td>
                 </tr>
             </table>
         </div>
     </div>
-</div>
+</div>
diff --git a/src/Foundation/Console/Concerns/InstallsVendorConfigs.php b/src/Foundation/Console/Concerns/InstallsVendorConfigs.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Spatie\Permission\PermissionServiceProvider;
 
 trait InstallsVendorConfigs
 {
@@ -80,12 +81,12 @@ protected function vendorMediaLibrary($migrationFiles)
         if (! $mediaMatch && $this->migrations()) {
             $this->callSilent('vendor:publish', [
                 '--provider' => "Spatie\MediaLibrary\MediaLibraryServiceProvider",
-                '--tag'      => 'migrations',
+                '--tag' => 'migrations',
             ]);
         }
         $this->callSilent('vendor:publish', [
             '--provider' => "Spatie\MediaLibrary\MediaLibraryServiceProvider",
-            '--tag'      => 'config',
+            '--tag' => 'config',
         ]);
         $content = file_get_contents(config_path(medialibrary_config_key().'.php'));
         $content = str_replace(
@@ -108,8 +109,8 @@ protected function vendorPermissions()
         }
 
         $this->callSilent('vendor:publish', [
-            '--provider' => \Spatie\Permission\PermissionServiceProvider::class,
-            '--tag'      => 'migrations',
+            '--provider' => PermissionServiceProvider::class,
+            // '--tag' => 'migrations',
         ]);
 
         $migrationsPath = app()->databasePath().DIRECTORY_SEPARATOR.'migrations'.DIRECTORY_SEPARATOR;
@@ -122,6 +123,7 @@ protected function vendorPermissions()
         if ($name == basename($migration)) {
             return;
         }
+
         $this->files->move($migration, $migrationsPath.$name);
     }
 }
diff --git a/src/Foundation/Console/InstallCommand.php b/src/Foundation/Console/InstallCommand.php
@@ -39,7 +39,6 @@ class InstallCommand extends Command
     /**
      * Create new InstallCommand instance.
      *
-     * @param  Filesystem  $files
      * @return void
      */
     public function __construct(Filesystem $files)
@@ -108,16 +107,16 @@ protected function defaultUser()
         }
 
         DB::table('lit_users')->insert([
-            'username'   => 'admin',
-            'email'      => 'admin@admin.com',
+            'username' => 'admin',
+            'email' => 'admin@admin.com',
             'first_name' => 'admin',
-            'last_name'  => '',
-            'password'   => bcrypt('secret'),
+            'last_name' => '',
+            'password' => bcrypt('secret'),
         ]);
         DB::table(config('permission.table_names.model_has_roles'))->insert([
-            'role_id'    => Role::where('name', 'admin')->where('guard_name', 'lit')->first()->id,
+            'role_id' => Role::where('name', 'admin')->where('guard_name', 'lit')->first()->id,
             'model_type' => 'Lit\\Models\\User',
-            'model_id'   => DB::table('lit_users')->where('email', 'admin@admin.com')->first()->id,
+            'model_id' => DB::table('lit_users')->where('email', 'admin@admin.com')->first()->id,
         ]);
 
         $this->info('created default admin (email: admin@admin.com, password: secret)');
@@ -126,7 +125,6 @@ protected function defaultUser()
     /**
      * Make directory if not exists.
      *
-     * @param  string  $path
      * @return void
      */
     private function makeDirectory(string $path)
@@ -156,13 +154,13 @@ private function handleLitPublishable()
         if ($this->migrations()) {
             $this->callSilent('vendor:publish', [
                 '--provider' => LitstackServiceProvider::class,
-                '--tag'      => 'migrations',
+                '--tag' => 'migrations',
             ]);
         }
 
         $this->callSilent('vendor:publish', [
             '--provider' => LitstackServiceProvider::class,
-            '--tag'      => 'config',
+            '--tag' => 'config',
         ]);
 
         // Migrate tables.

Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,12 @@ class MakePermissions extends Migration`
`62`	`62`	`protected function buildPermissions()`
`63`	`63`	`{`
`64`	`64`	`$this->combineOperationsAndGroups(`
`65`		`- ['read', 'update'], $this->editPermissionGroups`
	`65`	`+ ['read', 'update'],`
	`66`	`+ $this->editPermissionGroups`
`66`	`67`	`);`
`67`	`68`	`$this->combineOperationsAndGroups(`
`68`		`- ['create', 'read', 'update', 'delete'], $this->crudPermissionGroups`
	`69`	`+ ['create', 'read', 'update', 'delete'],`
	`70`	`+ $this->crudPermissionGroups`
`69`	`71`	`);`
`70`	`72`	`}`
`71`	`73`
`@@ -90,7 +92,8 @@ public function up()`
`90`	`92`	`public function down()`
`91`	`93`	`{`
`92`	`94`	`$this->combineOperationsAndGroups(`
`93`		`- ['create', 'read', 'update', 'delete'], $this->down`
	`95`	`+ ['create', 'read', 'update', 'delete'],`
	`96`	`+ $this->down`
`94`	`97`	`);`
`95`	`98`	`$this->downPermissions();`
`96`	`99`	`}`