Skip to content

Commit 08daad2

Browse files
authored
Merge pull request #48 from Codeception/remove-laravel6-exception-handler-decorator
Remove Laravel6\ExceptionHandlerDecorator
2 parents cb5acde + 9874619 commit 08daad2

File tree

2 files changed

+1
-103
lines changed

2 files changed

+1
-103
lines changed

src/Codeception/Lib/Connector/Laravel.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use Closure;
88
use Codeception\Lib\Connector\Laravel\ExceptionHandlerDecorator as LaravelExceptionHandlerDecorator;
9-
use Codeception\Lib\Connector\Laravel6\ExceptionHandlerDecorator as Laravel6ExceptionHandlerDecorator;
109
use Codeception\Module\Laravel as LaravelModule;
1110
use Codeception\Stub;
1211
use Dotenv\Dotenv;
@@ -154,14 +153,7 @@ private function initialize(SymfonyRequest $request = null): void
154153

155154
$this->getEvents()->listen('*', $listener);
156155

157-
// Replace the Laravel exception handler with our decorated exception handler,
158-
// so exceptions can be intercepted for the disable_exception_handling functionality.
159-
if (version_compare(Application::VERSION, '7.0.0', '<')) {
160-
$decorator = new Laravel6ExceptionHandlerDecorator($this->getExceptionHandler());
161-
} else {
162-
$decorator = new LaravelExceptionHandlerDecorator($this->getExceptionHandler());
163-
}
164-
156+
$decorator = new LaravelExceptionHandlerDecorator($this->getExceptionHandler());
165157
$decorator->exceptionHandlingDisabled($this->exceptionHandlingDisabled);
166158
$this->app->instance(ExceptionHandler::class, $decorator);
167159

src/Codeception/Lib/Connector/Laravel6/ExceptionHandlerDecorator.php

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)