Progress on v4

Author: daftspunk

composer.json

@@ -58,9 +58,6 @@
         ]
     },
     "extra": {
-        "branch-alias": {
-            "dev-develop": "3.x-dev"
-        },
         "laravel": {
             "providers": [
                 "October\\Rain\\Foundation\\Providers\\AppSupportServiceProvider",

src/Database/DatabaseServiceProvider.php

@@ -17,7 +17,6 @@ class DatabaseServiceProvider extends DatabaseServiceProviderBase
     public function register()
     {
         Model::clearBootedModels();
-        Model::clearExtendedClasses();
         Model::flushEventListeners();
 
         $this->registerConnectionServices();

src/Extension/ExtendableTrait.php

@@ -98,14 +98,6 @@ public static function extendableExtendCallback($callback)
         Container::$classCallbacks[$class][] = $callback;
     }
 
-    /**
-     * @deprecated use \October\Rain\Extension\Container::clearExtensions()
-     */
-    public static function clearExtendedClasses()
-    {
-        Container::clearExtensions();
-    }
-
     /**
      * extensionExtractImplements will return classes to implement.
      */
@@ -617,4 +609,12 @@ protected function getExtendableMethodFromDynamicMethods(string $name): ?callabl
 
         return $dynamicCallable;
     }
+
+    /**
+     * @deprecated use \October\Rain\Extension\Container::clearExtensions()
+     */
+    public static function clearExtendedClasses()
+    {
+        Container::clearExtensions();
+    }
 }

src/Foundation/Application.php

@@ -11,6 +11,7 @@
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Foundation\PackageManifest;
 use Illuminate\Foundation\ProviderRepository;
+use Illuminate\Log\Context\ContextServiceProvider;
 use Carbon\Laravel\ServiceProvider as CarbonServiceProvider;
 use Illuminate\Support\Env;
 use Throwable;
@@ -46,11 +47,11 @@ protected function registerBaseServiceProviders()
 
         $this->register(new LogServiceProvider($this));
 
+        $this->register(new ContextServiceProvider($this));
+
         $this->register(new RoutingServiceProvider($this));
 
         $this->register(new ExecutionContextProvider($this));
-
-        $this->register(new CarbonServiceProvider($this));
     }
 
     /**
@@ -192,20 +193,6 @@ protected function normalizeCachePath($key, $default)
             : $this->basePath($env);
     }
 
-    /**
-     * joinPaths together
-     *
-     * @todo Can be removed if Laravel >= 10
-     *
-     * @param  string  $basePath
-     * @param  string  $path
-     * @return string
-     */
-    public function joinPaths($basePath, $path = '')
-    {
-        return $basePath.($path != '' ? DIRECTORY_SEPARATOR.ltrim($path, DIRECTORY_SEPARATOR) : '');
-    }
-
     /**
      * before logic is called before the router runs.
      * @param  \Closure|string  $callback
@@ -312,6 +299,8 @@ public function registerConfiguredProviders()
 
         (new ProviderRepository($this, new Filesystem, $this->getCachedServicesPath()))
             ->load($providers->collapse()->toArray());
+
+        $this->fireAppCallbacks($this->registeredCallbacks);
     }
 
     /**
@@ -332,7 +321,7 @@ public function registerCoreContainerAliases()
             '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],
-            'files' => [\Illuminate\Filesystem\Filesystem::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],

src/Foundation/Configuration/ApplicationBuilder.php

@@ -0,0 +1,53 @@
+<?php namespace October\Rain\Foundation\Configuration;
+
+use Illuminate\Foundation\Configuration\ApplicationBuilder as ApplicationBuilderBase;
+use Illuminate\Foundation\Configuration\Exceptions;
+
+/**
+ * ApplicationBuilder foundation class as an extension of Laravel
+ */
+class ApplicationBuilder extends ApplicationBuilderBase
+{
+    /**
+     * Register the standard kernel classes for the application.
+     *
+     * @return $this
+     */
+    public function withKernels()
+    {
+        $this->app->singleton(
+            \Illuminate\Contracts\Http\Kernel::class,
+            \October\Rain\Foundation\Http\Kernel::class
+        );
+
+        $this->app->singleton(
+            \Illuminate\Contracts\Console\Kernel::class,
+            \October\Rain\Foundation\Console\Kernel::class
+        );
+
+        return $this;
+    }
+
+    /**
+     * Register and configure the application's exception handler.
+     *
+     * @param  callable|null  $using
+     * @return $this
+     */
+    // public function withExceptions(?callable $using = null)
+    // {
+    //     $this->app->singleton(
+    //         \Illuminate\Contracts\Debug\ExceptionHandler::class,
+    //         \October\Rain\Foundation\Exception\Handler::class
+    //     );
+
+    //     $using ??= fn () => true;
+
+    //     $this->app->afterResolving(
+    //         \Illuminate\Foundation\Exceptions\Handler::class,
+    //         fn ($handler) => $using(new Exceptions($handler)),
+    //     );
+
+    //     return $this;
+    // }
+}

src/Foundation/Providers/AppSupportServiceProvider.php

@@ -1,6 +1,7 @@
 <?php namespace October\Rain\Foundation\Providers;
 
 use Illuminate\Support\AggregateServiceProvider;
+use October\Rain\Extension\Container as OctoberContainer;
 
 /**
  * AppSupportServiceProvider supplies eager providers
@@ -17,4 +18,12 @@ class AppSupportServiceProvider extends AggregateServiceProvider
         \October\Rain\Html\UrlServiceProvider::class,
         \October\Rain\Argon\ArgonServiceProvider::class
     ];
+
+    /**
+     * register the service provider
+     */
+    public function register()
+    {
+        OctoberContainer::clearExtensions();
+    }
 }

src/Halcyon/HalcyonServiceProvider.php

@@ -34,8 +34,6 @@ public function register()
     {
         Model::clearBootedModels();
 
-        Model::clearExtendedClasses();
-
         Model::flushEventListeners();
 
         $this->app->singleton('halcyon', function ($app) {

src/Support/helpers.php

@@ -373,7 +373,7 @@ function array_except($array, $keys)
      * @param  mixed  $default
      * @return mixed
      */
-    function array_first($array, callable $callback = null, $default = null)
+    function array_first($array, $callback = null, $default = null)
     {
         return Arr::first($array, $callback, $default);
     }
@@ -440,7 +440,7 @@ function array_has($array, $keys)
      * @param  mixed  $default
      * @return mixed
      */
-    function array_last($array, callable $callback = null, $default = null)
+    function array_last($array, $callback = null, $default = null)
     {
         return Arr::last($array, $callback, $default);
     }