Progress on v4

Author: daftspunk

composer.json

@@ -57,14 +57,6 @@
             "phpbench run tests\\Benchmark\\ --report=default"
         ]
     },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "October\\Rain\\Foundation\\Providers\\AppSupportServiceProvider",
-                "October\\Rain\\Foundation\\Providers\\AppDeferSupportServiceProvider"
-            ]
-        }
-    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }

src/Foundation/Application.php

@@ -38,6 +38,25 @@ class Application extends ApplicationBase
      */
     protected $cachePath;
 
+    /**
+     * Begin configuring a new Laravel application instance.
+     *
+     * @param  string|null  $basePath
+     * @return \Illuminate\Foundation\Configuration\ApplicationBuilder
+     */
+    public static function configure($basePath = null)
+    {
+        if (!is_string($basePath)) {
+            $basePath = static::inferBasePath();
+        }
+
+        return (new Configuration\ApplicationBuilder(new static($basePath)))
+            ->withKernels()
+            ->withEvents()
+            ->withCommands()
+            ->withProviders();
+    }
+
     /**
      * registerBaseServiceProviders registers all of the base service providers
      */
@@ -289,7 +308,7 @@ public function setLocale($locale)
      */
     public function registerConfiguredProviders()
     {
-        $providers = Collection::make($this->config['app.providers'])
+        $providers = (new Collection($this->make('config')->get('app.providers')))
             ->partition(function ($provider) {
                 return strpos($provider, 'Illuminate\\') === 0 ||
                     strpos($provider, 'October\\Rain\\') === 0;
@@ -310,25 +329,27 @@ public function registerCoreContainerAliases()
     {
         $aliases = [
             'app' => [\October\Rain\Foundation\Application::class, \Illuminate\Contracts\Container\Container::class, \Illuminate\Contracts\Foundation\Application::class],
+            'auth' => [\Illuminate\Auth\AuthManager::class, \Illuminate\Contracts\Auth\Factory::class],
+            'auth.driver' => [\Illuminate\Contracts\Auth\Guard::class],
             'blade.compiler' => [\Illuminate\View\Compilers\BladeCompiler::class],
             'cache' => [\Illuminate\Cache\CacheManager::class, \Illuminate\Contracts\Cache\Factory::class],
-            'cache.store' => [\Illuminate\Cache\Repository::class, \Illuminate\Contracts\Cache\Repository::class],
+            'cache.store' => [\Illuminate\Cache\Repository::class, \Illuminate\Contracts\Cache\Repository::class, \Psr\SimpleCache\CacheInterface::class],
             'cache.psr6' => [\Symfony\Component\Cache\Adapter\Psr16Adapter::class, \Symfony\Component\Cache\Adapter\AdapterInterface::class, \Psr\Cache\CacheItemPoolInterface::class],
             'config' => [\Illuminate\Config\Repository::class, \Illuminate\Contracts\Config\Repository::class],
             'cookie' => [\Illuminate\Cookie\CookieJar::class, \Illuminate\Contracts\Cookie\Factory::class, \Illuminate\Contracts\Cookie\QueueingFactory::class],
-            'db' => [\Illuminate\Database\DatabaseManager::class],
+            'db' => [\Illuminate\Database\DatabaseManager::class, \Illuminate\Database\ConnectionResolverInterface::class],
             'db.connection' => [\Illuminate\Database\Connection::class, \Illuminate\Database\ConnectionInterface::class],
             'db.schema' => [\Illuminate\Database\Schema\Builder::class],
-            'encrypter' => [\Illuminate\Encryption\Encrypter::class, \Illuminate\Contracts\Encryption\Encrypter::class],
-            'events' => [\October\Rain\Events\Dispatcher::class, \Illuminate\Contracts\Events\Dispatcher::class],
+            'encrypter' => [\Illuminate\Encryption\Encrypter::class, \Illuminate\Contracts\Encryption\Encrypter::class, \Illuminate\Contracts\Encryption\StringEncrypter::class],
+            'events' => [\October\Rain\Events\Dispatcher::class, \Illuminate\Events\Dispatcher::class, \Illuminate\Contracts\Events\Dispatcher::class],
             'files' => [\October\Rain\Filesystem\Filesystem::class, \Illuminate\Filesystem\Filesystem::class],
             'filesystem' => [\Illuminate\Filesystem\FilesystemManager::class, \Illuminate\Contracts\Filesystem\Factory::class],
             'filesystem.disk' => [\Illuminate\Contracts\Filesystem\Filesystem::class],
             'filesystem.cloud' => [\Illuminate\Contracts\Filesystem\Cloud::class],
-            'hash' => [\Illuminate\Contracts\Hashing\Hasher::class],
+            'hash' => [\Illuminate\Hashing\HashManager::class],
             'hash.driver' => [\Illuminate\Contracts\Hashing\Hasher::class],
             'translator' => [\Illuminate\Translation\Translator::class, \Illuminate\Contracts\Translation\Translator::class],
-            'log' => [\Illuminate\Log\Logger::class, \Psr\Log\LoggerInterface::class],
+            'log' => [\Illuminate\Log\LogManager::class, \Psr\Log\LoggerInterface::class],
             'mail.manager' => [\Illuminate\Mail\MailManager::class, \Illuminate\Contracts\Mail\Factory::class],
             'mailer' => [\Illuminate\Mail\Mailer::class, \Illuminate\Contracts\Mail\Mailer::class, \Illuminate\Contracts\Mail\MailQueue::class],
             'auth.password' => [\Illuminate\Auth\Passwords\PasswordBrokerManager::class, \Illuminate\Contracts\Auth\PasswordBrokerFactory::class],

src/Foundation/Bootstrap/LoadConfiguration.php

@@ -24,7 +24,7 @@ public function bootstrap(Application $app)
         if (file_exists($cached = $app->getCachedConfigPath())) {
             $items = require $cached;
 
-            $loadedFromCache = true;
+            $app->instance('config_loaded_from_cache', $loadedFromCache = true);
         }
 
         // Next we will spin through all of the configuration files in the configuration

src/Foundation/Bootstrap/RegisterOctober.php

@@ -3,6 +3,7 @@
 use October\Rain\Support\Str;
 use October\Rain\Support\ClassLoader;
 use Illuminate\Contracts\Foundation\Application;
+use October\Rain\Extension\Container as OctoberContainer;
 
 /**
  * RegisterOctober specific features
@@ -77,6 +78,9 @@ public function bootstrap(Application $app)
         // Initialize class loader cache
         $loader = $app->make(ClassLoader::class);
         $loader->initManifest($app->getCachedClassesPath());
+
+        // Clear service container
+        OctoberContainer::clearExtensions();
     }
 
     /**

src/Foundation/Bootstrap/RegisterProviders.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace October\Rain\Foundation\Bootstrap;
+
+use Illuminate\Contracts\Foundation\Application;
+use October\Rain\Support\ServiceProvider;
+use Illuminate\Foundation\Bootstrap\RegisterProviders as RegisterProvidersBase;
+
+class RegisterProviders extends RegisterProvidersBase
+{
+    /**
+     * Carbon copy of parent except defaultProviders
+     */
+    protected function mergeAdditionalProviders(Application $app)
+    {
+        if (static::$bootstrapProviderPath &&
+            file_exists(static::$bootstrapProviderPath)) {
+            $packageProviders = require static::$bootstrapProviderPath;
+
+            foreach ($packageProviders as $index => $provider) {
+                if (! class_exists($provider)) {
+                    unset($packageProviders[$index]);
+                }
+            }
+        }
+
+        $app->make('config')->set(
+            'app.providers',
+            array_merge(
+                $app->make('config')->get('app.providers') ?? ServiceProvider::defaultProviders()->toArray(),
+                static::$merge,
+                array_values($packageProviders ?? []),
+            ),
+        );
+    }
+}

src/Foundation/Console/Kernel.php

@@ -19,7 +19,7 @@ class Kernel extends ConsoleKernel
         \Illuminate\Foundation\Bootstrap\RegisterFacades::class,
         \Illuminate\Foundation\Bootstrap\SetRequestForConsole::class,
         \October\Rain\Foundation\Bootstrap\RegisterOctober::class,
-        \Illuminate\Foundation\Bootstrap\RegisterProviders::class,
+        \October\Rain\Foundation\Bootstrap\RegisterProviders::class,
         \Illuminate\Foundation\Bootstrap\BootProviders::class,
     ];
 

src/Foundation/Http/Kernel.php

@@ -23,7 +23,7 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Bootstrap\HandleExceptions::class,
         \Illuminate\Foundation\Bootstrap\RegisterFacades::class,
         \October\Rain\Foundation\Bootstrap\RegisterOctober::class,
-        \Illuminate\Foundation\Bootstrap\RegisterProviders::class,
+        \October\Rain\Foundation\Bootstrap\RegisterProviders::class,
         \Illuminate\Foundation\Bootstrap\BootProviders::class,
     ];
     /**

src/Foundation/Providers/AppDeferSupportServiceProvider.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace October\Rain\Support;
+
+use Illuminate\Support\DefaultProviders as DefaultProvidersBase;
+
+class DefaultProviders extends DefaultProvidersBase
+{
+    /**
+     * Create a new default provider collection.
+     *
+     * @return void
+     */
+    public function __construct(?array $providers = null)
+    {
+        $this->providers = $providers ?: [
+            // October Providers
+            //
+            \October\Rain\Database\DatabaseServiceProvider::class,
+            \October\Rain\Halcyon\HalcyonServiceProvider::class,
+            \October\Rain\Filesystem\FilesystemServiceProvider::class,
+            \October\Rain\Html\UrlServiceProvider::class,
+            \October\Rain\Argon\ArgonServiceProvider::class,
+
+            // October Providers (Deferred)
+            \October\Rain\Mail\MailServiceProvider::class,
+            \October\Rain\Html\HtmlServiceProvider::class,
+            \October\Rain\Flash\FlashServiceProvider::class,
+            \October\Rain\Parse\ParseServiceProvider::class,
+            \October\Rain\Assetic\AsseticServiceProvider::class,
+            \October\Rain\Resize\ResizeServiceProvider::class,
+            \October\Rain\Validation\ValidationServiceProvider::class,
+            \October\Rain\Translation\TranslationServiceProvider::class,
+            \Illuminate\Auth\Passwords\PasswordResetServiceProvider:: class,
+
+            // October Console (Deferred)
+            \October\Rain\Foundation\Providers\ArtisanServiceProvider::class,
+            \October\Rain\Database\MigrationServiceProvider::class,
+            \October\Rain\Scaffold\ScaffoldServiceProvider::class,
+            \Illuminate\Foundation\Providers\ComposerServiceProvider::class,
+
+            // Laravel Providers
+            //
+            \Illuminate\Broadcasting\BroadcastServiceProvider::class,
+            \Illuminate\Bus\BusServiceProvider::class,
+            \Illuminate\Cache\CacheServiceProvider::class,
+            \Illuminate\Concurrency\ConcurrencyServiceProvider::class,
+            \Illuminate\Cookie\CookieServiceProvider::class,
+            \Illuminate\Encryption\EncryptionServiceProvider::class,
+            \Illuminate\Foundation\Providers\FoundationServiceProvider::class,
+            \Illuminate\Hashing\HashServiceProvider::class,
+            \Illuminate\Pagination\PaginationServiceProvider::class,
+            \Illuminate\Pipeline\PipelineServiceProvider::class,
+            \Illuminate\Queue\QueueServiceProvider::class,
+            \Illuminate\Redis\RedisServiceProvider::class,
+            \Illuminate\Session\SessionServiceProvider::class,
+            \Illuminate\View\ViewServiceProvider::class,
+        ];
+    }
+}

src/Foundation/Providers/AppSupportServiceProvider.php

@@ -31,4 +31,14 @@ protected function callBeforeResolving($name, $callback)
             $callback($this->app->make($name), $this->app);
         }
     }
+
+    /**
+     * Get the default providers for a Laravel application.
+     *
+     * @return \October\Rain\Support\DefaultProviders
+     */
+    public static function defaultProviders()
+    {
+        return new DefaultProviders;
+    }
 }