@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Psr\Log\LoggerAwareTrait; |
| 6 | 6 | use Psr\Log\LoggerAwareInterface; |
| 7 | - |
|
| 8 | 7 | use Consolidation\AnnotatedCommand\Events\CustomEventAwareInterface; |
| 9 | 8 | use Consolidation\AnnotatedCommand\Events\CustomEventAwareTrait; |
| 10 | 9 | use Consolidation\OutputFormatters\StructuredData\PropertyList; |
@@ -90,6 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | /** |
| 92 | 92 | * Create a config object and load it from the provided paths. |
| 93 | + * @param string[] $paths |
|
| 93 | 94 | */ |
| 94 | 95 | public static function createConfiguration($paths) |
| 95 | 96 | { |
@@ -100,6 +101,7 @@ discard block |
||
| 100 | 101 | |
| 101 | 102 | /** |
| 102 | 103 | * Use a simple config loader to load configuration values from specified paths |
| 104 | + * @param Config $config |
|
| 103 | 105 | */ |
| 104 | 106 | public static function loadConfiguration($config, $paths) |
| 105 | 107 | { |
@@ -298,7 +300,7 @@ discard block |
||
| 298 | 300 | * @param string $id |
| 299 | 301 | * The ID of the service to retrieve. |
| 300 | 302 | * |
| 301 | - * @return mixed |
|
| 303 | + * @return \Symfony\Component\Console\Output\OutputInterface |
|
| 302 | 304 | * The specified service. |
| 303 | 305 | */ |
| 304 | 306 | public static function service($id) |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | 54 | * @param string $key |
| 55 | - * @param mixed $value |
|
| 55 | + * @param string|null $value |
|
| 56 | 56 | * |
| 57 | 57 | * @deprecated |
| 58 | 58 | */ |
@@ -117,7 +117,7 @@ |
||
| 117 | 117 | * Return the default value for a given configuration item. |
| 118 | 118 | * |
| 119 | 119 | * @param string $key |
| 120 | - * @param mixed $defaultOverride |
|
| 120 | + * @param string|null $defaultOverride |
|
| 121 | 121 | * |
| 122 | 122 | * @return mixed |
| 123 | 123 | */ |
@@ -1,6 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | use Robo\Robo; |
| 3 | - |
|
| 4 | 3 | use Robo\Config\ConfigProcessor; |
| 5 | 4 | use Robo\Config\YamlConfigLoader; |
| 6 | 5 | |
@@ -124,8 +124,7 @@ |
||
| 124 | 124 | foreach ($array2 as $key => &$value) { |
| 125 | 125 | if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) { |
| 126 | 126 | $merged[$key] = self::arrayMergeRecursiveDistinct($merged[$key], $value); |
| 127 | - } |
|
| 128 | - else { |
|
| 127 | + } else { |
|
| 129 | 128 | $merged[$key] = $value; |
| 130 | 129 | } |
| 131 | 130 | } |