Skip to content

Commit

Permalink
Merge branch '5.6' into 5.7
Browse files Browse the repository at this point in the history
  • Loading branch information
mlantz committed Sep 5, 2018
2 parents 040dc4c + dc40a6b commit bb5c61f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: php

php:
- 7.0
- 7.1
- 7.2

sudo: false

Expand Down
9 changes: 3 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "laravelcollective/remote",
"description": "Remote for The Laravel Framework.",
"description": "Remote SSH access for The Laravel Framework.",
"license": "MIT",
"homepage": "http://laravelcollective.com",
"support": {
Expand All @@ -18,20 +18,17 @@
}
],
"require": {
"php": ">=7.0.0",
"php": ">=7.1.3",
"illuminate/support": "5.7.*",
"illuminate/filesystem": "5.7.*",
"phpseclib/phpseclib": "^2.0"
},
"require-dev": {
"illuminate/console": "5.7.*",
"mockery/mockery": "~0.9.4",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~5.5"
},
"extra": {
"branch-alias": {
"dev-master": "5.7-dev"
},
"laravel": {
"providers": [
"Collective\\Remote\\RemoteServiceProvider"
Expand Down
2 changes: 2 additions & 0 deletions src/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ public function __construct($name, $host, $username, array $auth, GatewayInterfa
public function define($task, $commands)
{
$this->tasks[$task] = $commands;

return $this;
}

/**
Expand Down
34 changes: 6 additions & 28 deletions src/Console/TailCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@
class TailCommand extends Command
{
/**
* The console command name.
* The console command signature.
*
* @var string
*/
protected $name = 'tail';
protected $signature = 'tail
{connection? : The remote connection name}
{--path= : The fully qualified path to the log file.}
{--lines=20 : The number of lines to tail.}';

/**
* The console command description.
Expand All @@ -28,7 +31,7 @@ class TailCommand extends Command
*
* @return void
*/
public function fire()
public function handle()
{
$path = $this->getPath($this->argument('connection'));

Expand Down Expand Up @@ -162,29 +165,4 @@ protected function getRoot($connection)
{
return $this->laravel['config']['remote.connections.'.$connection.'.root'];
}

/**
* Get the console command arguments.
*
* @return array
*/
protected function getArguments()
{
return [
['connection', InputArgument::OPTIONAL, 'The remote connection name'],
];
}

/**
* Get the console command options.
*
* @return array
*/
protected function getOptions()
{
return [
['path', null, InputOption::VALUE_OPTIONAL, 'The fully qualified path to the log file.'],
['lines', null, InputOption::VALUE_OPTIONAL, 'The number of lines to tail.', 20],
];
}
}

0 comments on commit bb5c61f

Please sign in to comment.