Merge branch 'master' of github.com:zbateson/mail-mime-parser

zbateson · Mar 2, 2024 · 0db93a6 · 0db93a6
2 parents 089ac1f + 4f662eb
commit 0db93a6
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 308 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -6,7 +6,7 @@
  *
  */
 
-$config = include 'PhpCsFixer.php';
+$config = include 'vendor/zbateson/mb-wrapper/PhpCsFixer.php';
 
 return $config->setFinder(PhpCsFixer\Finder::create()
     ->exclude('vendor')

diff --git a/PhpCsFixer.php b/PhpCsFixer.php
diff --git a/src/Header/Consumer/AbstractGenericConsumerService.php b/src/Header/Consumer/AbstractGenericConsumerService.php
@@ -92,7 +92,6 @@ private function addSpaceToRetParts(array $parts, array &$retParts, int $curInde
      *
      * @param HeaderPart[] $parts
      * @param HeaderPart[] $retParts
-     * @param HeaderPart $spacePart
      */
     private function addSpaces(array $parts, array &$retParts, int $curIndex, ?HeaderPart &$spacePart = null) : self
     {

diff --git a/src/Header/Consumer/Received/DomainConsumerService.php b/src/Header/Consumer/Received/DomainConsumerService.php
@@ -59,9 +59,6 @@ protected function isEndToken(string $token) : bool
      * Attempts to match a parenthesized expression to find a hostname and an
      * address.  Returns true if the expression matched, and either hostname or
      * address were found.
-     *
-     * @param string $hostname
-     * @param string $address
      */
     private function matchHostPart(string $value, ?string &$hostname, ?string &$address) : bool
     {

diff --git a/src/MailMimeParser.php b/src/MailMimeParser.php
@@ -89,9 +89,6 @@ public static function getGlobalContainer() : Container
 
     /**
      * Sets global configuration for php-di.
-     *
-     * @param array|string|DefinitionSource $phpDiConfig
-     * @return void
      */
     public static function setGlobalPhpDiConfiguration(array|string|DefinitionSource $phpDiConfig) : void
     {

diff --git a/src/Message/NonMimePart.php b/src/Message/NonMimePart.php
@@ -25,8 +25,6 @@ public function isTextPart() : bool
 
     /**
      * Returns text/plain
-     *
-     * @return string
      */
     public function getContentType(string $default = 'text/plain') : ?string
     {
@@ -35,8 +33,6 @@ public function getContentType(string $default = 'text/plain') : ?string
 
     /**
      * Returns ISO-8859-1
-     *
-     * @return string
      */
     public function getCharset() : ?string
     {
@@ -45,8 +41,6 @@ public function getCharset() : ?string
 
     /**
      * Returns 'inline'.
-     *
-     * @return string
      */
     public function getContentDisposition(?string $default = 'inline') : ?string
     {
@@ -55,8 +49,6 @@ public function getContentDisposition(?string $default = 'inline') : ?string
 
     /**
      * Returns '7bit'.
-     *
-     * @return string
      */
     public function getContentTransferEncoding(?string $default = '7bit') : ?string
     {

diff --git a/src/Message/PartStreamContainer.php b/src/Message/PartStreamContainer.php
@@ -130,8 +130,6 @@ public function hasContent() : bool
      *
      * setContentStream can be called with 'null' to indicate the IMessagePart
      * does not contain any content.
-     *
-     * @param StreamInterface $contentStream
      */
     public function setContentStream(?StreamInterface $contentStream = null)
     {
@@ -143,8 +141,6 @@ public function setContentStream(?StreamInterface $contentStream = null)
     /**
      * Returns true if the attached stream filter used for decoding the content
      * on the current handle is different from the one passed as an argument.
-     *
-     * @param string $transferEncoding
      */
     private function isTransferEncodingFilterChanged(?string $transferEncoding) : bool
     {
@@ -166,8 +162,6 @@ private function isCharsetFilterChanged(string $fromCharset, string $toCharset)
     /**
      * Attaches a decoding filter to the attached content handle, for the passed
      * $transferEncoding.
-     *
-     * @param string $transferEncoding
      */
     protected function attachTransferEncodingFilter(?string $transferEncoding) : self
     {
@@ -283,9 +277,6 @@ public function getContentStream(?string $transferEncoding, ?string $fromCharset
     /**
      * Checks what transfer-encoding decoder stream is attached on the
      * underlying stream, and resets it if the requested arguments differ.
-     *
-     * @param string $transferEncoding
-     * @return StreamInterface
      */
     public function getBinaryContentStream(?string $transferEncoding = null) : ?StreamInterface
     {

diff --git a/src/Message/UUEncodedPart.php b/src/Message/UUEncodedPart.php
@@ -41,8 +41,6 @@ public function __construct(
     /**
      * Returns the filename included in the uuencoded 'begin' line for this
      * part.
-     *
-     * @return string
      */
     public function getFilename() : ?string
     {
@@ -75,8 +73,6 @@ public function isTextPart() : bool
 
     /**
      * Returns 'application/octet-stream'.
-     *
-     * @return string
      */
     public function getContentType(string $default = 'application/octet-stream') : ?string
     {

diff --git a/src/Parser/Part/UUEncodedPartHeaderContainer.php b/src/Parser/Part/UUEncodedPartHeaderContainer.php
@@ -51,8 +51,6 @@ public function setUnixFileMode(int $mode)
     /**
      * Returns the filename included in the uuencoded 'begin' line for this
      * part.
-     *
-     * @return string
      */
     public function getFilename() : ?string
     {