Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#3827 from micheh/hotfi…
Browse files Browse the repository at this point in the history
…x/phpdoc-mismatch

Fix mismatches between the PHPDoc and the method signatures
  • Loading branch information
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/Writer/AbstractWriter.php
Expand Up @@ -284,6 +284,7 @@ public function write(array $event)
* Set a new formatter for this writer
*
* @param string|Formatter\FormatterInterface $formatter
* @param array|null $options
* @return self
* @throws Exception\InvalidArgumentException
*/
Expand All @@ -308,7 +309,7 @@ public function setFormatter($formatter, array $options = null)
/**
* Set convert write errors to exception flag
*
* @param bool $ignoreWriteErrors
* @param bool $convertErrors
*/
public function setConvertWriteErrorsToExceptions($convertErrors)
{
Expand Down
9 changes: 5 additions & 4 deletions src/Writer/FingersCrossed.php
Expand Up @@ -100,9 +100,10 @@ public function __construct($writer, $filterOrPriority = null, $bufferSize = 0)
}

/**
* Set a new formatter for this writer
* Set a new writer
*
* @param string|Formatter\FormatterInterface $formatter
* @param string|WriterInterface $writer
* @param array|null $options
* @return self
* @throws Exception\InvalidArgumentException
*/
Expand All @@ -114,7 +115,7 @@ public function setWriter($writer, array $options = null)

if (!$writer instanceof WriterInterface) {
throw new Exception\InvalidArgumentException(sprintf(
'Formatter must implement %s\Formatter\FormatterInterface; received "%s"',
'Writer must implement %s\WriterInterface; received "%s"',
__NAMESPACE__,
is_object($writer) ? get_class($writer) : gettype($writer)
));
Expand All @@ -141,7 +142,7 @@ public function getWriterPluginManager()
* Set writer plugin manager
*
* @param string|WriterPluginManager $plugins
* @return Logger
* @return FingersCrossed
* @throws Exception\InvalidArgumentException
*/
public function setWriterPluginManager($plugins)
Expand Down
1 change: 1 addition & 0 deletions src/Writer/ZendMonitor.php
Expand Up @@ -28,6 +28,7 @@ class ZendMonitor extends AbstractWriter
/**
* Constructor
*
* @param array|\Traversable|null $options
* @return ZendMonitor
*/
public function __construct($options = null)
Expand Down

0 comments on commit 040137b

Please sign in to comment.