Skip to content

Commit 7497ed7

Browse files
committed
Updated tests
1 parent c091430 commit 7497ed7

6 files changed

Lines changed: 39 additions & 28 deletions

File tree

src/CLI/CLI.php

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class CLI {
4141
*
4242
* @var callable
4343
*/
44-
protected $error = null;
44+
protected $error;
4545

4646
/**
4747
* Init
@@ -75,7 +75,7 @@ public function __construct(array $args = [])
7575

7676
$this->args = $this->parse((!empty($args) || !isset($_SERVER['argv'])) ? $args: $_SERVER['argv']);
7777

78-
$this->error = function (Exception $error) {
78+
$this->error = function (Exception $error): void {
7979
Console::error($error->getMessage());
8080
};
8181

@@ -87,10 +87,10 @@ public function __construct(array $args = [])
8787
*
8888
* Set a callback function that will be initialized on application start
8989
*
90-
* @param $callback
90+
* @param callable $callback
9191
* @return $this
9292
*/
93-
public function init($callback)
93+
public function init(callable $callback): self
9494
{
9595
$this->init[] = $callback;
9696
return $this;
@@ -104,7 +104,7 @@ public function init($callback)
104104
* @param $callback
105105
* @return $this
106106
*/
107-
public function shutdown($callback)
107+
public function shutdown(callable $callback): self
108108
{
109109
$this->shutdown[] = $callback;
110110
return $this;
@@ -118,13 +118,22 @@ public function shutdown($callback)
118118
* @param $callback
119119
* @return $this
120120
*/
121-
public function error($callback)
121+
public function error(callable $callback): self
122122
{
123123
$this->error = $callback;
124124
return $this;
125125
}
126126

127-
public function task($name)
127+
/**
128+
* Task
129+
*
130+
* Add a new command task
131+
*
132+
* @param string $name
133+
*
134+
* @return Task
135+
*/
136+
public function task(string $name): Task
128137
{
129138
$task = new Task($name);
130139

@@ -134,14 +143,13 @@ public function task($name)
134143
}
135144

136145
/**
137-
*
138146
* task-name --foo=test
139147
*
140-
* @param $args
141-
* @return mixed
148+
* @param array $args
142149
* @throws Exception
150+
* @return array
143151
*/
144-
public function parse(array $args)
152+
public function parse(array $args): array
145153
{
146154
\array_shift($args); // Remove script path from args
147155

@@ -167,8 +175,10 @@ public function parse(array $args)
167175

168176
/**
169177
* Run
178+
*
179+
* @return $this
170180
*/
171-
public function run()
181+
public function run(): self
172182
{
173183
$command = isset($this->tasks[$this->command]) ? $this->tasks[$this->command] : null;
174184

@@ -212,12 +222,12 @@ public function run()
212222
*
213223
* Creates an validator instance and validate given value with given rules.
214224
*
215-
* @param $key
216-
* @param $param
217-
* @param $value
225+
* @param string $key
226+
* @param array $param
227+
* @param mixed $value
218228
* @throws Exception
219229
*/
220-
protected function validate($key, $param, $value)
230+
protected function validate(string $key, array $param, $value): void
221231
{
222232
if ('' !== $value) {
223233
// checking whether the class exists

src/CLI/Console.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ static public function warning(string $message)
8787
*
8888
* Log warning messages to console
8989
*
90-
* @param string $message
91-
* @return bool|int
90+
* @param string $question
91+
* @return string
9292
*/
9393
static public function confirm(string $question)
9494
{
9595
if(!self::isInteractive()) {
96-
return null;
96+
return '';
9797
}
9898

9999
self::log($question);
@@ -124,7 +124,7 @@ static public function exit(int $status = 0): void
124124
*
125125
* This function was inspired by: https://stackoverflow.com/a/13287902/2299554
126126
*/
127-
static public function execute(string $cmd, string $stdin = null, string &$stdout, string &$stderr, int $timeout = -1): int
127+
static public function execute(string $cmd, string $stdin = '', string &$stdout, string &$stderr, int $timeout = -1): int
128128
{
129129
$pipes = [];
130130
$process = \proc_open(
@@ -163,7 +163,7 @@ static public function execute(string $cmd, string $stdin = null, string &$stdou
163163
\fclose($pipes[2]);
164164
\proc_close($process);
165165

166-
return $status['exitcode'];
166+
return (int)$status['exitcode'];
167167
}
168168

169169
\usleep(100000);

src/CLI/Task.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class Task
4848
public function __construct(string $name)
4949
{
5050
$this->name = $name;
51+
$this->action = function(): void {};
5152
}
5253

5354
/**

tests/CLI/CLITest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
class CLITest extends TestCase
2323
{
24-
public function setUp()
24+
public function setUp(): void
2525
{
2626
}
2727

28-
public function tearDown()
28+
public function tearDown(): void
2929
{
3030
}
3131

@@ -69,7 +69,7 @@ public function testAppFailure()
6969
$this->assertEquals('', $result);
7070
}
7171

72-
public function testApp[]
72+
public function testAppArray()
7373
{
7474
ob_start();
7575

tests/CLI/ConsoleTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
class ConsoleTest extends TestCase
2020
{
21-
public function setUp()
21+
public function setUp(): void
2222
{
2323
}
2424

25-
public function tearDown()
25+
public function tearDown(): void
2626
{
2727
}
2828

tests/CLI/TaskTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ class TaskTest extends TestCase
2424
*/
2525
protected $task;
2626

27-
public function setUp()
27+
public function setUp(): void
2828
{
2929
$this->task = new Task('test');
3030
}
3131

32-
public function tearDown()
32+
public function tearDown(): void
3333
{
3434
$this->task = null;
3535
}

0 commit comments

Comments
 (0)