php-cs-fixer fixes

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);
     }
 

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
             )));

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.

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
     {

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.

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
     {

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
             ))

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.

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.
      */

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
     {

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
  */

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
     {

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.

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.

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.

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)));
     }
 }

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

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
         ));

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) {

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];

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 [];
     }

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
     {

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;

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,

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(),

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;
 
 /**

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.

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.

src/MailMimeParser.php

@@ -80,7 +80,7 @@ class MailMimeParser
      * @var array<array|string|DefinitionSource> 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;
     }