Skip to content

Commit bb5c61f

Browse files
committed
Merge branch '5.6' into 5.7
2 parents 040dc4c + dc40a6b commit bb5c61f

File tree

4 files changed

+12
-35
lines changed

4 files changed

+12
-35
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: php
22

33
php:
4-
- 7.0
54
- 7.1
5+
- 7.2
66

77
sudo: false
88

composer.json

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "laravelcollective/remote",
3-
"description": "Remote for The Laravel Framework.",
3+
"description": "Remote SSH access for The Laravel Framework.",
44
"license": "MIT",
55
"homepage": "http://laravelcollective.com",
66
"support": {
@@ -18,20 +18,17 @@
1818
}
1919
],
2020
"require": {
21-
"php": ">=7.0.0",
21+
"php": ">=7.1.3",
2222
"illuminate/support": "5.7.*",
2323
"illuminate/filesystem": "5.7.*",
2424
"phpseclib/phpseclib": "^2.0"
2525
},
2626
"require-dev": {
2727
"illuminate/console": "5.7.*",
28-
"mockery/mockery": "~0.9.4",
28+
"mockery/mockery": "~1.0",
2929
"phpunit/phpunit": "~5.5"
3030
},
3131
"extra": {
32-
"branch-alias": {
33-
"dev-master": "5.7-dev"
34-
},
3532
"laravel": {
3633
"providers": [
3734
"Collective\\Remote\\RemoteServiceProvider"

src/Connection.php

+2
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ public function __construct($name, $host, $username, array $auth, GatewayInterfa
8080
public function define($task, $commands)
8181
{
8282
$this->tasks[$task] = $commands;
83+
84+
return $this;
8385
}
8486

8587
/**

src/Console/TailCommand.php

+6-28
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
class TailCommand extends Command
1111
{
1212
/**
13-
* The console command name.
13+
* The console command signature.
1414
*
1515
* @var string
1616
*/
17-
protected $name = 'tail';
17+
protected $signature = 'tail
18+
{connection? : The remote connection name}
19+
{--path= : The fully qualified path to the log file.}
20+
{--lines=20 : The number of lines to tail.}';
1821

1922
/**
2023
* The console command description.
@@ -28,7 +31,7 @@ class TailCommand extends Command
2831
*
2932
* @return void
3033
*/
31-
public function fire()
34+
public function handle()
3235
{
3336
$path = $this->getPath($this->argument('connection'));
3437

@@ -162,29 +165,4 @@ protected function getRoot($connection)
162165
{
163166
return $this->laravel['config']['remote.connections.'.$connection.'.root'];
164167
}
165-
166-
/**
167-
* Get the console command arguments.
168-
*
169-
* @return array
170-
*/
171-
protected function getArguments()
172-
{
173-
return [
174-
['connection', InputArgument::OPTIONAL, 'The remote connection name'],
175-
];
176-
}
177-
178-
/**
179-
* Get the console command options.
180-
*
181-
* @return array
182-
*/
183-
protected function getOptions()
184-
{
185-
return [
186-
['path', null, InputOption::VALUE_OPTIONAL, 'The fully qualified path to the log file.'],
187-
['lines', null, InputOption::VALUE_OPTIONAL, 'The number of lines to tail.', 20],
188-
];
189-
}
190168
}

0 commit comments

Comments
 (0)