chore: cleanup composer.json, added laravel 12

Author: addeeandra

.github/workflows/tests.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - '*.x'
+      - "*.x"
   pull_request:
 
 permissions:
@@ -18,23 +18,22 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - php: '8.0'
-            laravel: 9
-          - php: '8.1'
+          - php: "8.1"
             laravel: 10
-          - php: '8.2'
+          - php: "8.2"
             laravel: 11
-          - php: '8.3'
+          - php: "8.3"
             laravel: 11
+          - php: "8.4"
+            laravel: 12
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
     steps:
-
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          path: 'dentro-nge'
+          path: "dentro-nge"
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.gitignore

@@ -1,2 +1,4 @@
 /vendor
+
+.DS_Store
 composer.lock

composer.json

@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "illuminate/console": "^9.52.16|^10.0|^11.0",
-        "illuminate/contracts": "^9.52.16|^10.0|^11.0",
-        "illuminate/support": "^9.52.16|^10.0|^11.0",
-        "symfony/console": "^6.0|^7.0",
-        "symfony/yaml": "^6.0|^7.0"
+        "php": "^8.2",
+        "illuminate/console": "^11.0",
+        "illuminate/contracts": "^11.0",
+        "illuminate/support": "^11.0",
+        "symfony/console": "^7.0",
+        "symfony/yaml": "^7.0"
     },
     "require-dev": {
         "orchestra/testbench": "^7.0|^8.0|^9.0",

phpstan.neon.dist

@@ -2,4 +2,4 @@ parameters:
   paths:
     - src
 
-  level: 0
+  level: 1

src/Console/AddCommand.php

@@ -30,16 +30,16 @@ class AddCommand extends Command
     /**
      * Execute the console command.
      *
-     * @return int|null
+     * @return void
      */
-    public function handle()
+    public function handle(): void
     {
         $services = $this->gatherServicesInteractively();
 
         if ($invalidServices = array_diff($services, $this->services)) {
-            $this->components->error('Invalid services ['.implode(',', $invalidServices).'].');
+            $this->components->error('Invalid services [' . implode(',', $invalidServices) . '].');
 
-            return 1;
+            return;
         }
 
         $this->buildDockerCompose($services);

src/Console/Concerns/InteractsWithDockerComposeServices.php

@@ -62,7 +62,7 @@ protected function buildDockerCompose(array $services)
 
         // Adds the new services as dependencies of the core service...
         if (! array_key_exists('core', $compose['services'])) {
-            $this->warn('Couldn\'t find the --core-- service. Make sure you add ['.implode(',', $services).'] to the depends_on config.');
+            $this->warn('Couldn\'t find the --core-- service. Make sure you add [' . implode(',', $services) . '] to the depends_on config.');
         } else {
             $compose['services']['core']['depends_on'] = collect($compose['services']['core']['depends_on'] ?? [])
                 ->merge($services)
@@ -111,9 +111,11 @@ protected function replaceEnvVariables(array $services)
     {
         $environment = file_get_contents($this->laravel->basePath('.env'));
 
-        if (in_array('mysql', $services) ||
+        if (
+            in_array('mysql', $services) ||
             in_array('mariadb', $services) ||
-            in_array('pgsql', $services)) {
+            in_array('pgsql', $services)
+        ) {
             $defaults = [
                 '# DB_HOST=127.0.0.1',
                 '# DB_PORT=3306',
@@ -130,7 +132,7 @@ protected function replaceEnvVariables(array $services)
         if (in_array('mysql', $services)) {
             $environment = preg_replace('/DB_CONNECTION=.*/', 'DB_CONNECTION=mysql', $environment);
             $environment = str_replace('DB_HOST=127.0.0.1', "DB_HOST=mysql", $environment);
-        }elseif (in_array('pgsql', $services)) {
+        } elseif (in_array('pgsql', $services)) {
             $environment = preg_replace('/DB_CONNECTION=.*/', 'DB_CONNECTION=pgsql', $environment);
             $environment = str_replace('DB_HOST=127.0.0.1', "DB_HOST=pgsql", $environment);
             $environment = str_replace('DB_PORT=3306', "DB_PORT=5432", $environment);
@@ -207,7 +209,7 @@ protected function prepareInstallation($services)
 
         if (count($services) > 0) {
             $this->runCommands([
-                './vendor/bin/nge pull '.implode(' ', $services),
+                './vendor/bin/nge pull ' . implode(' ', $services),
             ]);
         }
 
@@ -230,12 +232,12 @@ protected function runCommands($commands)
             try {
                 $process->setTty(true);
             } catch (\RuntimeException $e) {
-                $this->output->writeln('  <bg=yellow;fg=black> WARN </> '.$e->getMessage().PHP_EOL);
+                $this->output->writeln('  <bg=yellow;fg=black> WARN </> ' . $e->getMessage() . PHP_EOL);
             }
         }
 
         return $process->run(function ($type, $line) {
-            $this->output->write('    '.$line);
+            $this->output->write('    ' . $line);
         });
     }
 }

src/Console/InstallCommand.php

@@ -3,9 +3,7 @@
 namespace Dentro\Nge\Console;
 
 use Illuminate\Console\Command;
-use RuntimeException;
 use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Process\Process;
 
 #[AsCommand(name: 'nge:install')]
 class InstallCommand extends Command
@@ -29,10 +27,8 @@ class InstallCommand extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return int|null
      */
-    public function handle()
+    public function handle(): void
     {
         if ($this->option('no-interaction')) {
             $services = $this->defaultServices;
@@ -41,9 +37,9 @@ public function handle()
         }
 
         if ($invalidServices = array_diff($services, $this->services)) {
-            $this->components->error('Invalid services ['.implode(',', $invalidServices).'].');
+            $this->components->error('Invalid services [' . implode(',', $invalidServices) . '].');
 
-            return 1;
+            return;
         }
 
         $this->buildDockerCompose($services);
@@ -57,9 +53,11 @@ public function handle()
 
         $this->output->writeln('<fg=gray>➜</> <options=bold>./vendor/bin/nge up</>');
 
-        if (in_array('mysql', $services) ||
+        if (
+            in_array('mysql', $services) ||
             in_array('mariadb', $services) ||
-            in_array('pgsql', $services)) {
+            in_array('pgsql', $services)
+        ) {
             $this->components->warn('A database service was installed. Run "artisan migrate" to prepare your database:');
 
             $this->output->writeln('<fg=gray>➜</> <options=bold>./vendor/bin/nge artisan migrate</>');