Merge pull request #37 from rpkamp/upgrade-doctrine-cs

Upgrade doctrine CS to version 7

Author: rpkamp

composer.json

@@ -33,12 +33,11 @@
         "phpmd/phpmd": "^2.1.2",
         "phpunit/phpunit": "^8.0",
         "php-http/curl-client": "^2.0",
-        "squizlabs/php_codesniffer": "^3.4",
         "swiftmailer/swiftmailer": "^6.2",
         "phpstan/phpstan": "^0.12",
         "pdepend/pdepend": "^2.5",
         "maglnet/composer-require-checker": "^2.0",
         "nyholm/psr7": "^1.2",
-        "doctrine/coding-standard": "^6.0"
+        "doctrine/coding-standard": "^7.0"
     }
 }

phpcs.xml.dist

@@ -20,6 +20,9 @@
         <exclude name="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison.DisallowedYodaComparison" />
         <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.IncorrectWhitespaceBetweenOpenTagAndDeclare" />
         <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing.IncorrectWhitespaceBeforeColon" />
+
+        <!-- This package supports PHP 7.2/7.3 and therefore can not use native type hints -->
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint" />
     </rule>
 
     <!-- require declare(strict_types=1) in each file, with 0 empty lines above and 1 empty line below -->

src/Message/ContactCollection.php

@@ -57,6 +57,9 @@ public function contains(Contact $needle): bool
         return false;
     }
 
+    /**
+     * @return Traversable<Contact>
+     */
     public function getIterator(): Traversable
     {
         return new ArrayIterator($this->contacts);

src/Message/Message.php

@@ -74,6 +74,7 @@ public function __construct(
                 );
             }
         }
+
         $this->messageId = $messageId;
         $this->sender = $sender;
         $this->recipients = $recipients;

src/Message/Mime/MimePartCollection.php

@@ -82,6 +82,7 @@ public function getBody(): string
             if ($mimePart->isAttachment()) {
                 continue;
             }
+
             if (stripos($mimePart->getContentType(), 'text/html') === 0) {
                 return $mimePart->getBody();
             }
@@ -91,6 +92,7 @@ public function getBody(): string
             if ($mimePart->isAttachment()) {
                 continue;
             }
+
             if (stripos($mimePart->getContentType(), 'text/plain') === 0) {
                 return $mimePart->getBody();
             }