From 663ed66d86de710369e355fa1c0ec5b439e75ddb Mon Sep 17 00:00:00 2001 From: Zaahid Bateson Date: Mon, 22 Apr 2024 20:20:48 -0700 Subject: [PATCH] php-cs-fixer fixes --- src/ErrorBag.php | 4 ++-- src/Header/AbstractHeader.php | 4 ++-- src/Header/AddressHeader.php | 2 +- .../Consumer/AddressBaseConsumerService.php | 2 -- .../Consumer/AddressConsumerService.php | 2 +- .../Consumer/CommentConsumerService.php | 2 -- .../Consumer/ParameterConsumerService.php | 15 ++++++------- .../ParameterNameValueConsumerService.php | 2 +- .../ParameterValueConsumerService.php | 2 +- .../Consumer/QuotedStringConsumerService.php | 2 -- ...gMimeLiteralPartTokenSplitPatternTrait.php | 3 ++- .../Consumer/ReceivedConsumerService.php | 2 -- src/Header/DateHeader.php | 2 +- src/Header/GenericHeader.php | 2 +- src/Header/IdHeader.php | 2 +- src/Header/MimeEncodedHeader.php | 6 +++--- src/Header/ParameterHeader.php | 2 +- src/Header/Part/AddressPart.php | 7 +++---- src/Header/Part/CommentPart.php | 2 +- src/Header/Part/ContainerPart.php | 4 ++-- src/Header/Part/HeaderPart.php | 2 +- src/Header/Part/HeaderPartFactory.php | 2 +- src/Header/Part/ParameterPart.php | 2 +- src/Header/Part/ReceivedDomainPart.php | 2 +- src/Header/Part/SplitParameterPart.php | 2 +- src/Header/Part/Token.php | 1 - src/Header/ReceivedHeader.php | 2 +- src/Header/SubjectHeader.php | 2 +- src/MailMimeParser.php | 11 +++++----- src/Message/Factory/IMessagePartFactory.php | 4 ++-- src/Message/Factory/IMimePartFactory.php | 2 +- src/Message/Factory/IUUEncodedPartFactory.php | 2 +- .../Factory/PartStreamContainerFactory.php | 2 +- src/Message/MessagePart.php | 4 ++-- src/Message/MimePart.php | 4 ++-- src/Message/MultiPart.php | 2 +- src/Message/PartHeaderContainer.php | 2 +- src/Message/PartStreamContainer.php | 5 ++--- src/Parser/Part/ParserPartStreamContainer.php | 2 +- src/Stream/HeaderStream.php | 1 - src/Stream/MessagePartStream.php | 6 +++--- src/Stream/MessagePartStreamDecorator.php | 2 -- src/Stream/MessagePartStreamReadException.php | 2 +- src/di_config.php | 2 +- tests/MailMimeParser/ErrorBagTest.php | 1 - tests/MailMimeParser/ErrorTest.php | 1 - .../Header/AddressHeaderTest.php | 2 +- .../AddressBaseConsumerServiceTest.php | 1 + .../Consumer/AddressConsumerServiceTest.php | 1 + .../AddressEmailConsumerServiceTest.php | 2 +- .../AddressGroupConsumerServiceTest.php | 2 +- .../Consumer/CommentConsumerServiceTest.php | 2 +- .../Consumer/DateConsumerServiceTest.php | 2 +- ...ericConsumerMimeLiteralPartServiceTest.php | 2 +- .../Consumer/GenericConsumerServiceTest.php | 1 + .../Consumer/IdBaseConsumerServiceTest.php | 2 +- .../Header/Consumer/IdConsumerServiceTest.php | 2 +- .../Consumer/ParameterConsumerServiceTest.php | 2 +- .../ParameterNameValueConsumerServiceTest.php | 1 + .../ParameterValueConsumerServiceTest.php | 2 +- .../QuotedStringConsumerServiceTest.php | 2 +- ...ringMimeLiteralPartConsumerServiceTest.php | 1 + .../Received/DomainConsumerServiceTest.php | 2 +- .../GenericReceivedConsumerServiceTest.php | 2 +- .../ReceivedDateConsumerServiceTest.php | 2 +- .../Consumer/ReceivedConsumerServiceTest.php | 13 ++++++++++-- .../Consumer/SubjectConsumerServiceTest.php | 2 +- .../MailMimeParser/Header/DateHeaderTest.php | 2 +- .../Header/GenericHeaderTest.php | 4 ++-- .../Header/HeaderFactoryTest.php | 20 ++++++++++++------ tests/MailMimeParser/Header/IdHeaderTest.php | 2 +- .../Header/MimeEncodedHeaderTest.php | 2 +- .../Header/ParameterHeaderTest.php | 7 ++++--- .../Header/Part/AddressGroupPartTest.php | 6 +++++- .../Header/Part/AddressPartTest.php | 2 ++ .../Header/Part/CommentPartTest.php | 2 ++ .../Header/Part/ContainerPartTest.php | 12 ++++++----- .../Header/Part/DatePartTest.php | 1 + .../Header/Part/HeaderPartFactoryTest.php | 2 ++ .../Header/Part/HeaderPartTest.php | 1 + .../Header/Part/MimeTokenPartFactoryTest.php | 1 - .../Header/Part/NameValuePartTest.php | 19 +++++++++-------- .../Header/Part/ParameterPartTest.php | 1 + .../Header/Part/QuotedLiteralPartTest.php | 10 +++++---- .../Header/Part/ReceivedDomainPartTest.php | 2 ++ .../Header/Part/ReceivedPartTest.php | 3 ++- .../Header/Part/SplitParameterPartTest.php | 13 ++++++------ .../MailMimeParser/Header/Part/TokenTest.php | 3 +-- .../Header/ReceivedHeaderTest.php | 1 + .../Header/SubjectHeaderTest.php | 2 +- .../IntegrationTests/EmailFunctionalTest.php | 4 ++-- .../Message/Factory/IMimePartFactoryTest.php | 1 - .../Factory/IUUEncodedPartFactoryTest.php | 1 - .../PartHeaderContainerFactoryTest.php | 1 - .../PartStreamContainerFactoryTest.php | 1 - .../Message/MessagePartTest.php | 9 ++++---- tests/MailMimeParser/Message/MimePartTest.php | 1 - .../MailMimeParser/Message/MultiPartTest.php | 1 - .../Message/PartHeaderContainerTest.php | 2 +- .../Message/PartStreamContainerTest.php | 21 +++++++++---------- .../Message/UUEncodedPartTest.php | 1 - tests/MailMimeParser/MessageTest.php | 1 - .../Part/ParserPartStreamContainerTest.php | 17 +++++++-------- ...UEncodedPartHeaderContainerFactoryTest.php | 1 - .../Part/UUEncodedPartHeaderContainerTest.php | 1 - .../Proxy/ParserMessageProxyFactoryTest.php | 1 - .../Proxy/ParserMimePartProxyFactoryTest.php | 1 - .../ParserNonMimeMessageProxyFactoryTest.php | 1 - .../ParserUUEncodedPartProxyFactoryTest.php | 1 - .../MessagePartStreamReadExceptionTest.php | 1 - .../Stream/MessagePartStreamTest.php | 3 +-- tests/setup-test-logger.php | 4 ++-- 112 files changed, 193 insertions(+), 187 deletions(-) diff --git a/src/ErrorBag.php b/src/ErrorBag.php index 359a0019..dc338f61 100644 --- a/src/ErrorBag.php +++ b/src/ErrorBag.php @@ -102,10 +102,10 @@ public function getAllErrors(bool $validate = false, string $minPsrLevel = LogLe { $arr = \array_values(\array_map( function($e) use ($validate, $minPsrLevel) { - return $e->getAllErrors($validate, $minPsrLevel) ?? []; + return $e->getAllErrors($validate, $minPsrLevel); }, $this->getErrorBagChildren() - )) ?? []; + )); return \array_merge($this->getErrors($validate, $minPsrLevel), ...$arr); } diff --git a/src/Header/AbstractHeader.php b/src/Header/AbstractHeader.php index 61789433..7ee333bf 100644 --- a/src/Header/AbstractHeader.php +++ b/src/Header/AbstractHeader.php @@ -72,7 +72,7 @@ public function __construct( /** * Filters $this->allParts into the parts required by $this->parts - * and assignes it. + * and assigns it. * * The AbstractHeader::filterAndAssignToParts method filters out CommentParts. */ @@ -118,7 +118,7 @@ public function getAllParts() : array public function getComments() : array { if ($this->comments === null) { - $this->comments = \array_map(fn ($c) => $c->getComment(), \array_merge(...\array_map( + $this->comments = \array_map(fn (IHeaderPart $c) => $c->getComment(), \array_merge(...\array_map( fn ($p) => ($p instanceof CommentPart) ? [$p] : $p->getComments(), $this->allParts ))); diff --git a/src/Header/AddressHeader.php b/src/Header/AddressHeader.php index 024d6483..a6c08115 100644 --- a/src/Header/AddressHeader.php +++ b/src/Header/AddressHeader.php @@ -8,10 +8,10 @@ namespace ZBateson\MailMimeParser\Header; use Psr\Log\LoggerInterface; -use ZBateson\MailMimeParser\MailMimeParser; use ZBateson\MailMimeParser\Header\Consumer\AddressBaseConsumerService; use ZBateson\MailMimeParser\Header\Part\AddressGroupPart; use ZBateson\MailMimeParser\Header\Part\AddressPart; +use ZBateson\MailMimeParser\MailMimeParser; /** * A header containing one or more email addresses and/or groups of addresses. diff --git a/src/Header/Consumer/AddressBaseConsumerService.php b/src/Header/Consumer/AddressBaseConsumerService.php index 7e74034c..8a312c3d 100644 --- a/src/Header/Consumer/AddressBaseConsumerService.php +++ b/src/Header/Consumer/AddressBaseConsumerService.php @@ -47,8 +47,6 @@ protected function getTokenSeparators() : array * * The start token for AddressBaseConsumerService is part of an * {@see AddressPart} (or a sub-consumer) and so must be passed on. - * - * @return static */ protected function advanceToNextToken(Iterator $tokens, bool $isStartToken) : static { diff --git a/src/Header/Consumer/AddressConsumerService.php b/src/Header/Consumer/AddressConsumerService.php index 208c3586..356b2ac9 100644 --- a/src/Header/Consumer/AddressConsumerService.php +++ b/src/Header/Consumer/AddressConsumerService.php @@ -10,8 +10,8 @@ use Psr\Log\LoggerInterface; use ZBateson\MailMimeParser\Header\Part\AddressGroupPart; use ZBateson\MailMimeParser\Header\Part\AddressPart; -use ZBateson\MailMimeParser\Header\Part\MimeTokenPartFactory; use ZBateson\MailMimeParser\Header\Part\MimeToken; +use ZBateson\MailMimeParser\Header\Part\MimeTokenPartFactory; /** * Parses a single part of an address header. diff --git a/src/Header/Consumer/CommentConsumerService.php b/src/Header/Consumer/CommentConsumerService.php index 2f28f278..764dba7b 100644 --- a/src/Header/Consumer/CommentConsumerService.php +++ b/src/Header/Consumer/CommentConsumerService.php @@ -91,8 +91,6 @@ protected function getPartForToken(string $token, bool $isLiteral) : ?IHeaderPar * The default implementation checks if the current token is an end token, * and will not advance past it. Because a comment part of a header can be * nested, its implementation must advance past its own 'end' token. - * - * @return static */ protected function advanceToNextToken(Iterator $tokens, bool $isStartToken) : static { diff --git a/src/Header/Consumer/ParameterConsumerService.php b/src/Header/Consumer/ParameterConsumerService.php index b08611a5..cc0735a6 100644 --- a/src/Header/Consumer/ParameterConsumerService.php +++ b/src/Header/Consumer/ParameterConsumerService.php @@ -49,8 +49,6 @@ public function __construct( /** * Disables advancing for start tokens. - * - * @return static */ protected function advanceToNextToken(Iterator $tokens, bool $isStartToken) : static { @@ -73,24 +71,23 @@ protected function processParts(array $parts) : array { $factory = $this->partFactory; return \array_values(\array_map( - function ($partsArray) use ($factory) { - if (count($partsArray) > 1) { + function($partsArray) use ($factory) { + if (\count($partsArray) > 1) { return $factory->newSplitParameterPart($partsArray); } return $partsArray[0]; }, \array_merge_recursive(...\array_map( - function ($p) { + function($p) { // if $p->getIndex is non-null, it's a split-parameter part // and an array of one element consisting of name => ParameterPart // is returned, which is then merged into name => array-of-parameter-parts // or ';' object_id . ';' for non-split parts with a value of a single // element array of [ParameterPart] - if ($p instanceOf ParameterPart && $p->getIndex() !== null) { - return [strtolower($p->getName()) => [$p]]; - } else { - return [';' . spl_object_id($p) . ';' => [$p]]; + if ($p instanceof ParameterPart && $p->getIndex() !== null) { + return [\strtolower($p->getName()) => [$p]]; } + return [';' . \spl_object_id($p) . ';' => [$p]]; }, $parts )) diff --git a/src/Header/Consumer/ParameterNameValueConsumerService.php b/src/Header/Consumer/ParameterNameValueConsumerService.php index 628b6375..b288b9d0 100644 --- a/src/Header/Consumer/ParameterNameValueConsumerService.php +++ b/src/Header/Consumer/ParameterNameValueConsumerService.php @@ -9,8 +9,8 @@ use Psr\Log\LoggerInterface; use ZBateson\MailMimeParser\Header\IHeaderPart; -use ZBateson\MailMimeParser\Header\Part\MimeTokenPartFactory; use ZBateson\MailMimeParser\Header\Part\ContainerPart; +use ZBateson\MailMimeParser\Header\Part\MimeTokenPartFactory; /** * Parses an individual part of a parameter header. diff --git a/src/Header/Consumer/ParameterValueConsumerService.php b/src/Header/Consumer/ParameterValueConsumerService.php index b5df3dcf..9f3c4360 100644 --- a/src/Header/Consumer/ParameterValueConsumerService.php +++ b/src/Header/Consumer/ParameterValueConsumerService.php @@ -45,7 +45,7 @@ protected function getTokenSeparators() : array { return \array_merge(parent::getTokenSeparators(), ['=', ';']); } - + /** * Returns true if the token is an '=' character. */ diff --git a/src/Header/Consumer/QuotedStringConsumerService.php b/src/Header/Consumer/QuotedStringConsumerService.php index ded85c01..456e4b2a 100644 --- a/src/Header/Consumer/QuotedStringConsumerService.php +++ b/src/Header/Consumer/QuotedStringConsumerService.php @@ -56,8 +56,6 @@ protected function getTokenSeparators() : array /** * Constructs a LiteralPart and returns it. - * - * @param bool $isLiteral */ protected function getPartForToken(string $token, bool $isLiteral) : ?IHeaderPart { diff --git a/src/Header/Consumer/QuotedStringMimeLiteralPartTokenSplitPatternTrait.php b/src/Header/Consumer/QuotedStringMimeLiteralPartTokenSplitPatternTrait.php index a972283d..6f01d659 100644 --- a/src/Header/Consumer/QuotedStringMimeLiteralPartTokenSplitPatternTrait.php +++ b/src/Header/Consumer/QuotedStringMimeLiteralPartTokenSplitPatternTrait.php @@ -10,7 +10,8 @@ use ZBateson\MailMimeParser\Header\Part\MimeToken; /** - * + * Provides a getTokenSplitPattern for consumers that could have quoted parts + * that are mime-header-encoded. * * @author Zaahid Bateson */ diff --git a/src/Header/Consumer/ReceivedConsumerService.php b/src/Header/Consumer/ReceivedConsumerService.php index 20cea58f..6b545cc4 100644 --- a/src/Header/Consumer/ReceivedConsumerService.php +++ b/src/Header/Consumer/ReceivedConsumerService.php @@ -101,8 +101,6 @@ protected function getTokenSplitPattern() : string /** * Overridden to /not/ advance when the end token matches a start token for * a sub-consumer. - * - * @return static */ protected function advanceToNextToken(Iterator $tokens, bool $isStartToken) : static { diff --git a/src/Header/DateHeader.php b/src/Header/DateHeader.php index fe8fa676..6b6a9c85 100644 --- a/src/Header/DateHeader.php +++ b/src/Header/DateHeader.php @@ -10,9 +10,9 @@ use DateTime; use DateTimeImmutable; use Psr\Log\LoggerInterface; -use ZBateson\MailMimeParser\MailMimeParser; use ZBateson\MailMimeParser\Header\Consumer\DateConsumerService; use ZBateson\MailMimeParser\Header\Part\DatePart; +use ZBateson\MailMimeParser\MailMimeParser; /** * Reads a DatePart value header in either RFC 2822 or RFC 822 format. diff --git a/src/Header/GenericHeader.php b/src/Header/GenericHeader.php index d499135e..ac0d3007 100644 --- a/src/Header/GenericHeader.php +++ b/src/Header/GenericHeader.php @@ -8,8 +8,8 @@ namespace ZBateson\MailMimeParser\Header; use Psr\Log\LoggerInterface; -use ZBateson\MailMimeParser\MailMimeParser; use ZBateson\MailMimeParser\Header\Consumer\GenericConsumerMimeLiteralPartService; +use ZBateson\MailMimeParser\MailMimeParser; /** * Reads a generic header. diff --git a/src/Header/IdHeader.php b/src/Header/IdHeader.php index 238fc7c4..ddb525dc 100644 --- a/src/Header/IdHeader.php +++ b/src/Header/IdHeader.php @@ -8,10 +8,10 @@ namespace ZBateson\MailMimeParser\Header; use Psr\Log\LoggerInterface; -use ZBateson\MailMimeParser\MailMimeParser; use ZBateson\MailMimeParser\Header\Consumer\IdBaseConsumerService; use ZBateson\MailMimeParser\Header\Part\CommentPart; use ZBateson\MailMimeParser\Header\Part\MimeTokenPartFactory; +use ZBateson\MailMimeParser\MailMimeParser; /** * Represents a Content-ID, Message-ID, In-Reply-To or References header. diff --git a/src/Header/MimeEncodedHeader.php b/src/Header/MimeEncodedHeader.php index be49f466..176a158a 100644 --- a/src/Header/MimeEncodedHeader.php +++ b/src/Header/MimeEncodedHeader.php @@ -9,8 +9,8 @@ use Psr\Log\LoggerInterface; use ZBateson\MailMimeParser\Header\Consumer\IConsumerService; -use ZBateson\MailMimeParser\Header\Part\MimeTokenPartFactory; use ZBateson\MailMimeParser\Header\Part\MimeToken; +use ZBateson\MailMimeParser\Header\Part\MimeTokenPartFactory; /** * Allows a header to be mime-encoded and be decoded with a consumer after @@ -55,12 +55,12 @@ protected function parseHeaderValue(IConsumerService $consumer, string $value) : $this->mimeEncodedParsedParts = \array_map([$this->mimeTokenPartFactory, 'newInstance'], $aMimeParts); parent::parseHeaderValue( $consumer, - \implode(\array_map(fn ($part) => $part->getValue(), $this->mimeEncodedParsedParts)) + \implode('', \array_map(fn ($part) => $part->getValue(), $this->mimeEncodedParsedParts)) ); } protected function getErrorBagChildren() : array { - return \array_values(\array_filter(array_merge($this->getAllParts(), $this->mimeEncodedParsedParts))); + return \array_values(\array_filter(\array_merge($this->getAllParts(), $this->mimeEncodedParsedParts))); } } diff --git a/src/Header/ParameterHeader.php b/src/Header/ParameterHeader.php index 701b97a9..5a88f6b1 100644 --- a/src/Header/ParameterHeader.php +++ b/src/Header/ParameterHeader.php @@ -8,10 +8,10 @@ namespace ZBateson\MailMimeParser\Header; use Psr\Log\LoggerInterface; -use ZBateson\MailMimeParser\MailMimeParser; use ZBateson\MailMimeParser\Header\Consumer\IConsumerService; use ZBateson\MailMimeParser\Header\Consumer\ParameterConsumerService; use ZBateson\MailMimeParser\Header\Part\NameValuePart; +use ZBateson\MailMimeParser\MailMimeParser; /** * Represents a header containing an optional main value part and subsequent diff --git a/src/Header/Part/AddressPart.php b/src/Header/Part/AddressPart.php index 284cea54..8b83fb8e 100644 --- a/src/Header/Part/AddressPart.php +++ b/src/Header/Part/AddressPart.php @@ -25,15 +25,14 @@ class AddressPart extends NameValuePart { protected function getValueFromParts(array $parts) : string { - return \implode(\array_map( - function ($p) { + return \implode('', \array_map( + function($p) { if ($p instanceof AddressPart) { return $p->getValue(); } elseif ($p instanceof QuotedLiteralPart && $p->getValue() !== '') { return '"' . \preg_replace('/(["\\\])/', '\\\$1', $p->getValue()) . '"'; - } else { - return \preg_replace('/\s+/', '', $p->getValue()); } + return \preg_replace('/\s+/', '', $p->getValue()); }, $parts )); diff --git a/src/Header/Part/CommentPart.php b/src/Header/Part/CommentPart.php index b24265bb..92b1f4f8 100644 --- a/src/Header/Part/CommentPart.php +++ b/src/Header/Part/CommentPart.php @@ -47,7 +47,7 @@ protected function getValueFromParts(array $parts) : string { $partFactory = $this->partFactory; return parent::getValueFromParts(\array_map( - function ($p) use ($partFactory) { + function($p) use ($partFactory) { if ($p instanceof CommentPart) { return $partFactory->newQuotedLiteralPart([$partFactory->newToken('(' . $p->getComment() . ')')]); } elseif ($p instanceof QuotedLiteralPart) { diff --git a/src/Header/Part/ContainerPart.php b/src/Header/Part/ContainerPart.php index 464026f3..b0189080 100644 --- a/src/Header/Part/ContainerPart.php +++ b/src/Header/Part/ContainerPart.php @@ -8,8 +8,8 @@ namespace ZBateson\MailMimeParser\Header\Part; use Psr\Log\LoggerInterface; -use ZBateson\MbWrapper\MbWrapper; use ZBateson\MailMimeParser\ErrorBag; +use ZBateson\MbWrapper\MbWrapper; /** * Base HeaderPart for a part that consists of other parts. @@ -64,7 +64,7 @@ protected function filterIgnoredSpaces(array $parts) : array $spaced = \array_merge($parts, [$ends]); $filtered = \array_slice(\array_reduce( \array_slice(\array_keys($spaced), 0, -1), - function ($carry, $key) use ($spaced, $ends) { + function($carry, $key) use ($spaced, $ends) { $p = $spaced[$key]; $l = \end($carry); $a = $spaced[$key + 1]; diff --git a/src/Header/Part/HeaderPart.php b/src/Header/Part/HeaderPart.php index ec40bb56..8455b38a 100644 --- a/src/Header/Part/HeaderPart.php +++ b/src/Header/Part/HeaderPart.php @@ -101,7 +101,7 @@ protected function convertEncoding(string $str, string $from = 'ISO-8859-1', boo return $str; } - public function getComments(): array + public function getComments() : array { return []; } diff --git a/src/Header/Part/HeaderPartFactory.php b/src/Header/Part/HeaderPartFactory.php index 3d3d0647..864cad01 100644 --- a/src/Header/Part/HeaderPartFactory.php +++ b/src/Header/Part/HeaderPartFactory.php @@ -90,7 +90,7 @@ public function newSplitParameterPart(array $children) : SplitParameterPart /** * Initializes and returns a new QuotedLiteralPart. * - * @param HeaderPart[] $children + * @param HeaderPart[] $parts */ public function newQuotedLiteralPart(array $parts) : QuotedLiteralPart { diff --git a/src/Header/Part/ParameterPart.php b/src/Header/Part/ParameterPart.php index 07b5064c..96e61892 100644 --- a/src/Header/Part/ParameterPart.php +++ b/src/Header/Part/ParameterPart.php @@ -56,7 +56,7 @@ protected function getNameFromParts(array $parts) : string $name = parent::getNameFromParts($parts); if (\preg_match('~^\s*([^\*]+)\*(\d*)(\*)?$~', $name, $matches)) { $name = $matches[1]; - $this->index = ($matches[2] !== '') ? intval($matches[2]) : null; + $this->index = ($matches[2] !== '') ? (int) ($matches[2]) : null; $this->encoded = (($matches[2] === '') || !empty($matches[3])); } return $name; diff --git a/src/Header/Part/ReceivedDomainPart.php b/src/Header/Part/ReceivedDomainPart.php index d1171a13..c514141d 100644 --- a/src/Header/Part/ReceivedDomainPart.php +++ b/src/Header/Part/ReceivedDomainPart.php @@ -48,7 +48,7 @@ class ReceivedDomainPart extends ReceivedPart protected ?string $address = null; /** - * @param HeaderPart[] $subParts + * @param HeaderPart[] $children */ public function __construct( LoggerInterface $logger, diff --git a/src/Header/Part/SplitParameterPart.php b/src/Header/Part/SplitParameterPart.php index 63039951..6c3ff178 100644 --- a/src/Header/Part/SplitParameterPart.php +++ b/src/Header/Part/SplitParameterPart.php @@ -92,7 +92,7 @@ protected function getValueFromParts(array $parts) : string $combined = $this->combineAdjacentUnencodedParts($sorted); - return \implode(\array_map( + return \implode('', \array_map( fn ($p) => ($p instanceof ParameterPart && $p->encoded) ? $this->decodePartValue($p->getValue(), ($p->charset === null) ? $charset : $p->charset) : $p->getValue(), diff --git a/src/Header/Part/Token.php b/src/Header/Part/Token.php index 7153b7a8..38663a99 100644 --- a/src/Header/Part/Token.php +++ b/src/Header/Part/Token.php @@ -8,7 +8,6 @@ namespace ZBateson\MailMimeParser\Header\Part; use Psr\Log\LoggerInterface; -use ZBateson\MailMimeParser\Header\Part\HeaderPart; use ZBateson\MbWrapper\MbWrapper; /** diff --git a/src/Header/ReceivedHeader.php b/src/Header/ReceivedHeader.php index 5a095124..ec8f974c 100644 --- a/src/Header/ReceivedHeader.php +++ b/src/Header/ReceivedHeader.php @@ -9,9 +9,9 @@ use DateTime; use Psr\Log\LoggerInterface; -use ZBateson\MailMimeParser\MailMimeParser; use ZBateson\MailMimeParser\Header\Consumer\ReceivedConsumerService; use ZBateson\MailMimeParser\Header\Part\DatePart; +use ZBateson\MailMimeParser\MailMimeParser; /** * Represents a Received header. diff --git a/src/Header/SubjectHeader.php b/src/Header/SubjectHeader.php index e15240c4..bbadc5f8 100644 --- a/src/Header/SubjectHeader.php +++ b/src/Header/SubjectHeader.php @@ -8,8 +8,8 @@ namespace ZBateson\MailMimeParser\Header; use Psr\Log\LoggerInterface; -use ZBateson\MailMimeParser\MailMimeParser; use ZBateson\MailMimeParser\Header\Consumer\SubjectConsumerService; +use ZBateson\MailMimeParser\MailMimeParser; /** * Reads a subject header. diff --git a/src/MailMimeParser.php b/src/MailMimeParser.php index c5bb4b29..6a23a96f 100644 --- a/src/MailMimeParser.php +++ b/src/MailMimeParser.php @@ -80,7 +80,7 @@ class MailMimeParser * @var array an array of global definitions * being used. */ - private static array $globalDefinitions = [ self::DEFAULT_DEFINITIONS_FILE ]; + private static array $globalDefinitions = [self::DEFAULT_DEFINITIONS_FILE]; /** * Returns the default ContainerBuilder with default loaded definitions. @@ -104,14 +104,13 @@ private static function getGlobalContainerBuilder() : ContainerBuilder */ public static function setGlobalPhpDiConfigurations(array $phpDiConfigs, bool $useDefaultDefinitionsFile = true) : void { - self::$globalDefinitions = array_merge( - ($useDefaultDefinitionsFile) ? [ self::DEFAULT_DEFINITIONS_FILE ] : [], + self::$globalDefinitions = \array_merge( + ($useDefaultDefinitionsFile) ? [self::DEFAULT_DEFINITIONS_FILE] : [], $phpDiConfigs ); self::$globalContainer = null; } - public static function addGlobalPhpDiContainerDefinition(array|string|DefinitionSource $phpDiConfig) : void { self::$globalDefinitions[] = $phpDiConfig; @@ -120,7 +119,7 @@ public static function addGlobalPhpDiContainerDefinition(array|string|Definition public static function resetGlobalPhpDiContainerDefinitions() : void { - self::$globalDefinitions = [ self::DEFAULT_DEFINITIONS_FILE ]; + self::$globalDefinitions = [self::DEFAULT_DEFINITIONS_FILE]; self::$globalContainer = null; } @@ -142,7 +141,7 @@ public static function getGlobalContainer() : Container */ public static function setGlobalLogger(LoggerInterface $logger) : void { - self::$globalDefinitions[] = [ LoggerInterface::class => $logger ]; + self::$globalDefinitions[] = [LoggerInterface::class => $logger]; self::$globalContainer = null; } diff --git a/src/Message/Factory/IMessagePartFactory.php b/src/Message/Factory/IMessagePartFactory.php index e0865309..036b92d9 100644 --- a/src/Message/Factory/IMessagePartFactory.php +++ b/src/Message/Factory/IMessagePartFactory.php @@ -8,8 +8,8 @@ namespace ZBateson\MailMimeParser\Message\Factory; use Psr\Log\LoggerInterface; -use ZBateson\MailMimeParser\Message\IMimePart; use ZBateson\MailMimeParser\Message\IMessagePart; +use ZBateson\MailMimeParser\Message\IMimePart; use ZBateson\MailMimeParser\Stream\StreamFactory; /** @@ -38,5 +38,5 @@ public function __construct( /** * Constructs a new IMessagePart object and returns it */ - abstract public function newInstance(IMimePart $parent = null) : IMessagePart; + abstract public function newInstance(?IMimePart $parent = null) : IMessagePart; } diff --git a/src/Message/Factory/IMimePartFactory.php b/src/Message/Factory/IMimePartFactory.php index 536e6e71..d76fd579 100644 --- a/src/Message/Factory/IMimePartFactory.php +++ b/src/Message/Factory/IMimePartFactory.php @@ -38,7 +38,7 @@ public function __construct( /** * Constructs a new IMimePart object and returns it */ - public function newInstance(IMimePart $parent = null) : IMimePart + public function newInstance(?IMimePart $parent = null) : IMimePart { $streamContainer = $this->partStreamContainerFactory->newInstance(); $headerContainer = $this->partHeaderContainerFactory->newInstance(); diff --git a/src/Message/Factory/IUUEncodedPartFactory.php b/src/Message/Factory/IUUEncodedPartFactory.php index 16101c2b..999e4d35 100644 --- a/src/Message/Factory/IUUEncodedPartFactory.php +++ b/src/Message/Factory/IUUEncodedPartFactory.php @@ -21,7 +21,7 @@ class IUUEncodedPartFactory extends IMessagePartFactory /** * Constructs a new UUEncodedPart object and returns it */ - public function newInstance(IMimePart $parent = null) : IUUEncodedPart + public function newInstance(?IMimePart $parent = null) : IUUEncodedPart { $streamContainer = $this->partStreamContainerFactory->newInstance(); $part = new UUEncodedPart( diff --git a/src/Message/Factory/PartStreamContainerFactory.php b/src/Message/Factory/PartStreamContainerFactory.php index 7651a50b..2a45ca95 100644 --- a/src/Message/Factory/PartStreamContainerFactory.php +++ b/src/Message/Factory/PartStreamContainerFactory.php @@ -24,7 +24,7 @@ class PartStreamContainerFactory protected StreamFactory $streamFactory; protected MbWrapper $mbWrapper; - + protected bool $throwExceptionReadingPartContentFromUnsupportedCharsets; public function __construct( diff --git a/src/Message/MessagePart.php b/src/Message/MessagePart.php index d0ee5868..3ae6ee8b 100644 --- a/src/Message/MessagePart.php +++ b/src/Message/MessagePart.php @@ -7,12 +7,12 @@ namespace ZBateson\MailMimeParser\Message; -use SplObjectStorage; -use SplObserver; use GuzzleHttp\Psr7\StreamWrapper; use GuzzleHttp\Psr7\Utils; use Psr\Http\Message\StreamInterface; use Psr\Log\LoggerInterface; +use SplObjectStorage; +use SplObserver; use ZBateson\MailMimeParser\ErrorBag; use ZBateson\MailMimeParser\MailMimeParser; use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; diff --git a/src/Message/MimePart.php b/src/Message/MimePart.php index 58cab5c5..855200bd 100644 --- a/src/Message/MimePart.php +++ b/src/Message/MimePart.php @@ -7,13 +7,13 @@ namespace ZBateson\MailMimeParser\Message; -use Traversable; use Psr\Log\LoggerInterface; -use ZBateson\MailMimeParser\MailMimeParser; +use Traversable; use ZBateson\MailMimeParser\Header\HeaderConsts; use ZBateson\MailMimeParser\Header\IHeader; use ZBateson\MailMimeParser\Header\ParameterHeader; use ZBateson\MailMimeParser\IMessage; +use ZBateson\MailMimeParser\MailMimeParser; /** * A mime email message part. diff --git a/src/Message/MultiPart.php b/src/Message/MultiPart.php index 92183679..dda70187 100644 --- a/src/Message/MultiPart.php +++ b/src/Message/MultiPart.php @@ -10,9 +10,9 @@ use AppendIterator; use ArrayIterator; use Iterator; +use Psr\Log\LoggerInterface; use RecursiveIterator; use RecursiveIteratorIterator; -use Psr\Log\LoggerInterface; /** * A message part that contains children. diff --git a/src/Message/PartHeaderContainer.php b/src/Message/PartHeaderContainer.php index b141d322..7db9bb5b 100644 --- a/src/Message/PartHeaderContainer.php +++ b/src/Message/PartHeaderContainer.php @@ -9,8 +9,8 @@ use ArrayIterator; use IteratorAggregate; -use Traversable; use Psr\Log\LoggerInterface; +use Traversable; use ZBateson\MailMimeParser\ErrorBag; use ZBateson\MailMimeParser\Header\HeaderFactory; use ZBateson\MailMimeParser\Header\IHeader; diff --git a/src/Message/PartStreamContainer.php b/src/Message/PartStreamContainer.php index e683d15b..f0e5ac71 100644 --- a/src/Message/PartStreamContainer.php +++ b/src/Message/PartStreamContainer.php @@ -9,12 +9,11 @@ use GuzzleHttp\Psr7\CachingStream; use Psr\Http\Message\StreamInterface; -use Psr\Log\LogLevel; use Psr\Log\LoggerInterface; +use Psr\Log\LogLevel; use ZBateson\MailMimeParser\ErrorBag; -use ZBateson\MailMimeParser\Message\IMessagePart; -use ZBateson\MailMimeParser\Stream\StreamFactory; use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; +use ZBateson\MailMimeParser\Stream\StreamFactory; use ZBateson\MbWrapper\MbWrapper; use ZBateson\MbWrapper\UnsupportedCharsetException; diff --git a/src/Parser/Part/ParserPartStreamContainer.php b/src/Parser/Part/ParserPartStreamContainer.php index 626f7e38..b8b2f105 100644 --- a/src/Parser/Part/ParserPartStreamContainer.php +++ b/src/Parser/Part/ParserPartStreamContainer.php @@ -11,8 +11,8 @@ use Psr\Log\LoggerInterface; use SplObserver; use SplSubject; -use ZBateson\MailMimeParser\Message\PartStreamContainer; use ZBateson\MailMimeParser\Message\IMessagePart; +use ZBateson\MailMimeParser\Message\PartStreamContainer; use ZBateson\MailMimeParser\Parser\Proxy\ParserPartProxy; use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; use ZBateson\MailMimeParser\Stream\StreamFactory; diff --git a/src/Stream/HeaderStream.php b/src/Stream/HeaderStream.php index 2673cfe5..d1eebcb2 100644 --- a/src/Stream/HeaderStream.php +++ b/src/Stream/HeaderStream.php @@ -9,7 +9,6 @@ use ArrayIterator; use GuzzleHttp\Psr7; -use GuzzleHttp\Psr7\StreamDecoratorTrait; use Psr\Http\Message\StreamInterface; use SplObserver; use SplSubject; diff --git a/src/Stream/MessagePartStream.php b/src/Stream/MessagePartStream.php index 68a295cd..c09b5ee5 100644 --- a/src/Stream/MessagePartStream.php +++ b/src/Stream/MessagePartStream.php @@ -154,7 +154,7 @@ protected function getStreamsArray() : array // ContentStream could be rewound, etc... $contentStream = $this->streamFactory->newDecoratedCachingStream( $this->streamFactory->newSeekingStream($contentStream), - function ($stream) { + function($stream) { $es = $this->streamFactory->getTransferEncodingDecoratedStream( $stream, $this->part->getContentTransferEncoding(), @@ -165,9 +165,9 @@ function ($stream) { } ); } - + $streams = [$this->streamFactory->newHeaderStream($this->part), $contentStream ?: Psr7\Utils::streamFor()]; - + if ($this->part instanceof IMimePart && $this->part->getChildCount() > 0) { $streams = \array_merge($streams, $this->getBoundaryAndChildStreams($this->part)); } diff --git a/src/Stream/MessagePartStreamDecorator.php b/src/Stream/MessagePartStreamDecorator.php index cca1b2a5..6c2fe582 100644 --- a/src/Stream/MessagePartStreamDecorator.php +++ b/src/Stream/MessagePartStreamDecorator.php @@ -40,8 +40,6 @@ public function __construct(IMessagePart $part, ?StreamInterface $stream = null) * Overridden to wrap exceptions in MessagePartReadException which provides * 'getPart' to inspect the part the error occurs on. * - * @param int $length - * @return string * @throws MessagePartStreamReadException */ public function read(int $length) : string diff --git a/src/Stream/MessagePartStreamReadException.php b/src/Stream/MessagePartStreamReadException.php index 60615603..07664696 100644 --- a/src/Stream/MessagePartStreamReadException.php +++ b/src/Stream/MessagePartStreamReadException.php @@ -23,7 +23,7 @@ class MessagePartStreamReadException extends RuntimeException */ protected IMessagePart $part; - public function __construct(IMessagePart $part, string $message = "", int $code = 0, ?\Throwable $previous = null) + public function __construct(IMessagePart $part, string $message = '', int $code = 0, ?\Throwable $previous = null) { parent::__construct($message, $code, $previous); $this->part = $part; diff --git a/src/di_config.php b/src/di_config.php index c4b15bd7..4370bfc3 100644 --- a/src/di_config.php +++ b/src/di_config.php @@ -10,8 +10,8 @@ use ZBateson\MailMimeParser\Header\Consumer\Received\DomainConsumerService; use ZBateson\MailMimeParser\Header\Consumer\Received\GenericReceivedConsumerService; use ZBateson\MailMimeParser\Header\Consumer\ReceivedConsumerService; -use ZBateson\MailMimeParser\Message\PartStreamContainer; use ZBateson\MailMimeParser\Message\Factory\PartStreamContainerFactory; +use ZBateson\MailMimeParser\Message\PartStreamContainer; use ZBateson\MailMimeParser\Parser\Part\ParserPartStreamContainerFactory; use ZBateson\MailMimeParser\Stream\StreamFactory; diff --git a/tests/MailMimeParser/ErrorBagTest.php b/tests/MailMimeParser/ErrorBagTest.php index 3ad439c7..0d400a52 100644 --- a/tests/MailMimeParser/ErrorBagTest.php +++ b/tests/MailMimeParser/ErrorBagTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use Psr\Log\LogLevel; /** diff --git a/tests/MailMimeParser/ErrorTest.php b/tests/MailMimeParser/ErrorTest.php index 3c46b671..2f30ad1a 100644 --- a/tests/MailMimeParser/ErrorTest.php +++ b/tests/MailMimeParser/ErrorTest.php @@ -4,7 +4,6 @@ use InvalidArgumentException; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use Psr\Log\LogLevel; /** diff --git a/tests/MailMimeParser/Header/AddressHeaderTest.php b/tests/MailMimeParser/Header/AddressHeaderTest.php index 47241d69..33117258 100644 --- a/tests/MailMimeParser/Header/AddressHeaderTest.php +++ b/tests/MailMimeParser/Header/AddressHeaderTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Header; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Header\Consumer\AddressBaseConsumerService; use ZBateson\MailMimeParser\Header\Consumer\AddressConsumerService; use ZBateson\MailMimeParser\Header\Consumer\AddressEmailConsumerService; @@ -24,6 +23,7 @@ class AddressHeaderTest extends TestCase { // @phpstan-ignore-next-line protected $consumerService; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/AddressBaseConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/AddressBaseConsumerServiceTest.php index 450e717b..89193fde 100644 --- a/tests/MailMimeParser/Header/Consumer/AddressBaseConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/AddressBaseConsumerServiceTest.php @@ -17,6 +17,7 @@ class AddressBaseConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $addressBaseConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/AddressConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/AddressConsumerServiceTest.php index 575ad34a..8269c8d7 100644 --- a/tests/MailMimeParser/Header/Consumer/AddressConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/AddressConsumerServiceTest.php @@ -17,6 +17,7 @@ class AddressConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $addressConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/AddressEmailConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/AddressEmailConsumerServiceTest.php index 335aed0f..7481d0cd 100644 --- a/tests/MailMimeParser/Header/Consumer/AddressEmailConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/AddressEmailConsumerServiceTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; /** @@ -18,6 +17,7 @@ class AddressEmailConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $addressConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/AddressGroupConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/AddressGroupConsumerServiceTest.php index 519250a5..af1d16b7 100644 --- a/tests/MailMimeParser/Header/Consumer/AddressGroupConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/AddressGroupConsumerServiceTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; /** @@ -18,6 +17,7 @@ class AddressGroupConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $addressGroupConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/CommentConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/CommentConsumerServiceTest.php index 5f035428..922f7d98 100644 --- a/tests/MailMimeParser/Header/Consumer/CommentConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/CommentConsumerServiceTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; /** @@ -18,6 +17,7 @@ class CommentConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $commentConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/DateConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/DateConsumerServiceTest.php index 0126137b..ade0290f 100644 --- a/tests/MailMimeParser/Header/Consumer/DateConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/DateConsumerServiceTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer; use DateTime; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; /** @@ -19,6 +18,7 @@ class DateConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $dateConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/GenericConsumerMimeLiteralPartServiceTest.php b/tests/MailMimeParser/Header/Consumer/GenericConsumerMimeLiteralPartServiceTest.php index 90930f84..e10ff264 100644 --- a/tests/MailMimeParser/Header/Consumer/GenericConsumerMimeLiteralPartServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/GenericConsumerMimeLiteralPartServiceTest.php @@ -18,6 +18,7 @@ class GenericConsumerMimeLiteralPartServiceTest extends TestCase { // @phpstan-ignore-next-line private $genericConsumer; + private $logger; protected function setUp() : void @@ -101,5 +102,4 @@ public function testDecodingTwoParts() : void $this->assertDecoded('外為ｵﾝﾗｲﾝﾃﾞﾓ(25)(デモ)決済約定のお知らせ', '=?iso-2022-jp?Q?=1B$B300Y=1B(I5]W2]C^S=1B(B(25?= =?iso-2022-jp?Q?)(=1B$B%G%b=1B(B)=1B$B7h:QLsDj$N$*CN$i$;=1B(B?='); } - } diff --git a/tests/MailMimeParser/Header/Consumer/GenericConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/GenericConsumerServiceTest.php index 0d97ac53..53289e58 100644 --- a/tests/MailMimeParser/Header/Consumer/GenericConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/GenericConsumerServiceTest.php @@ -18,6 +18,7 @@ class GenericConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $genericConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/IdBaseConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/IdBaseConsumerServiceTest.php index 8d5f7e12..d4b43cb1 100644 --- a/tests/MailMimeParser/Header/Consumer/IdBaseConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/IdBaseConsumerServiceTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; /** @@ -18,6 +17,7 @@ class IdBaseConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $idBaseConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/IdConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/IdConsumerServiceTest.php index 76c60dd4..b66dd011 100644 --- a/tests/MailMimeParser/Header/Consumer/IdConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/IdConsumerServiceTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; /** @@ -18,6 +17,7 @@ class IdConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $idConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/ParameterConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/ParameterConsumerServiceTest.php index 00ca2983..dfbb6f11 100644 --- a/tests/MailMimeParser/Header/Consumer/ParameterConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/ParameterConsumerServiceTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; /** @@ -18,6 +17,7 @@ class ParameterConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $parameterConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/ParameterNameValueConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/ParameterNameValueConsumerServiceTest.php index 5968fd5f..1915b9d3 100644 --- a/tests/MailMimeParser/Header/Consumer/ParameterNameValueConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/ParameterNameValueConsumerServiceTest.php @@ -19,6 +19,7 @@ class ParameterNameValueConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $consumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/ParameterValueConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/ParameterValueConsumerServiceTest.php index d97c19f4..237d6869 100644 --- a/tests/MailMimeParser/Header/Consumer/ParameterValueConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/ParameterValueConsumerServiceTest.php @@ -4,7 +4,6 @@ use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\Header\Part\ContainerPart; -use ZBateson\MailMimeParser\Header\Part\ParameterPart; /** * Description of ParameterValueConsumerServiceTest @@ -19,6 +18,7 @@ class ParameterValueConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $consumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/QuotedStringConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/QuotedStringConsumerServiceTest.php index 6fcb7824..7f27e8a0 100644 --- a/tests/MailMimeParser/Header/Consumer/QuotedStringConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/QuotedStringConsumerServiceTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; /** @@ -18,6 +17,7 @@ class QuotedStringConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $quotedStringConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/QuotedStringMimeLiteralPartConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/QuotedStringMimeLiteralPartConsumerServiceTest.php index 02814f17..13e1ac42 100644 --- a/tests/MailMimeParser/Header/Consumer/QuotedStringMimeLiteralPartConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/QuotedStringMimeLiteralPartConsumerServiceTest.php @@ -18,6 +18,7 @@ class QuotedStringMimeLiteralPartConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $consumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/Received/DomainConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/Received/DomainConsumerServiceTest.php index aeaf1204..6fc57815 100644 --- a/tests/MailMimeParser/Header/Consumer/Received/DomainConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/Received/DomainConsumerServiceTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer\Received; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\Header\Consumer\CommentConsumerService; use ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService; @@ -19,6 +18,7 @@ class DomainConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $domainConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/Received/GenericReceivedConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/Received/GenericReceivedConsumerServiceTest.php index 1b5909f6..16ddda2b 100644 --- a/tests/MailMimeParser/Header/Consumer/Received/GenericReceivedConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/Received/GenericReceivedConsumerServiceTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer\Received; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\Header\Consumer\CommentConsumerService; use ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService; @@ -19,6 +18,7 @@ class GenericReceivedConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $genericConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/Received/ReceivedDateConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/Received/ReceivedDateConsumerServiceTest.php index a15a5df0..674a1090 100644 --- a/tests/MailMimeParser/Header/Consumer/Received/ReceivedDateConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/Received/ReceivedDateConsumerServiceTest.php @@ -4,7 +4,6 @@ use DateTime; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Header\Consumer\CommentConsumerService; use ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService; @@ -21,6 +20,7 @@ class ReceivedDateConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $dateConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Consumer/ReceivedConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/ReceivedConsumerServiceTest.php index 5d674c5d..3b8e3c9f 100644 --- a/tests/MailMimeParser/Header/Consumer/ReceivedConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/ReceivedConsumerServiceTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer; use DateTime; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\Header\Consumer\Received\DomainConsumerService; use ZBateson\MailMimeParser\Header\Consumer\Received\GenericReceivedConsumerService; @@ -24,6 +23,7 @@ class ReceivedConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $receivedConsumer; + private $logger; protected function setUp() : void @@ -79,7 +79,16 @@ protected function setUp() : void ->getMock(); $this->receivedConsumer = new ReceivedConsumerService( - $this->logger, $pf, $fdcs, $bdcs, $vgcs, $wgcs, $igcs, $fgcs, $rdcs, $ccs + $this->logger, + $pf, + $fdcs, + $bdcs, + $vgcs, + $wgcs, + $igcs, + $fgcs, + $rdcs, + $ccs ); } diff --git a/tests/MailMimeParser/Header/Consumer/SubjectConsumerServiceTest.php b/tests/MailMimeParser/Header/Consumer/SubjectConsumerServiceTest.php index 18b1ab42..655971f7 100644 --- a/tests/MailMimeParser/Header/Consumer/SubjectConsumerServiceTest.php +++ b/tests/MailMimeParser/Header/Consumer/SubjectConsumerServiceTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Consumer; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; /** @@ -18,6 +17,7 @@ class SubjectConsumerServiceTest extends TestCase { // @phpstan-ignore-next-line private $subjectConsumer; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/DateHeaderTest.php b/tests/MailMimeParser/Header/DateHeaderTest.php index 36c5dfe3..4c76c3b9 100644 --- a/tests/MailMimeParser/Header/DateHeaderTest.php +++ b/tests/MailMimeParser/Header/DateHeaderTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Header; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Header\Consumer\CommentConsumerService; use ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService; @@ -20,6 +19,7 @@ class DateHeaderTest extends TestCase { // @phpstan-ignore-next-line protected $consumerService; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/GenericHeaderTest.php b/tests/MailMimeParser/Header/GenericHeaderTest.php index 13a493e9..c178f3bb 100644 --- a/tests/MailMimeParser/Header/GenericHeaderTest.php +++ b/tests/MailMimeParser/Header/GenericHeaderTest.php @@ -4,9 +4,8 @@ use PHPUnit\Framework\TestCase; use Psr\Log\LogLevel; -use Psr\Log\NullLogger; -use ZBateson\MailMimeParser\Header\Consumer\GenericConsumerMimeLiteralPartService; use ZBateson\MailMimeParser\Header\Consumer\CommentConsumerService; +use ZBateson\MailMimeParser\Header\Consumer\GenericConsumerMimeLiteralPartService; use ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService; /** @@ -22,6 +21,7 @@ class GenericHeaderTest extends TestCase { // @phpstan-ignore-next-line protected $consumerService; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/HeaderFactoryTest.php b/tests/MailMimeParser/Header/HeaderFactoryTest.php index 050fc646..da68ab70 100644 --- a/tests/MailMimeParser/Header/HeaderFactoryTest.php +++ b/tests/MailMimeParser/Header/HeaderFactoryTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Header; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Header\Consumer\AddressBaseConsumerService; use ZBateson\MailMimeParser\Header\Consumer\AddressConsumerService; use ZBateson\MailMimeParser\Header\Consumer\AddressEmailConsumerService; @@ -14,15 +13,15 @@ use ZBateson\MailMimeParser\Header\Consumer\IdBaseConsumerService; use ZBateson\MailMimeParser\Header\Consumer\IdConsumerService; use ZBateson\MailMimeParser\Header\Consumer\ParameterConsumerService; -use ZBateson\MailMimeParser\Header\Consumer\ParameterValueConsumerService; use ZBateson\MailMimeParser\Header\Consumer\ParameterNameValueConsumerService; +use ZBateson\MailMimeParser\Header\Consumer\ParameterValueConsumerService; use ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService; use ZBateson\MailMimeParser\Header\Consumer\QuotedStringMimeLiteralPartConsumerService; -use ZBateson\MailMimeParser\Header\Consumer\ReceivedConsumerService; -use ZBateson\MailMimeParser\Header\Consumer\SubjectConsumerService; use ZBateson\MailMimeParser\Header\Consumer\Received\DomainConsumerService; use ZBateson\MailMimeParser\Header\Consumer\Received\GenericReceivedConsumerService; use ZBateson\MailMimeParser\Header\Consumer\Received\ReceivedDateConsumerService; +use ZBateson\MailMimeParser\Header\Consumer\ReceivedConsumerService; +use ZBateson\MailMimeParser\Header\Consumer\SubjectConsumerService; /** * Description of HeaderFactoryTest @@ -37,6 +36,7 @@ class HeaderFactoryTest extends TestCase { // @phpstan-ignore-next-line protected $headerFactory; + private $logger; protected function setUp() : void @@ -136,7 +136,7 @@ protected function setUp() : void ->setConstructorArgs([$this->logger, $mpf]) ->setMethods() ->getMock(); - + $agcs = $this->getMockBuilder(AddressGroupConsumerService::class) ->setConstructorArgs([$this->logger, $pf]) ->setMethods() @@ -155,7 +155,15 @@ protected function setUp() : void ->getMock(); $this->headerFactory = new HeaderFactory( - $this->logger, $mpf, $abcs, $dcs, $gcmlpcs, $idbcs, $pcs, $rcs, $scs + $this->logger, + $mpf, + $abcs, + $dcs, + $gcmlpcs, + $idbcs, + $pcs, + $rcs, + $scs ); } diff --git a/tests/MailMimeParser/Header/IdHeaderTest.php b/tests/MailMimeParser/Header/IdHeaderTest.php index f7ba797c..880ee0f4 100644 --- a/tests/MailMimeParser/Header/IdHeaderTest.php +++ b/tests/MailMimeParser/Header/IdHeaderTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Header; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Header\Consumer\CommentConsumerService; use ZBateson\MailMimeParser\Header\Consumer\IdBaseConsumerService; use ZBateson\MailMimeParser\Header\Consumer\IdConsumerService; @@ -25,6 +24,7 @@ class IdHeaderTest extends TestCase // @phpstan-ignore-next-line protected $mpf; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/MimeEncodedHeaderTest.php b/tests/MailMimeParser/Header/MimeEncodedHeaderTest.php index 8997dc36..63ea03b9 100644 --- a/tests/MailMimeParser/Header/MimeEncodedHeaderTest.php +++ b/tests/MailMimeParser/Header/MimeEncodedHeaderTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Header; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService; /** @@ -22,6 +21,7 @@ class MimeEncodedHeaderTest extends TestCase // @phpstan-ignore-next-line protected $mpf; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/ParameterHeaderTest.php b/tests/MailMimeParser/Header/ParameterHeaderTest.php index 73975abf..c380dbdb 100644 --- a/tests/MailMimeParser/Header/ParameterHeaderTest.php +++ b/tests/MailMimeParser/Header/ParameterHeaderTest.php @@ -4,11 +4,11 @@ use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\Header\Consumer\CommentConsumerService; +use ZBateson\MailMimeParser\Header\Consumer\ParameterConsumerService; +use ZBateson\MailMimeParser\Header\Consumer\ParameterNameValueConsumerService; +use ZBateson\MailMimeParser\Header\Consumer\ParameterValueConsumerService; use ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService; use ZBateson\MailMimeParser\Header\Consumer\QuotedStringMimeLiteralPartConsumerService; -use ZBateson\MailMimeParser\Header\Consumer\ParameterValueConsumerService; -use ZBateson\MailMimeParser\Header\Consumer\ParameterNameValueConsumerService; -use ZBateson\MailMimeParser\Header\Consumer\ParameterConsumerService; /** * Description of ParametersHeaderTest @@ -23,6 +23,7 @@ class ParameterHeaderTest extends TestCase { // @phpstan-ignore-next-line protected $consumerService; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Part/AddressGroupPartTest.php b/tests/MailMimeParser/Header/Part/AddressGroupPartTest.php index 6ba8d42c..9d638b7e 100644 --- a/tests/MailMimeParser/Header/Part/AddressGroupPartTest.php +++ b/tests/MailMimeParser/Header/Part/AddressGroupPartTest.php @@ -19,6 +19,7 @@ class AddressGroupPartTest extends TestCase { private $mb; + private $logger; protected function setUp() : void @@ -30,7 +31,10 @@ protected function setUp() : void private function newAddressGroupPart($nameParts, $addressAndGroupParts) { return new AddressGroupPart( - $this->logger, $this->mb, $nameParts, $addressAndGroupParts + $this->logger, + $this->mb, + $nameParts, + $addressAndGroupParts ); } diff --git a/tests/MailMimeParser/Header/Part/AddressPartTest.php b/tests/MailMimeParser/Header/Part/AddressPartTest.php index 0ea30b8f..981d2c09 100644 --- a/tests/MailMimeParser/Header/Part/AddressPartTest.php +++ b/tests/MailMimeParser/Header/Part/AddressPartTest.php @@ -19,7 +19,9 @@ class AddressPartTest extends TestCase { // @phpstan-ignore-next-line private $mb; + private $hpf; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Part/CommentPartTest.php b/tests/MailMimeParser/Header/Part/CommentPartTest.php index 4cde1140..fda1e5d8 100644 --- a/tests/MailMimeParser/Header/Part/CommentPartTest.php +++ b/tests/MailMimeParser/Header/Part/CommentPartTest.php @@ -18,7 +18,9 @@ class CommentPartTest extends TestCase { // @phpstan-ignore-next-line private $mb; + private $hpf; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Part/ContainerPartTest.php b/tests/MailMimeParser/Header/Part/ContainerPartTest.php index 4c898e0e..edec737c 100644 --- a/tests/MailMimeParser/Header/Part/ContainerPartTest.php +++ b/tests/MailMimeParser/Header/Part/ContainerPartTest.php @@ -18,7 +18,9 @@ class ContainerPartTest extends TestCase { // @phpstan-ignore-next-line private $mb; + private $hpf; + private $logger; protected function setUp() : void @@ -45,9 +47,9 @@ private function getTokenArray(string ...$args) : array private function getCommentPart(string $comment) : CommentPart { return $this->getMockBuilder(CommentPart::class) - ->setConstructorArgs([$this->logger, $this->mb, $this->hpf, $this->getTokenArray($comment)]) - ->setMethods() - ->getMock(); + ->setConstructorArgs([$this->logger, $this->mb, $this->hpf, $this->getTokenArray($comment)]) + ->setMethods() + ->getMock(); } private function newContainerPart($childParts) : ContainerPart @@ -64,7 +66,7 @@ public function testInstance() : void public function testIgnorableSpaces() : void { - $part = $this->newContainerPart($this->getTokenArray(' ', 'Kilgore', ' ' , ' ', "\n\t ", 'Trout', ' ', "\n ", ' ')); + $part = $this->newContainerPart($this->getTokenArray(' ', 'Kilgore', ' ', ' ', "\n\t ", 'Trout', ' ', "\n ", ' ')); $this->assertNotNull($part); $this->assertEquals('Kilgore Trout', $part->getValue()); } @@ -84,7 +86,7 @@ public function testIgnorableSpacesWithComments() : void public function testGetChildParts() : void { - $children = $this->getTokenArray(' ', 'Kilgore', ' ' , ' ', "\n\t ", 'Trout', ' ', "\n ", ' '); + $children = $this->getTokenArray(' ', 'Kilgore', ' ', ' ', "\n\t ", 'Trout', ' ', "\n ", ' '); $part = $this->newContainerPart($children); $this->assertNotNull($part); $this->assertEquals('Kilgore Trout', $part->getValue()); diff --git a/tests/MailMimeParser/Header/Part/DatePartTest.php b/tests/MailMimeParser/Header/Part/DatePartTest.php index 1611db33..81ae1514 100644 --- a/tests/MailMimeParser/Header/Part/DatePartTest.php +++ b/tests/MailMimeParser/Header/Part/DatePartTest.php @@ -19,6 +19,7 @@ class DatePartTest extends TestCase { // @phpstan-ignore-next-line private $mb; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Part/HeaderPartFactoryTest.php b/tests/MailMimeParser/Header/Part/HeaderPartFactoryTest.php index 70bbc5a6..ce218539 100644 --- a/tests/MailMimeParser/Header/Part/HeaderPartFactoryTest.php +++ b/tests/MailMimeParser/Header/Part/HeaderPartFactoryTest.php @@ -17,7 +17,9 @@ class HeaderPartFactoryTest extends TestCase { // @phpstan-ignore-next-line private $mb; + private $headerPartFactory; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Part/HeaderPartTest.php b/tests/MailMimeParser/Header/Part/HeaderPartTest.php index d4a044be..1d33f764 100644 --- a/tests/MailMimeParser/Header/Part/HeaderPartTest.php +++ b/tests/MailMimeParser/Header/Part/HeaderPartTest.php @@ -18,6 +18,7 @@ class HeaderPartTest extends TestCase { // @phpstan-ignore-next-line private $abstractHeaderPartStub; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Part/MimeTokenPartFactoryTest.php b/tests/MailMimeParser/Header/Part/MimeTokenPartFactoryTest.php index 2bf48e12..6f0556b8 100644 --- a/tests/MailMimeParser/Header/Part/MimeTokenPartFactoryTest.php +++ b/tests/MailMimeParser/Header/Part/MimeTokenPartFactoryTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header\Part; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; use ZBateson\MbWrapper\MbWrapper; diff --git a/tests/MailMimeParser/Header/Part/NameValuePartTest.php b/tests/MailMimeParser/Header/Part/NameValuePartTest.php index b21c8ae6..21d9bcea 100644 --- a/tests/MailMimeParser/Header/Part/NameValuePartTest.php +++ b/tests/MailMimeParser/Header/Part/NameValuePartTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Header\Part; use PHPUnit\Framework\TestCase; -use Psr\Log\LogLevel; use ZBateson\MbWrapper\MbWrapper; /** @@ -19,7 +18,9 @@ class NameValuePartTest extends TestCase { // @phpstan-ignore-next-line private $mb; + private $hpf; + private $logger; protected function setUp() : void @@ -46,9 +47,9 @@ private function getTokenArray(string ...$args) : array private function getCommentPart(string $comment) : CommentPart { return $this->getMockBuilder(CommentPart::class) - ->setConstructorArgs([$this->logger, $this->mb, $this->hpf, $this->getTokenArray($comment)]) - ->setMethods() - ->getMock(); + ->setConstructorArgs([$this->logger, $this->mb, $this->hpf, $this->getTokenArray($comment)]) + ->setMethods() + ->getMock(); } private function getContainerPart(string $value) : ContainerPart @@ -85,7 +86,7 @@ public function testBasicNameValuePair() : void public function testIgnorableSpaces() : void { - $parts = $this->getTokenArray(' ', 'Kilgore', ' ' , ' ', "\n\t ", 'Trout', ' ', "\n ", ' '); + $parts = $this->getTokenArray(' ', 'Kilgore', ' ', ' ', "\n\t ", 'Trout', ' ', "\n ", ' '); $this->assertNameValue('Kilgore Trout', 'Kilgore Trout', $parts, $parts); } @@ -103,10 +104,10 @@ public function testIgnorableSpacesWithComments() : void public function testGetChildParts() : void { - $parts = $this->getTokenArray(' ', 'Kilgore', ' ' , ' ', "\n\t ", 'Trout', ' ', "\n ", ' '); + $parts = $this->getTokenArray(' ', 'Kilgore', ' ', ' ', "\n\t ", 'Trout', ' ', "\n ", ' '); $part = $this->assertNameValue('Kilgore Trout', 'Kilgore Trout', $parts, $parts); $children = \array_merge($parts, $parts); - $this->assertCount(count($children), $part->getChildParts()); + $this->assertCount(\count($children), $part->getChildParts()); $this->assertEquals($children, $part->getChildParts()); } @@ -121,7 +122,7 @@ public function testGetChildPartsWithComments() : void ); $part = $this->assertNameValue('Kilgore Trout', 'Kilgore Trout', $parts, $parts); $children = \array_merge($parts, $parts); - $this->assertCount(count($children), $part->getChildParts()); + $this->assertCount(\count($children), $part->getChildParts()); $this->assertEquals($children, $part->getChildParts()); $this->assertCount(4, $part->getComments()); $this->assertEquals([$children[3], $children[8], $children[3], $children[8]], $part->getComments()); @@ -129,7 +130,7 @@ public function testGetChildPartsWithComments() : void public function testErrorOnChildPart() : void { - $parts = $this->getTokenArray(' ', 'Kilgore', ' ' , ' ', "\n\t ", 'Trout', ' ', "\n ", ' '); + $parts = $this->getTokenArray(' ', 'Kilgore', ' ', ' ', "\n\t ", 'Trout', ' ', "\n ", ' '); $part = $this->assertNameValue('Kilgore Trout', 'Kilgore Trout', $parts, $parts); $parts[0]->addError('Test', \Psr\Log\LogLevel::ERROR); diff --git a/tests/MailMimeParser/Header/Part/ParameterPartTest.php b/tests/MailMimeParser/Header/Part/ParameterPartTest.php index b6fab783..382e2727 100644 --- a/tests/MailMimeParser/Header/Part/ParameterPartTest.php +++ b/tests/MailMimeParser/Header/Part/ParameterPartTest.php @@ -19,6 +19,7 @@ class ParameterPartTest extends TestCase { // @phpstan-ignore-next-line private $mb; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Part/QuotedLiteralPartTest.php b/tests/MailMimeParser/Header/Part/QuotedLiteralPartTest.php index 1a91874b..a16d70ea 100644 --- a/tests/MailMimeParser/Header/Part/QuotedLiteralPartTest.php +++ b/tests/MailMimeParser/Header/Part/QuotedLiteralPartTest.php @@ -18,7 +18,9 @@ class QuotedLiteralPartTest extends TestCase { // @phpstan-ignore-next-line private $mb; + private $hpf; + private $logger; protected function setUp() : void @@ -45,9 +47,9 @@ private function getTokenArray(string ...$args) : array private function getCommentPart(string $comment) : CommentPart { return $this->getMockBuilder(CommentPart::class) - ->setConstructorArgs([$this->logger, $this->mb, $this->hpf, $this->getTokenArray($comment)]) - ->setMethods() - ->getMock(); + ->setConstructorArgs([$this->logger, $this->mb, $this->hpf, $this->getTokenArray($comment)]) + ->setMethods() + ->getMock(); } private function newQuotedLiteralPart($childParts) : QuotedLiteralPart @@ -64,7 +66,7 @@ public function testInstance() : void public function testNotIgnorableSpaces() : void { - $part = $this->newQuotedLiteralPart($this->getTokenArray(' ', 'Kilgore', ' ' , ' ', "\n\t", ' ', 'Trout', ' ', "\n ", ' ')); + $part = $this->newQuotedLiteralPart($this->getTokenArray(' ', 'Kilgore', ' ', ' ', "\n\t", ' ', 'Trout', ' ', "\n ", ' ')); $this->assertNotNull($part); $this->assertEquals(" Kilgore \t Trout ", $part->getValue()); } diff --git a/tests/MailMimeParser/Header/Part/ReceivedDomainPartTest.php b/tests/MailMimeParser/Header/Part/ReceivedDomainPartTest.php index 6910e90e..d103268d 100644 --- a/tests/MailMimeParser/Header/Part/ReceivedDomainPartTest.php +++ b/tests/MailMimeParser/Header/Part/ReceivedDomainPartTest.php @@ -18,7 +18,9 @@ class ReceivedDomainPartTest extends TestCase { // @phpstan-ignore-next-line private $mb; + private $hpf; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Part/ReceivedPartTest.php b/tests/MailMimeParser/Header/Part/ReceivedPartTest.php index 0a9bb124..f928c918 100644 --- a/tests/MailMimeParser/Header/Part/ReceivedPartTest.php +++ b/tests/MailMimeParser/Header/Part/ReceivedPartTest.php @@ -4,7 +4,6 @@ use PHPUnit\Framework\TestCase; use ZBateson\MbWrapper\MbWrapper; -use Psr\Log\NullLogger; /** * Description of ReceivedTest @@ -19,7 +18,9 @@ class ReceivedPartTest extends TestCase { // @phpstan-ignore-next-line private $mb; + private $hpf; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/Part/SplitParameterPartTest.php b/tests/MailMimeParser/Header/Part/SplitParameterPartTest.php index 0c3f9c9c..42766c2f 100644 --- a/tests/MailMimeParser/Header/Part/SplitParameterPartTest.php +++ b/tests/MailMimeParser/Header/Part/SplitParameterPartTest.php @@ -4,7 +4,6 @@ use PHPUnit\Framework\TestCase; use ZBateson\MbWrapper\MbWrapper; -use Psr\Log\NullLogger; /** * Description of ParameterTest @@ -19,7 +18,9 @@ class SplitParameterPartTest extends TestCase { // @phpstan-ignore-next-line private $logger; + private $mb; + private $hpf; protected function setUp() : void @@ -56,21 +57,21 @@ private function assertNameValue(string $expectedName, string $expectedValue, st if ($actualValues === null) { $actualValues = [$expectedValue]; } - if (!is_array($actualValues)) { + if (!\is_array($actualValues)) { $actualValues = [$actualValues]; } - if (!is_array($actualNames)) { + if (!\is_array($actualNames)) { $actualNames = [$actualNames]; } - if (count($actualNames) < count($actualValues)) { - $actualNames = array_fill(count($actualNames), count($actualValues), $expectedName); + if (\count($actualNames) < \count($actualValues)) { + $actualNames = \array_fill(\count($actualNames), \count($actualValues), $expectedName); } $mapped = \array_map( fn ($arr) => new ParameterPart($this->logger, $this->mb, [$this->getToken($arr[0])], $this->getContainerPart($arr[1])), \array_map(null, $actualNames, $actualValues) ); - + $part = new SplitParameterPart($this->logger, $this->mb, $this->hpf, $mapped); $this->assertEquals($expectedName, $part->getName()); $this->assertEquals($expectedValue, $part->getValue()); diff --git a/tests/MailMimeParser/Header/Part/TokenTest.php b/tests/MailMimeParser/Header/Part/TokenTest.php index 8c51f100..307cbf56 100644 --- a/tests/MailMimeParser/Header/Part/TokenTest.php +++ b/tests/MailMimeParser/Header/Part/TokenTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Header\Part; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MbWrapper\MbWrapper; /** @@ -57,7 +56,7 @@ public function testLiteralAndPreserveSpace() : void $token = $this->newToken(' '); $this->assertNotNull($token); $this->assertEquals(' ', $token->getValue()); - + $token = $this->newToken("\n ", false, true); $this->assertNotNull($token); $this->assertEquals(' ', $token->getValue()); diff --git a/tests/MailMimeParser/Header/ReceivedHeaderTest.php b/tests/MailMimeParser/Header/ReceivedHeaderTest.php index 3a9759b8..467e87c2 100644 --- a/tests/MailMimeParser/Header/ReceivedHeaderTest.php +++ b/tests/MailMimeParser/Header/ReceivedHeaderTest.php @@ -24,6 +24,7 @@ class ReceivedHeaderTest extends TestCase { // @phpstan-ignore-next-line protected $consumerService; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/Header/SubjectHeaderTest.php b/tests/MailMimeParser/Header/SubjectHeaderTest.php index fbf05ab8..3854743e 100644 --- a/tests/MailMimeParser/Header/SubjectHeaderTest.php +++ b/tests/MailMimeParser/Header/SubjectHeaderTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Header; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; /** @@ -18,6 +17,7 @@ class SubjectHeaderTest extends TestCase { // @phpstan-ignore-next-line protected $consumerService; + private $logger; protected function setUp() : void diff --git a/tests/MailMimeParser/IntegrationTests/EmailFunctionalTest.php b/tests/MailMimeParser/IntegrationTests/EmailFunctionalTest.php index 9160faf5..cb6500ed 100644 --- a/tests/MailMimeParser/IntegrationTests/EmailFunctionalTest.php +++ b/tests/MailMimeParser/IntegrationTests/EmailFunctionalTest.php @@ -2783,7 +2783,7 @@ public function testParseEmailInvalidCharset() : void $this->assertCount(1, $errors); $this->assertInstanceOf(UnsupportedCharsetException::class, $errors[0]->getException()); - $tmpSaved = \fopen(\dirname(__DIR__, 2) . '/' . TEST_OUTPUT_DIR . "/invalid-charset", 'w+'); + $tmpSaved = \fopen(\dirname(__DIR__, 2) . '/' . TEST_OUTPUT_DIR . '/invalid-charset', 'w+'); $parts = $message->getAllParts(); foreach ($parts as $part) { @@ -2822,7 +2822,7 @@ public function testParseEmailInvalidCharsetNoExceptionOption() : void $this->assertCount(1, $errors); $this->assertInstanceOf(UnsupportedCharsetException::class, $errors[0]->getException()); - $tmpSaved = \fopen(\dirname(__DIR__, 2) . '/' . TEST_OUTPUT_DIR . "/invalid-charset", 'w+'); + $tmpSaved = \fopen(\dirname(__DIR__, 2) . '/' . TEST_OUTPUT_DIR . '/invalid-charset', 'w+'); $parts = $message->getAllParts(); foreach ($parts as $part) { diff --git a/tests/MailMimeParser/Message/Factory/IMimePartFactoryTest.php b/tests/MailMimeParser/Message/Factory/IMimePartFactoryTest.php index 0f0fc635..d0f288d7 100644 --- a/tests/MailMimeParser/Message/Factory/IMimePartFactoryTest.php +++ b/tests/MailMimeParser/Message/Factory/IMimePartFactoryTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Message\Factory; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Stream\MessagePartStream; /** diff --git a/tests/MailMimeParser/Message/Factory/IUUEncodedPartFactoryTest.php b/tests/MailMimeParser/Message/Factory/IUUEncodedPartFactoryTest.php index 08896b30..0cdf38b8 100644 --- a/tests/MailMimeParser/Message/Factory/IUUEncodedPartFactoryTest.php +++ b/tests/MailMimeParser/Message/Factory/IUUEncodedPartFactoryTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Message\Factory; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Stream\MessagePartStream; /** diff --git a/tests/MailMimeParser/Message/Factory/PartHeaderContainerFactoryTest.php b/tests/MailMimeParser/Message/Factory/PartHeaderContainerFactoryTest.php index b74ce5dd..9bd73db9 100644 --- a/tests/MailMimeParser/Message/Factory/PartHeaderContainerFactoryTest.php +++ b/tests/MailMimeParser/Message/Factory/PartHeaderContainerFactoryTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Message\Factory; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; /** * PartHeaderContainerFactoryTest diff --git a/tests/MailMimeParser/Message/Factory/PartStreamContainerFactoryTest.php b/tests/MailMimeParser/Message/Factory/PartStreamContainerFactoryTest.php index 7b5052f2..762ec8c0 100644 --- a/tests/MailMimeParser/Message/Factory/PartStreamContainerFactoryTest.php +++ b/tests/MailMimeParser/Message/Factory/PartStreamContainerFactoryTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Message\Factory; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MbWrapper\MbWrapper; /** diff --git a/tests/MailMimeParser/Message/MessagePartTest.php b/tests/MailMimeParser/Message/MessagePartTest.php index 9a1e936d..f1f73c53 100644 --- a/tests/MailMimeParser/Message/MessagePartTest.php +++ b/tests/MailMimeParser/Message/MessagePartTest.php @@ -6,7 +6,6 @@ use GuzzleHttp\Psr7; use GuzzleHttp\Psr7\StreamWrapper; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; /** @@ -181,10 +180,10 @@ public function testSaveContent() : void ->method('getBinaryContentStream') ->willReturnOnConsecutiveCalls($f, $s); - $file = tempnam(sys_get_temp_dir(), 'mmp_test_save_content'); + $file = \tempnam(\sys_get_temp_dir(), 'mmp_test_save_content'); $messagePart->saveContent($file); $this->assertEquals('Que tonto', \file_get_contents($file)); - unlink($file); + \unlink($file); } public function testSaveContentToStream() : void @@ -314,9 +313,9 @@ public function testSaveToFile() : void Psr7\Utils::streamFor('other demons') ); - $file = tempnam(sys_get_temp_dir(), 'mmp_test_save_to_file'); + $file = \tempnam(\sys_get_temp_dir(), 'mmp_test_save_to_file'); $messagePart->save($file); $this->assertEquals('Demigorgon', \file_get_contents($file)); - unlink($file); + \unlink($file); } } diff --git a/tests/MailMimeParser/Message/MimePartTest.php b/tests/MailMimeParser/Message/MimePartTest.php index 9a35febd..1879458c 100644 --- a/tests/MailMimeParser/Message/MimePartTest.php +++ b/tests/MailMimeParser/Message/MimePartTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Message; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use Traversable; use ZBateson\MailMimeParser\Header\IHeader; diff --git a/tests/MailMimeParser/Message/MultiPartTest.php b/tests/MailMimeParser/Message/MultiPartTest.php index e2895e83..c17713e5 100644 --- a/tests/MailMimeParser/Message/MultiPartTest.php +++ b/tests/MailMimeParser/Message/MultiPartTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Message; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; /** * Description of MultiPartTest diff --git a/tests/MailMimeParser/Message/PartHeaderContainerTest.php b/tests/MailMimeParser/Message/PartHeaderContainerTest.php index d302736c..359334ad 100644 --- a/tests/MailMimeParser/Message/PartHeaderContainerTest.php +++ b/tests/MailMimeParser/Message/PartHeaderContainerTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Message; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Header\IHeader; /** @@ -18,6 +17,7 @@ class PartHeaderContainerTest extends TestCase { // @phpstan-ignore-next-line protected $mhf; + protected $instance; protected function setUp() : void diff --git a/tests/MailMimeParser/Message/PartStreamContainerTest.php b/tests/MailMimeParser/Message/PartStreamContainerTest.php index 8a066d9e..215a46eb 100644 --- a/tests/MailMimeParser/Message/PartStreamContainerTest.php +++ b/tests/MailMimeParser/Message/PartStreamContainerTest.php @@ -2,11 +2,10 @@ namespace ZBateson\MailMimeParser\Message; -use Psr\Log\NullLogger; use GuzzleHttp\Psr7; use PHPUnit\Framework\TestCase; -use ZBateson\MbWrapper\MbWrapper; use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; +use ZBateson\MbWrapper\MbWrapper; /** * PartStreamFilterManagerTest @@ -73,7 +72,7 @@ public function testGetBinaryStream() : void $streamPartMock = $this->getMockForAbstractClass(\ZBateson\MailMimeParser\Message\IMessagePart::class); $this->mockStreamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); @@ -99,7 +98,7 @@ public function testGetContentStreamWithQuotedPrintableDecoderTransferEncoding() ->willReturn($stream); $this->mockStreamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); $streamPartMock = $this->getMockForAbstractClass(\ZBateson\MailMimeParser\Message\IMessagePart::class); @@ -119,7 +118,7 @@ public function testGetContentStreamWithBase64DecoderTransferEncoding() : void ->willReturn($stream); $this->mockStreamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); $this->instance->setContentStream($stream); @@ -137,7 +136,7 @@ public function testGetContentStreamWithUUDecoderTransferEncoding() : void ->willReturn($stream); $this->mockStreamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); $this->instance->setContentStream($stream); @@ -155,7 +154,7 @@ public function testGetContentStreamWithCharsetEncoding() : void ->willReturn($stream); $this->mockStreamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); $this->instance->setContentStream($stream); @@ -179,10 +178,10 @@ public function testGetContentStreamWithReAttachedTransferEncodingDecoder() : vo ->willReturnOnConsecutiveCalls($stream2, $stream, $stream3); $this->mockStreamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); - + $this->instance->setContentStream($stream); $streamPartMock = $this->getMockForAbstractClass(\ZBateson\MailMimeParser\Message\IMessagePart::class); @@ -214,7 +213,7 @@ public function testGetContentStreamWithReAttachedCharsetConversionDecoder() : v ->willReturnOnConsecutiveCalls($stream, $stream2, $stream3, $stream4); $this->mockStreamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); $this->instance->setContentStream($stream); @@ -242,7 +241,7 @@ public function testGetContentStreamWithCharsetAndTransferEncoding() : void ->willReturn($stream); $this->mockStreamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); diff --git a/tests/MailMimeParser/Message/UUEncodedPartTest.php b/tests/MailMimeParser/Message/UUEncodedPartTest.php index 615dc674..f8860d2e 100644 --- a/tests/MailMimeParser/Message/UUEncodedPartTest.php +++ b/tests/MailMimeParser/Message/UUEncodedPartTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Message; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; /** * Description of UUEncodedPartTest diff --git a/tests/MailMimeParser/MessageTest.php b/tests/MailMimeParser/MessageTest.php index 076c10c7..9b46808b 100644 --- a/tests/MailMimeParser/MessageTest.php +++ b/tests/MailMimeParser/MessageTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser; -use Psr\Log\NullLogger; use GuzzleHttp\Psr7\Utils; use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\Message\PartChildrenContainer; diff --git a/tests/MailMimeParser/Parser/Part/ParserPartStreamContainerTest.php b/tests/MailMimeParser/Parser/Part/ParserPartStreamContainerTest.php index 8e183ccf..b5397f07 100644 --- a/tests/MailMimeParser/Parser/Part/ParserPartStreamContainerTest.php +++ b/tests/MailMimeParser/Parser/Part/ParserPartStreamContainerTest.php @@ -2,11 +2,10 @@ namespace ZBateson\MailMimeParser\Parser\Part; -use Psr\Log\NullLogger; use GuzzleHttp\Psr7\Utils; use PHPUnit\Framework\TestCase; -use ZBateson\MbWrapper\MbWrapper; use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; +use ZBateson\MbWrapper\MbWrapper; /** * ParserPartStreamContainerTest @@ -104,7 +103,7 @@ public function testGetContentRequestsContentStreamReturnsStream() : void ->willReturn($stream); $this->streamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); @@ -146,7 +145,7 @@ public function testGetBinaryContentRequestsContentStreamReturnsStream() : void ->willReturn($stream); $this->streamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); @@ -182,7 +181,7 @@ public function testGetStreamParsesPart() : void ->willReturn($stream); $this->streamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); @@ -205,7 +204,7 @@ public function testGetStreamAfterUpdate() : void ->willReturn($parsedStream); $this->streamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); @@ -231,7 +230,7 @@ public function testDetachedParsedStream() : void ->willReturn($parsedStream); $this->streamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); @@ -244,7 +243,7 @@ public function testDetachedParsedStream() : void public function testAttachedParsedStream() : void { $parsedStream = Utils::streamFor('Fighting bOars', ['metadata' => ['mmp-detached-stream' => false]]); - + $this->proxy->expects($this->once()) ->method('parseAll'); $this->streamFactory->expects($this->once()) @@ -253,7 +252,7 @@ public function testAttachedParsedStream() : void ->willReturn($parsedStream); $this->streamFactory->expects($this->atLeastOnce()) ->method('newDecoratedMessagePartStream') - ->willReturnCallback(function ($arg, $arg2) { + ->willReturnCallback(function($arg, $arg2) { return new MessagePartStreamDecorator($arg, $arg2); }); diff --git a/tests/MailMimeParser/Parser/Part/UUEncodedPartHeaderContainerFactoryTest.php b/tests/MailMimeParser/Parser/Part/UUEncodedPartHeaderContainerFactoryTest.php index 1994bfb0..4a25ede9 100644 --- a/tests/MailMimeParser/Parser/Part/UUEncodedPartHeaderContainerFactoryTest.php +++ b/tests/MailMimeParser/Parser/Part/UUEncodedPartHeaderContainerFactoryTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Parser\Part; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; /** * UUEncodedPartHeaderContainerFactoryTest diff --git a/tests/MailMimeParser/Parser/Part/UUEncodedPartHeaderContainerTest.php b/tests/MailMimeParser/Parser/Part/UUEncodedPartHeaderContainerTest.php index 9d129435..d58ca71c 100644 --- a/tests/MailMimeParser/Parser/Part/UUEncodedPartHeaderContainerTest.php +++ b/tests/MailMimeParser/Parser/Part/UUEncodedPartHeaderContainerTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Parser\Part; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; /** * UUEncodedPartHeaderContainerTest diff --git a/tests/MailMimeParser/Parser/Proxy/ParserMessageProxyFactoryTest.php b/tests/MailMimeParser/Parser/Proxy/ParserMessageProxyFactoryTest.php index d32e6530..8a4e2b98 100644 --- a/tests/MailMimeParser/Parser/Proxy/ParserMessageProxyFactoryTest.php +++ b/tests/MailMimeParser/Parser/Proxy/ParserMessageProxyFactoryTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Parser\Proxy; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; diff --git a/tests/MailMimeParser/Parser/Proxy/ParserMimePartProxyFactoryTest.php b/tests/MailMimeParser/Parser/Proxy/ParserMimePartProxyFactoryTest.php index 245a5d0e..cf0739eb 100644 --- a/tests/MailMimeParser/Parser/Proxy/ParserMimePartProxyFactoryTest.php +++ b/tests/MailMimeParser/Parser/Proxy/ParserMimePartProxyFactoryTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Parser\Proxy; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; diff --git a/tests/MailMimeParser/Parser/Proxy/ParserNonMimeMessageProxyFactoryTest.php b/tests/MailMimeParser/Parser/Proxy/ParserNonMimeMessageProxyFactoryTest.php index 2c58b932..38c0b4d9 100644 --- a/tests/MailMimeParser/Parser/Proxy/ParserNonMimeMessageProxyFactoryTest.php +++ b/tests/MailMimeParser/Parser/Proxy/ParserNonMimeMessageProxyFactoryTest.php @@ -3,7 +3,6 @@ namespace ZBateson\MailMimeParser\Parser\Proxy; use PHPUnit\Framework\TestCase; -use Psr\Log\NullLogger; use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; /** diff --git a/tests/MailMimeParser/Parser/Proxy/ParserUUEncodedPartProxyFactoryTest.php b/tests/MailMimeParser/Parser/Proxy/ParserUUEncodedPartProxyFactoryTest.php index 784dfb14..6a107681 100644 --- a/tests/MailMimeParser/Parser/Proxy/ParserUUEncodedPartProxyFactoryTest.php +++ b/tests/MailMimeParser/Parser/Proxy/ParserUUEncodedPartProxyFactoryTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Parser\Proxy; -use Psr\Log\NullLogger; use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; diff --git a/tests/MailMimeParser/Stream/MessagePartStreamReadExceptionTest.php b/tests/MailMimeParser/Stream/MessagePartStreamReadExceptionTest.php index b0c01736..4a919e03 100644 --- a/tests/MailMimeParser/Stream/MessagePartStreamReadExceptionTest.php +++ b/tests/MailMimeParser/Stream/MessagePartStreamReadExceptionTest.php @@ -2,7 +2,6 @@ namespace ZBateson\MailMimeParser\Stream; -use GuzzleHttp\Psr7; use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\Message\IMessagePart; diff --git a/tests/MailMimeParser/Stream/MessagePartStreamTest.php b/tests/MailMimeParser/Stream/MessagePartStreamTest.php index 52ac924e..3be7570c 100644 --- a/tests/MailMimeParser/Stream/MessagePartStreamTest.php +++ b/tests/MailMimeParser/Stream/MessagePartStreamTest.php @@ -5,9 +5,8 @@ use GuzzleHttp\Psr7; use PHPUnit\Framework\TestCase; use ZBateson\MailMimeParser\IMessage; -use ZBateson\StreamDecorators\DecoratedCachingStream; use ZBateson\StreamDecorators\CharsetStream; -use ZBateson\MailMimeParser\Stream\MessagePartStreamDecorator; +use ZBateson\StreamDecorators\DecoratedCachingStream; /** * MessagePartStreamTest diff --git a/tests/setup-test-logger.php b/tests/setup-test-logger.php index 48d37550..4b6a6393 100644 --- a/tests/setup-test-logger.php +++ b/tests/setup-test-logger.php @@ -1,8 +1,8 @@ pushProcessor(new PsrLogMessageProcessor(removeUsedContextFields: true)); @\unlink(__DIR__ . '/' . TEST_LOG_FILE); $logger->pushHandler(new StreamHandler(__DIR__ . '/' . TEST_LOG_FILE, 'debug')); - $logger->pushHandler(mmpGetAndClearTestHandler()); + $logger->pushHandler(\mmpGetAndClearTestHandler()); } return $logger; }