Skip to content

Commit

Permalink
Merge pull request #172 from laravel/symfony5.0
Browse files Browse the repository at this point in the history
[1.x] Allow Symfony 5
  • Loading branch information
driesvints authored Nov 25, 2019
2 parents 0b00697 + 11c163e commit d6286ed
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"require": {
"illuminate/support": "~4.1 || ~5.0 || ^6.0",
"nategood/httpful": "~0.2",
"symfony/console": "~3.0 || ~4.0",
"symfony/process": "~3.0 || ~4.0"
"symfony/console": "~3.0 || ~4.0 || ^5.0",
"symfony/process": "~3.0 || ~4.0 || ^5.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0"
Expand Down
6 changes: 4 additions & 2 deletions src/Console/InitCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ protected function configure()
/**
* Execute the command.
*
* @return void
* @return int
*/
protected function fire()
{
if (file_exists(getcwd().'/Envoy.blade.php')) {
$this->output->writeln('<error>Envoy file already exists!</error>');

return;
return 1;
}

file_put_contents(getcwd().'/Envoy.blade.php', "@servers(['web' => '".$this->input->getArgument('host')."'])
Expand All @@ -44,5 +44,7 @@ protected function fire()
");

$this->output->writeln('<info>Envoy file created!</info>');

return 0;
}
}
4 changes: 3 additions & 1 deletion src/Console/SshCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ protected function configure()
/**
* Execute the command.
*
* @return void
* @return int
*/
protected function fire()
{
$host = $this->getServer($container = $this->loadTaskContainer());

passthru('ssh '.($this->getConfiguredServer($host) ?: $host));

return 0;
}

/**
Expand Down
4 changes: 3 additions & 1 deletion src/Console/TasksCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ protected function configure()
/**
* Execute the command.
*
* @return void
* @return int
*/
protected function fire()
{
Expand All @@ -34,6 +34,8 @@ protected function fire()
$this->output->writeln('');

$this->listMacros($container);

return 0;
}

/**
Expand Down

0 comments on commit d6286ed

Please sign in to comment.