Skip to content

Commit 1f3cefb

Browse files
authored
Merge pull request #129 from alleyinteractive/application-isolation
Application isolation work and upgrading to Mantle v0.10
2 parents ab16cc3 + cae8914 commit 1f3cefb

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

app/exceptions/class-handler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
namespace App\Exceptions;
99

10-
use Mantle\Framework\Exceptions\Handler as ExceptionHandler;
10+
use Mantle\Framework\Exceptions\Handler as Base_Handler;
1111
use Throwable;
1212

1313
/**
1414
* Application Error Handler
1515
*/
16-
class Handler extends ExceptionHandler {
16+
class Handler extends Base_Handler {
1717

1818
/**
1919
* A list of the exception types that are not reported.

app/providers/class-app-service-provider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace App\Providers;
99

10-
use Mantle\Framework\Providers\App_Service_Provider as Service_Provider;
10+
use Mantle\Application\App_Service_Provider as Service_Provider;
1111

1212
/**
1313
* Application Service Provider

bootstrap/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
use Mantle\Contracts;
9-
use Mantle\Framework\Application;
9+
use Mantle\Application\Application;
1010

1111
/**
1212
* Instantiate the application

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"authors": [
77
{
88
"name": "Alley",
9-
"email": "info@alley.co"
9+
"email": "mantle@alley.com"
1010
}
1111
],
1212
"require": {
1313
"alleyinteractive/composer-wordpress-autoloader": "^1.0",
14-
"alleyinteractive/mantle-framework": "^0.9",
14+
"alleyinteractive/mantle-framework": "^0.10",
1515
"fakerphp/faker": "^1.9"
1616
},
1717
"require-dev": {

config/app.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@
3131
// Framework Providers.
3232
Mantle\Filesystem\Filesystem_Service_Provider::class,
3333
Mantle\Database\Factory_Service_Provider::class,
34-
Mantle\Framework\Providers\Console_Service_Provider::class,
3534
Mantle\Framework\Providers\Error_Service_Provider::class,
36-
Mantle\Framework\Providers\Model_Service_Provider::class,
35+
Mantle\Database\Model_Service_Provider::class,
3736
Mantle\Queue\Queue_Service_Provider::class,
3837
Mantle\Query_Monitor\Query_Monitor_Service_Provider::class,
39-
Mantle\Framework\Providers\New_Relic_Service_Provider::class,
38+
Mantle\New_Relic\New_Relic_Service_Provider::class,
4039
Mantle\Database\Pagination\Paginator_Service_Provider::class,
4140
Mantle\Cache\Cache_Service_Provider::class,
4241

tests/trait-create-application.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace App\Tests;
99

1010
use App\Http\Kernel;
11-
use Mantle\Framework\Application;
11+
use Mantle\Application\Application;
1212

1313
/**
1414
* Concern for creating the application instance.
@@ -17,7 +17,7 @@ trait Create_Application {
1717
/**
1818
* Creates the application from the application instance.
1919
*
20-
* @return \Mantle\Framework\Application
20+
* @return \Mantle\Application\Application
2121
*/
2222
public function create_application(): \Mantle\Contracts\Application {
2323
// Allow non-mantle-site usage.

0 commit comments

Comments
 (0)