Replace typed deprecated contract usages with Kernel implementation

Author: caendesilva

app/bootstrap.php

@@ -52,7 +52,7 @@
 );
 
 $app->singleton(
-    Hyde\Framework\Contracts\HydeKernelContract::class, function () {
+    Hyde\Framework\HydeKernel::class, function () {
         return Hyde\Framework\HydeKernel::getInstance();
     }
 );

packages/framework/src/Contracts/HydeKernelContract.php

@@ -2,6 +2,8 @@
 
 namespace Hyde\Framework\Contracts;
 
+use Hyde\Framework\HydeKernel;
+
 /**
  * The HydeKernel encapsulates a HydePHP project,
  * providing helpful methods for interacting with it.
@@ -18,7 +20,7 @@
  * @example \Hyde\Framework\Hyde::foo()
  *
  * - You can also use Dependency Injection to inject the Kernel into your own classes:
- * @example `__construct(HydeKernelContract $hyde)`
+ * @example `__construct(HydeKernel $hyde)`
  *
  * - Or, you can use the hyde() function to get the Kernel:
  * @example `$hyde = hyde();
@@ -30,9 +32,9 @@ interface HydeKernelContract
 {
     public function boot(): void;
 
-    public static function setInstance(HydeKernelContract $instance): void;
+    public static function setInstance(HydeKernel $instance): void;
 
-    public static function getInstance(): HydeKernelContract;
+    public static function getInstance(): HydeKernel;
 
     public function getBasePath(): string;
 

packages/framework/src/Foundation/BaseSystemCollection.php

@@ -2,7 +2,7 @@
 
 namespace Hyde\Framework\Foundation;
 
-use Hyde\Framework\Contracts\HydeKernelContract;
+use Hyde\Framework\HydeKernel;
 use Illuminate\Support\Collection;
 
 /**
@@ -14,11 +14,11 @@
  */
 abstract class BaseSystemCollection extends Collection
 {
-    protected HydeKernelContract $kernel;
+    protected HydeKernel $kernel;
 
     abstract protected function runDiscovery(): self;
 
-    public static function boot(HydeKernelContract $kernel): static
+    public static function boot(HydeKernel $kernel): static
     {
         return (new static())->setKernel($kernel)->runDiscovery();
     }
@@ -28,7 +28,7 @@ protected function __construct($items = [])
         parent::__construct($items);
     }
 
-    protected function setKernel(HydeKernelContract $kernel): static
+    protected function setKernel(HydeKernel $kernel): static
     {
         $this->kernel = $kernel;
 

packages/framework/src/Foundation/Filesystem.php

@@ -2,7 +2,7 @@
 
 namespace Hyde\Framework\Foundation;
 
-use Hyde\Framework\Contracts\HydeKernelContract;
+use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
@@ -19,9 +19,9 @@
  */
 class Filesystem
 {
-    protected HydeKernelContract $kernel;
+    protected HydeKernel $kernel;
 
-    public function __construct(HydeKernelContract $kernel)
+    public function __construct(HydeKernel $kernel)
     {
         $this->kernel = $kernel;
     }

packages/framework/src/Hyde.php

@@ -2,7 +2,7 @@
 
 namespace Hyde\Framework;
 
-use Hyde\Framework\Contracts\HydeKernelContract;
+use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Foundation\FileCollection;
 use Hyde\Framework\Foundation\PageCollection;
@@ -46,9 +46,9 @@
  * @method static string makeTitle(string $slug)
  * @method static array toArray()
  * @method static bool hasSiteUrl()
- * @method static void setInstance(HydeKernelContract $instance)
+ * @method static void setInstance(HydeKernel $instance)
  * @method static string getBasePath()
- * @method static HydeKernelContract getInstance()
+ * @method static HydeKernel getInstance()
  * @method static string getDocumentationPagePath(string $path = '')
  */
 class Hyde extends Facade

packages/framework/src/HydeKernel.php

@@ -33,7 +33,7 @@ class HydeKernel implements HydeKernelContract, Arrayable, \JsonSerializable
     use Macroable;
     use JsonSerializesArrayable;
 
-    protected static HydeKernelContract $instance;
+    protected static HydeKernel $instance;
 
     protected string $basePath;
 
@@ -62,12 +62,12 @@ public function boot(): void
         $this->routes = RouteCollection::boot($this);
     }
 
-    public static function setInstance(HydeKernelContract $instance): void
+    public static function setInstance(HydeKernel $instance): void
     {
         static::$instance = $instance;
     }
 
-    public static function getInstance(): HydeKernelContract
+    public static function getInstance(): HydeKernel
     {
         return static::$instance;
     }

packages/framework/src/helpers.php

@@ -1,17 +1,17 @@
 <?php
 
-use Hyde\Framework\Contracts\HydeKernelContract;
+use Hyde\Framework\HydeKernel;
 use Illuminate\Contracts\Support\Arrayable;
 
 if (! function_exists('hyde')) {
     /**
      * Get the available HydeKernel instance.
      *
-     * @return \Hyde\Framework\Contracts\HydeKernelContract
+     * @return \Hyde\Framework\HydeKernel
      */
-    function hyde(): HydeKernelContract
+    function hyde(): HydeKernel
     {
-        return app(HydeKernelContract::class);
+        return app(HydeKernel::class);
     }
 }
 

packages/framework/tests/Feature/HydeKernelTest.php

@@ -2,7 +2,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Contracts\HydeKernelContract;
+use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Hyde;
@@ -29,22 +29,22 @@ class HydeKernelTest extends TestCase
 {
     public function test_kernel_singleton_can_be_accessed_by_service_container()
     {
-        $this->assertSame(app(HydeKernelContract::class), app(HydeKernelContract::class));
+        $this->assertSame(app(HydeKernel::class), app(HydeKernel::class));
     }
 
     public function test_kernel_singleton_can_be_accessed_by_kernel_static_method()
     {
-        $this->assertSame(app(HydeKernelContract::class), HydeKernel::getInstance());
+        $this->assertSame(app(HydeKernel::class), HydeKernel::getInstance());
     }
 
     public function test_kernel_singleton_can_be_accessed_by_hyde_facade_method()
     {
-        $this->assertSame(app(HydeKernelContract::class), Hyde::getInstance());
+        $this->assertSame(app(HydeKernel::class), Hyde::getInstance());
     }
 
     public function test_kernel_singleton_can_be_accessed_by_helper_function()
     {
-        $this->assertSame(app(HydeKernelContract::class), hyde());
+        $this->assertSame(app(HydeKernel::class), hyde());
     }
 
     public function test_hyde_facade_version_method_returns_kernel_version()
@@ -54,7 +54,7 @@ public function test_hyde_facade_version_method_returns_kernel_version()
 
     public function test_hyde_facade_get_facade_root_method_returns_kernel_singleton()
     {
-        $this->assertSame(app(HydeKernelContract::class), Hyde::getFacadeRoot());
+        $this->assertSame(app(HydeKernel::class), Hyde::getFacadeRoot());
         $this->assertSame(HydeKernel::getInstance(), Hyde::getFacadeRoot());
         $this->assertSame(Hyde::getInstance(), Hyde::getFacadeRoot());
     }