Skip to content

Commit c69d8b4

Browse files
authored
Merge pull request #3289 from paulbalandan/phpdocs-cli
Fix PHPDocs for CLI
2 parents 57dd200 + 935b8a8 commit c69d8b4

4 files changed

Lines changed: 99 additions & 7 deletions

File tree

system/CLI/BaseCommand.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* CodeIgniter
45
*
@@ -106,7 +107,7 @@ abstract class BaseCommand
106107
* Instance of the CommandRunner controller
107108
* so commands can call other commands.
108109
*
109-
* @var \CodeIgniter\CLI\CommandRunner
110+
* @var \CodeIgniter\CLI\Commands
110111
*/
111112
protected $commands;
112113

@@ -115,8 +116,8 @@ abstract class BaseCommand
115116
/**
116117
* BaseCommand constructor.
117118
*
118-
* @param \Psr\Log\LoggerInterface $logger
119-
* @param Commands $commands
119+
* @param \Psr\Log\LoggerInterface $logger
120+
* @param \CodeIgniter\CLI\Commands $commands
120121
*/
121122
public function __construct(LoggerInterface $logger, Commands $commands)
122123
{

system/CLI/CommandRunner.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22

3-
43
/**
54
* CodeIgniter
65
*
@@ -57,6 +56,9 @@ class CommandRunner extends Controller
5756

5857
//--------------------------------------------------------------------
5958

59+
/**
60+
* Constructor
61+
*/
6062
public function __construct()
6163
{
6264
$this->commands = service('commands');

system/CLI/Commands.php

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,43 @@
1-
<?php namespace CodeIgniter\CLI;
1+
<?php
2+
3+
/**
4+
* CodeIgniter
5+
*
6+
* An open source application development framework for PHP
7+
*
8+
* This content is released under the MIT License (MIT)
9+
*
10+
* Copyright (c) 2014-2019 British Columbia Institute of Technology
11+
* Copyright (c) 2019-2020 CodeIgniter Foundation
12+
*
13+
* Permission is hereby granted, free of charge, to any person obtaining a copy
14+
* of this software and associated documentation files (the "Software"), to deal
15+
* in the Software without restriction, including without limitation the rights
16+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
17+
* copies of the Software, and to permit persons to whom the Software is
18+
* furnished to do so, subject to the following conditions:
19+
*
20+
* The above copyright notice and this permission notice shall be included in
21+
* all copies or substantial portions of the Software.
22+
*
23+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
24+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
26+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
27+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
28+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
29+
* THE SOFTWARE.
30+
*
31+
* @package CodeIgniter
32+
* @author CodeIgniter Dev Team
33+
* @copyright 2019-2020 CodeIgniter Foundation
34+
* @license https://opensource.org/licenses/MIT MIT License
35+
* @link https://codeigniter.com
36+
* @since Version 4.0.0
37+
* @filesource
38+
*/
39+
40+
namespace CodeIgniter\CLI;
241

342
use CodeIgniter\Log\Logger;
443
use Config\Services;
@@ -26,9 +65,14 @@ class Commands
2665
*/
2766
protected $logger;
2867

68+
/**
69+
* Constructor
70+
*
71+
* @param \CodeIgniter\Log\Logger|null $logger
72+
*/
2973
public function __construct($logger = null)
3074
{
31-
$this->logger = $logger === null ? service('logger') : $logger;
75+
$this->logger = $logger ?? service('logger');
3276
}
3377

3478
/**

system/CLI/Exceptions/CLIException.php

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,53 @@
1-
<?php namespace CodeIgniter\CLI\Exceptions;
1+
<?php
22

3+
/**
4+
* CodeIgniter
5+
*
6+
* An open source application development framework for PHP
7+
*
8+
* This content is released under the MIT License (MIT)
9+
*
10+
* Copyright (c) 2014-2019 British Columbia Institute of Technology
11+
* Copyright (c) 2019-2020 CodeIgniter Foundation
12+
*
13+
* Permission is hereby granted, free of charge, to any person obtaining a copy
14+
* of this software and associated documentation files (the "Software"), to deal
15+
* in the Software without restriction, including without limitation the rights
16+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
17+
* copies of the Software, and to permit persons to whom the Software is
18+
* furnished to do so, subject to the following conditions:
19+
*
20+
* The above copyright notice and this permission notice shall be included in
21+
* all copies or substantial portions of the Software.
22+
*
23+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
24+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
26+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
27+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
28+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
29+
* THE SOFTWARE.
30+
*
31+
* @package CodeIgniter
32+
* @author CodeIgniter Dev Team
33+
* @copyright 2019-2020 CodeIgniter Foundation
34+
* @license https://opensource.org/licenses/MIT MIT License
35+
* @link https://codeigniter.com
36+
* @since Version 4.0.0
37+
* @filesource
38+
*/
39+
40+
namespace CodeIgniter\CLI\Exceptions;
41+
42+
/**
43+
* CLIException
44+
*/
345
class CLIException extends \RuntimeException
446
{
547
/**
48+
* Thrown when `$color` specified for `$type` is not within the
49+
* allowed list of colors.
50+
*
651
* @param string $type
752
* @param string $color
853
*

0 commit comments

Comments
 (0)