Skip to content

[4.x] Update to Symfony 5 #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@ php:

env:
matrix:
- LARAVEL=^6.0
- LARAVEL=^7.0

matrix:
fast_finish: true
allow_failures:
- env: LARAVEL=^7.0

before_install:
- phpenv config-rm xdebug.ini || true
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
"ext-pcntl": "*",
"ext-posix": "*",
"cakephp/chronos": "^1.0",
"illuminate/contracts": "^6.0|^7.0",
"illuminate/queue": "^6.0|^7.0",
"illuminate/support": "^6.0|^7.0",
"illuminate/contracts": "^7.0",
"illuminate/queue": "^7.0",
"illuminate/support": "^7.0",
"ramsey/uuid": "^3.5",
"symfony/process": "^4.3",
"symfony/debug": "^4.3"
"symfony/process": "^5.0",
"symfony/error-handler": "^5.0"
},
"require-dev": {
"mockery/mockery": "^1.0",
"orchestra/testbench": "^4.0|^5.0",
"orchestra/testbench": "^5.0",
"phpunit/phpunit": "^8.0",
"predis/predis": "^1.1"
},
Expand Down
5 changes: 1 addition & 4 deletions src/Console/InstallCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
namespace Laravel\Horizon\Console;

use Illuminate\Console\Command;
use Illuminate\Console\DetectsApplicationNamespace;
use Illuminate\Support\Str;

class InstallCommand extends Command
{
use DetectsApplicationNamespace;

/**
* The name and signature of the console command.
*
Expand Down Expand Up @@ -52,7 +49,7 @@ public function handle()
*/
protected function registerHorizonServiceProvider()
{
$namespace = Str::replaceLast('\\', '', $this->getAppNamespace());
$namespace = Str::replaceLast('\\', '', $this->laravel->getNamespace());

$appConfig = file_get_contents(config_path('app.php'));

Expand Down
5 changes: 1 addition & 4 deletions src/MasterSupervisor.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Laravel\Horizon\Contracts\SupervisorRepository;
use Laravel\Horizon\Contracts\Terminable;
use Laravel\Horizon\Events\MasterSupervisorLooped;
use Symfony\Component\Debug\Exception\FatalThrowableError;
use Throwable;

class MasterSupervisor implements Pausable, Restartable, Terminable
Expand Down Expand Up @@ -246,10 +245,8 @@ public function loop()
$this->persist();

event(new MasterSupervisorLooped($this));
} catch (Exception $e) {
app(ExceptionHandler::class)->report($e);
} catch (Throwable $e) {
app(ExceptionHandler::class)->report(new FatalThrowableError($e));
app(ExceptionHandler::class)->report($e);
}
}

Expand Down
5 changes: 1 addition & 4 deletions src/Supervisor.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
use Laravel\Horizon\Contracts\SupervisorRepository;
use Laravel\Horizon\Contracts\Terminable;
use Laravel\Horizon\Events\SupervisorLooped;
use Symfony\Component\Debug\Exception\FatalThrowableError;
use Throwable;

class Supervisor implements Pausable, Restartable, Terminable
Expand Down Expand Up @@ -308,10 +307,8 @@ public function loop()
$this->persist();

event(new SupervisorLooped($this));
} catch (Exception $e) {
app(ExceptionHandler::class)->report($e);
} catch (Throwable $e) {
app(ExceptionHandler::class)->report(new FatalThrowableError($e));
app(ExceptionHandler::class)->report($e);
}
}

Expand Down