From 40a049b4bc37599f1aff938fa51ee4dce9bac5f3 Mon Sep 17 00:00:00 2001 From: Sean Fisher Date: Wed, 4 Jan 2023 15:30:16 -0500 Subject: [PATCH 1/3] Support isolation work --- app/providers/class-app-service-provider.php | 2 +- bootstrap/app.php | 2 +- composer.json | 4 ++-- config/app.php | 5 ++--- tests/trait-create-application.php | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/providers/class-app-service-provider.php b/app/providers/class-app-service-provider.php index 573ac73..cbf5c57 100644 --- a/app/providers/class-app-service-provider.php +++ b/app/providers/class-app-service-provider.php @@ -7,7 +7,7 @@ namespace App\Providers; -use Mantle\Framework\Providers\App_Service_Provider as Service_Provider; +use Mantle\Application\App_Service_Provider as Service_Provider; /** * Application Service Provider diff --git a/bootstrap/app.php b/bootstrap/app.php index a79679c..1f856d2 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -6,7 +6,7 @@ */ use Mantle\Contracts; -use Mantle\Framework\Application; +use Mantle\Application\Application; /** * Instantiate the application diff --git a/composer.json b/composer.json index c794dbd..fe261b9 100644 --- a/composer.json +++ b/composer.json @@ -6,12 +6,12 @@ "authors": [ { "name": "Alley", - "email": "info@alley.co" + "email": "mantle@alley.com" } ], "require": { "alleyinteractive/composer-wordpress-autoloader": "^1.0", - "alleyinteractive/mantle-framework": "^0.9", + "alleyinteractive/mantle-framework": "^0.10", "fakerphp/faker": "^1.9" }, "require-dev": { diff --git a/config/app.php b/config/app.php index afec0d8..3c49620 100644 --- a/config/app.php +++ b/config/app.php @@ -31,12 +31,11 @@ // Framework Providers. Mantle\Filesystem\Filesystem_Service_Provider::class, Mantle\Database\Factory_Service_Provider::class, - Mantle\Framework\Providers\Console_Service_Provider::class, Mantle\Framework\Providers\Error_Service_Provider::class, - Mantle\Framework\Providers\Model_Service_Provider::class, + Mantle\Database\Model_Service_Provider::class, Mantle\Queue\Queue_Service_Provider::class, Mantle\Query_Monitor\Query_Monitor_Service_Provider::class, - Mantle\Framework\Providers\New_Relic_Service_Provider::class, + Mantle\New_Relic\New_Relic_Service_Provider::class, Mantle\Database\Pagination\Paginator_Service_Provider::class, Mantle\Cache\Cache_Service_Provider::class, diff --git a/tests/trait-create-application.php b/tests/trait-create-application.php index de5f586..1aaf388 100644 --- a/tests/trait-create-application.php +++ b/tests/trait-create-application.php @@ -8,7 +8,7 @@ namespace App\Tests; use App\Http\Kernel; -use Mantle\Framework\Application; +use Mantle\Application\Application; /** * Concern for creating the application instance. @@ -17,7 +17,7 @@ trait Create_Application { /** * Creates the application from the application instance. * - * @return \Mantle\Framework\Application + * @return \Mantle\Application\Application */ public function create_application(): \Mantle\Contracts\Application { // Allow non-mantle-site usage. From dab0f3df22cf7ad82adebc7fcff3b48db9c1f8ea Mon Sep 17 00:00:00 2001 From: Sean Fisher Date: Wed, 4 Jan 2023 17:00:32 -0500 Subject: [PATCH 2/3] Fix reference --- app/exceptions/class-handler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/exceptions/class-handler.php b/app/exceptions/class-handler.php index 1010ccd..a0f3309 100644 --- a/app/exceptions/class-handler.php +++ b/app/exceptions/class-handler.php @@ -7,13 +7,13 @@ namespace App\Exceptions; -use Mantle\Framework\Exceptions\Handler as ExceptionHandler; +use Mantle\Framework\Exceptions\Handler as Base_Handler; use Throwable; /** * Application Error Handler */ -class Handler extends ExceptionHandler { +class Handler extends Base_Handler { /** * A list of the exception types that are not reported. From cae8914c3ef74d54baa04f10cf46e34a8a14cec4 Mon Sep 17 00:00:00 2001 From: Sean Fisher Date: Fri, 6 Jan 2023 14:07:32 -0500 Subject: [PATCH 3/3] Testing Github actions