Skip to content

Commit 3f55653

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: [PHPDoc] Fix some union type cases
2 parents 31bb2b3 + 2ac7479 commit 3f55653

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

Descriptor/Descriptor.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,36 +69,26 @@ protected function write(string $content, bool $decorated = false)
6969

7070
/**
7171
* Describes an InputArgument instance.
72-
*
73-
* @return string|mixed
7472
*/
7573
abstract protected function describeInputArgument(InputArgument $argument, array $options = []);
7674

7775
/**
7876
* Describes an InputOption instance.
79-
*
80-
* @return string|mixed
8177
*/
8278
abstract protected function describeInputOption(InputOption $option, array $options = []);
8379

8480
/**
8581
* Describes an InputDefinition instance.
86-
*
87-
* @return string|mixed
8882
*/
8983
abstract protected function describeInputDefinition(InputDefinition $definition, array $options = []);
9084

9185
/**
9286
* Describes a Command instance.
93-
*
94-
* @return string|mixed
9587
*/
9688
abstract protected function describeCommand(Command $command, array $options = []);
9789

9890
/**
9991
* Describes an Application instance.
100-
*
101-
* @return string|mixed
10292
*/
10393
abstract protected function describeApplication(Application $application, array $options = []);
10494
}

Descriptor/TextDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ private function formatDefaultValue($default): string
296296
}
297297

298298
/**
299-
* @param (Command|string)[] $commands
299+
* @param array<Command|string> $commands
300300
*/
301301
private function getColumnWidth(array $commands): int
302302
{

Helper/QuestionHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static function disableStty()
9999
/**
100100
* Asks the question to the user.
101101
*
102-
* @return bool|mixed|string|null
102+
* @return mixed
103103
*
104104
* @throws RuntimeException In case the fallback is deactivated and the response cannot be hidden
105105
*/

0 commit comments

Comments
 (0)