From 47b05eab7a97f164fd2f6e1f2cc4be9670e7534c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 9 Jan 2016 17:59:22 +0000 Subject: [PATCH] Fix type errors --- src/Composer/Command/SelfUpdateCommand.php | 5 +++++ src/Composer/Downloader/FilesystemException.php | 2 +- src/Composer/IO/ConsoleIO.php | 14 +++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php index 35c1b85ce..0d118b285 100644 --- a/src/Composer/Command/SelfUpdateCommand.php +++ b/src/Composer/Command/SelfUpdateCommand.php @@ -172,6 +172,11 @@ EOT return 0; } + /** + * @param string $localFilename + * @param string $newFilename + * @param string $backupTarget + */ protected function setLocalPhar($localFilename, $newFilename, $backupTarget = null) { try { diff --git a/src/Composer/Downloader/FilesystemException.php b/src/Composer/Downloader/FilesystemException.php index 2e5c6b48d..891ab5e4b 100644 --- a/src/Composer/Downloader/FilesystemException.php +++ b/src/Composer/Downloader/FilesystemException.php @@ -19,7 +19,7 @@ namespace Composer\Downloader; */ class FilesystemException extends \Exception { - public function __construct($message = null, $code = null, \Exception $previous = null) + public function __construct($message = '', $code = 0, \Exception $previous = null) { parent::__construct("Filesystem exception: \n".$message, $code, $previous); } diff --git a/src/Composer/IO/ConsoleIO.php b/src/Composer/IO/ConsoleIO.php index ae5b952ea..3867695f1 100644 --- a/src/Composer/IO/ConsoleIO.php +++ b/src/Composer/IO/ConsoleIO.php @@ -110,9 +110,9 @@ class ConsoleIO extends BaseIO } /** - * @param array $messages - * @param bool $newline - * @param bool $stderr + * @param array|string $messages + * @param bool $newline + * @param bool $stderr */ private function doWrite($messages, $newline, $stderr) { @@ -152,10 +152,10 @@ class ConsoleIO extends BaseIO } /** - * @param array $messages - * @param bool $newline - * @param int $size - * @param bool $stderr + * @param array|string $messages + * @param bool $newline + * @param int|null $size + * @param bool $stderr */ private function doOverwrite($messages, $newline, $size, $stderr) {