rewrite package auto-discovery

src/Illuminate/Foundation/Application.php

@@ -11,6 +11,7 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Log\LogServiceProvider;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Foundation\PackageManifest;
 use Illuminate\Events\EventServiceProvider;
 use Illuminate\Routing\RoutingServiceProvider;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -176,6 +177,10 @@ protected function registerBaseBindings()
         $this->instance('app', $this);
 
         $this->instance(Container::class, $this);
+
+        $this->instance(PackageManifest::class, new PackageManifest(
+            new Filesystem, $this->basePath(), $this->getCachedPackagesPath()
+        ));
     }
 
     /**
@@ -545,8 +550,10 @@ public function runningUnitTests()
      */
     public function registerConfiguredProviders()
     {
+        $providers = $this->make(PackageManifest::class)->providers();
+
         (new ProviderRepository($this, new Filesystem, $this->getCachedServicesPath()))
-                    ->load($this->config['app.providers']);
+                    ->load(array_merge($this->config['app.providers'], $providers));
     }
 
     /**

src/Illuminate/Foundation/Bootstrap/RegisterFacades.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Facades\Facade;
+use Illuminate\Foundation\PackageManifest;
 use Illuminate\Contracts\Foundation\Application;
 
 class RegisterFacades
@@ -20,6 +21,9 @@ public function bootstrap(Application $app)
 
         Facade::setFacadeApplication($app);
 
-        AliasLoader::getInstance($app->make('config')->get('app.aliases', []))->register();
+        AliasLoader::getInstance(array_merge(
+            $app->make('config')->get('app.aliases', []),
+            $app->make(PackageManifest::class)->aliases()
+        ))->register();
     }
 }

src/Illuminate/Foundation/ComposerScripts.php

@@ -32,6 +32,19 @@ public static function postUpdate(Event $event)
         static::clearCompiled();
     }
 
+    /**
+     * Handle the post-autoload-dump Composer event.
+     *
+     * @param  \Composer\Script\Event  $event
+     * @return void
+     */
+    public static function postAutoloadDump(Event $event)
+    {
+        require_once $event->getComposer()->getConfig()->get('vendor-dir').'/autoload.php';
+
+        static::clearCompiled();
+    }
+
     /**
      * Clear the cached Laravel bootstrapping files.
      *

src/Illuminate/Foundation/Console/Kernel.php

@@ -63,7 +63,6 @@ class Kernel implements KernelContract
         \Illuminate\Foundation\Bootstrap\RegisterFacades::class,
         \Illuminate\Foundation\Bootstrap\SetRequestForConsole::class,
         \Illuminate\Foundation\Bootstrap\RegisterProviders::class,
-        \Illuminate\Foundation\Bootstrap\RegisterPackageProviders::class,
         \Illuminate\Foundation\Bootstrap\BootProviders::class,
     ];
 

src/Illuminate/Foundation/Console/OptimizeCommand.php

@@ -20,27 +20,7 @@ class OptimizeCommand extends Command
      *
      * @var string
      */
-    protected $description = 'Optimize the framework for better performance';
-
-    /**
-     * The composer instance.
-     *
-     * @var \Illuminate\Support\Composer
-     */
-    protected $composer;
-
-    /**
-     * Create a new optimize command instance.
-     *
-     * @param  \Illuminate\Support\Composer  $composer
-     * @return void
-     */
-    public function __construct(Composer $composer)
-    {
-        parent::__construct();
-
-        $this->composer = $composer;
-    }
+    protected $description = 'Optimize the framework for better performance (deprecated)';
 
     /**
      * Execute the console command.
@@ -49,15 +29,7 @@ public function __construct(Composer $composer)
      */
     public function fire()
     {
-        $this->info('Generating optimized class loader');
-
-        if ($this->option('psr')) {
-            $this->composer->dumpAutoloads();
-        } else {
-            $this->composer->dumpOptimized();
-        }
-
-        $this->call('clear-compiled');
+        //
     }
 
     /**

src/Illuminate/Foundation/Exceptions/Handler.php

@@ -127,10 +127,14 @@ protected function shouldntReport(Exception $e)
      */
     protected function context()
     {
-        return array_filter([
-            'userId' => Auth::id(),
-            'email' => Auth::user()->email ?? null,
-        ]);
+        try {
+            return array_filter([
+                'userId' => Auth::id(),
+                'email' => Auth::user() ? Auth::user()->email : null,
+            ]);
+        } catch (Exception $e) {
+            return [];
+        }
     }
 
     /**

src/Illuminate/Foundation/Http/Kernel.php

@@ -39,7 +39,6 @@ class Kernel implements KernelContract
         \Illuminate\Foundation\Bootstrap\HandleExceptions::class,
         \Illuminate\Foundation\Bootstrap\RegisterFacades::class,
         \Illuminate\Foundation\Bootstrap\RegisterProviders::class,
-        \Illuminate\Foundation\Bootstrap\RegisterPackageProviders::class,
         \Illuminate\Foundation\Bootstrap\BootProviders::class,
     ];
 

src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php

@@ -43,6 +43,7 @@
 use Illuminate\Foundation\Console\VendorPublishCommand;
 use Illuminate\Console\Scheduling\ScheduleFinishCommand;
 use Illuminate\Database\Console\Seeds\SeederMakeCommand;
+use Illuminate\Foundation\Console\PackageDiscoverCommand;
 use Illuminate\Database\Console\Migrations\MigrateCommand;
 use Illuminate\Foundation\Console\NotificationMakeCommand;
 use Illuminate\Database\Console\Factories\FactoryMakeCommand;
@@ -96,6 +97,7 @@ class ArtisanServiceProvider extends ServiceProvider
         'MigrateRollback' => 'command.migrate.rollback',
         'MigrateStatus' => 'command.migrate.status',
         'Optimize' => 'command.optimize',
+        'PackageDiscover' => 'command.package.discover',
         'Preset' => 'command.preset',
         'QueueFailed' => 'command.queue.failed',
         'QueueFlush' => 'command.queue.flush',
@@ -567,6 +569,18 @@ protected function registerOptimizeCommand()
         });
     }
 
+    /**
+     * Register the command.
+     *
+     * @return void
+     */
+    protected function registerPackageDiscoverCommand()
+    {
+        $this->app->singleton('command.package.discover', function ($app) {
+            return new PackageDiscoverCommand;
+        });
+    }
+
     /**
      * Register the command.
      *