Update Laravel components to 9.*

evolution-cms · Feb 17, 2022 · fc03d29 · fc03d29
1 parent 4daa050
commit fc03d29
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 20 deletions.
diff --git a/core/composer.json b/core/composer.json
@@ -40,27 +40,27 @@
     "vlucas/phpdotenv": "^5.2",
     "guzzlehttp/guzzle": "^7.0.1",
     "composer/composer": "*",
-    "illuminate/cache": "8.*",
-    "illuminate/redis": "8.*",
-    "illuminate/config": "8.*",
-    "illuminate/console": "8.*",
-    "illuminate/container": "8.*",
-    "illuminate/database": "8.*",
-    "illuminate/events": "8.*",
-    "illuminate/filesystem": "8.*",
-    "illuminate/log": "8.*",
-    "illuminate/pagination": "8.*",
-    "illuminate/routing": "8.*",
-    "illuminate/support": "8.*",
-    "illuminate/translation": "8.*",
-    "illuminate/view": "8.*",
-    "illuminate/validation": "8.*",
-    "illuminate/http": "8.*",
+    "illuminate/cache": "9.*",
+    "illuminate/redis": "9.*",
+    "illuminate/config": "9.*",
+    "illuminate/console": "9.*",
+    "illuminate/container": "9.*",
+    "illuminate/database": "9.*",
+    "illuminate/events": "9.*",
+    "illuminate/filesystem": "9.*",
+    "illuminate/log": "9.*",
+    "illuminate/pagination": "9.*",
+    "illuminate/routing": "9.*",
+    "illuminate/support": "9.*",
+    "illuminate/translation": "9.*",
+    "illuminate/view": "9.*",
+    "illuminate/validation": "9.*",
+    "illuminate/http": "9.*",
     "league/flysystem": "^1.0.8",
     "phpmailer/phpmailer": "6.*",
     "tracy/tracy": "2.9.*",
     "wikimedia/composer-merge-plugin": "2.*",
-    "symfony/process": "^5.1",
+    "symfony/process": "6.*",
     "dmitry-suffi/redis-session-handler": "*",
     "rosell-dk/webp-convert": "*",
     "predis/predis": "*",

diff --git a/core/src/Console.php b/core/src/Console.php
@@ -6,6 +6,7 @@
 use Illuminate\Console\Events;
 use Illuminate\Http\Request;
 use Symfony\Component\Console\Application as SymfonyApplication;
+use Symfony\Component\Console\Input\InputDefinition;
 
 class Console extends Artisan
 {
@@ -30,7 +31,7 @@ public function __construct(Container $laravel, Dispatcher $events, $version)
     /**
      * @{inheritDoc}
      */
-    protected function getDefaultInputDefinition()
+    protected function getDefaultInputDefinition(): InputDefinition
     {
         return SymfonyApplication::getDefaultInputDefinition();
     }

diff --git a/core/src/Providers/ArtisanServiceProvider.php b/core/src/Providers/ArtisanServiceProvider.php
@@ -147,7 +147,7 @@ protected function registerClearCompiledCommand()
     protected function registerMigrateCommand()
     {
         $this->app->singleton('command.migrate', function ($app) {
-            return new MigrateCommand($app['migrator']);
+            return new MigrateCommand($app['migrator'], $app['events']);
         });
     }
 

diff --git a/core/src/Traits/Path.php b/core/src/Traits/Path.php
@@ -83,9 +83,10 @@ public function publicPath($path = '')
     /**
      * Get the path to the storage directory.
      *
+     * @param  string  $path
      * @return string
      */
-    public function storagePath()
+    public function storagePath($path = '')
     {
         return $this->storagePath ?: EVO_STORAGE_PATH;
     }
@@ -389,4 +390,25 @@ public function terminate()
 
     }
 
+    /**
+     * Register a terminating callback with the application.
+     *
+     * @param  callable|string  $callback
+     * @return \Illuminate\Contracts\Foundation\Application
+     */
+    public function terminating($callback)
+    {
+
+    }
+
+    /**
+     * Get an instance of the maintenance mode manager implementation.
+     *
+     * @return \Illuminate\Contracts\Foundation\MaintenanceMode
+     */
+    public function maintenanceMode()
+    {
+
+    }
+
 }