Skip to content

Commit

Permalink
Merge pull request #129 from alleyinteractive/application-isolation
Browse files Browse the repository at this point in the history
Application isolation work and upgrading to Mantle v0.10
  • Loading branch information
srtfisher authored Jan 6, 2023
2 parents ab16cc3 + cae8914 commit 1f3cefb
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions app/exceptions/class-handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion app/providers/class-app-service-provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

use Mantle\Contracts;
use Mantle\Framework\Application;
use Mantle\Application\Application;

/**
* Instantiate the application
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
5 changes: 2 additions & 3 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
4 changes: 2 additions & 2 deletions tests/trait-create-application.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down

0 comments on commit 1f3cefb

Please sign in to comment.