feat: Laravel 9 Support added (#994)

* feat: Laravel 9 support added

* chore: PHP upgrades to 8.0 for tests

* feat: autoload config from service provider

Author: mitulgolakiya

.github/workflows/run-tests.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v1
         with:
-          php-version: 7.3
+          php-version: 8.0
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
           coverage: none
 

composer.json

@@ -24,13 +24,14 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
-        "illuminate/support": "^8.0",
-        "laracasts/flash": "^3.2"
+        "php": "^8.0",
+        "illuminate/support": "^9.0",
+        "laracasts/flash": "^3.2",
+        "laravelcollective/html": "^6.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0|^9.3.3",
-        "mockery/mockery": "^1.3.1"
+        "phpunit/phpunit": "^9.5.10",
+        "mockery/mockery": "^1.4.4"
     },
     "autoload": {
         "psr-4": {

src/InfyOmGeneratorServiceProvider.php

@@ -30,11 +30,12 @@ class InfyOmGeneratorServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $configPath = __DIR__.'/../config/laravel_generator.php';
-
-        $this->publishes([
-            $configPath => config_path('infyom/laravel_generator.php'),
-        ]);
+        if ($this->app->runningInConsole()) {
+            $configPath = __DIR__.'/../config/laravel_generator.php';
+            $this->publishes([
+                $configPath => config_path('infyom/laravel_generator.php'),
+            ]);
+        }
     }
 
     /**
@@ -44,6 +45,8 @@ public function boot()
      */
     public function register()
     {
+        $this->mergeConfigFrom(__DIR__.'/../config/laravel_generator.php', 'infyom.laravel_generator');
+
         $this->app->singleton('infyom.publish', function ($app) {
             return new GeneratorPublishCommand();
         });