Drop support for PHP 7.x

rpkamp · Mar 2, 2024 · a18c81f · a18c81f
1 parent 1f6e713
commit a18c81f
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 276 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,10 +22,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["7.2", "7.3", "7.4", "8.0"]
-        composer-flags: ["", "--prefer-lowest"]
-    env:
-      COMPOSER_ROOT_VERSION: dev-master
+        php: ["8.0", "8.1", "8.2", "8.3"]
+
     steps:
       - uses: actions/checkout@v2
 
@@ -36,7 +34,7 @@ jobs:
           coverage: pcov
 
       - name: Install dependencies
-        run: composer update ${{ matrix.composer-flags }}
+        run: composer update
 
       - name: Run tests
         run: make test
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "phpstan/phpstan": "^0.12.64",
         "pdepend/pdepend": "^2.5",
         "nyholm/psr7": "^1.2",
-        "doctrine/coding-standard": "^8.0",
+        "doctrine/coding-standard": "^9.0",
         "php-parallel-lint/php-parallel-lint": "^1.2",
         "egulias/email-validator": "^2.1.23",
         "symfony/mailer": "^5.0"

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -28,9 +28,10 @@
     <!-- require declare(strict_types=1) in each file, with 0 empty lines above and 1 empty line below -->
     <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
         <properties>
-            <property name="newlinesCountBetweenOpenTagAndDeclare" value="1" />
+            <!-- <property name="newlinesCountBetweenOpenTagAndDeclare" value="1" /> -->
+            <property name="linesCountBeforeDeclare" value="0" />
             <property name="spacesCountAroundEqualsSign" value="0" />
-            <property name="newlinesCountAfterDeclare" value="2" />
+            <!-- <property name="newlinesCountAfterDeclare" value="2" /> -->
         </properties>
     </rule>
 

diff --git a/src/MailhogClient.php b/src/MailhogClient.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 namespace rpkamp\Mailhog;
@@ -25,42 +24,19 @@
 
 class MailhogClient
 {
-    /**
-     * @var ClientInterface
-     */
-    private $httpClient;
-
-    /**
-     * @var RequestFactoryInterface
-     */
-    private $requestFactory;
-
-    /**
-     * @var StreamFactoryInterface
-     */
-    private $streamFactory;
-
-    /**
-     * @var string
-     */
-    private $baseUri;
-
     public function __construct(
-        ClientInterface $client,
-        RequestFactoryInterface $requestFactory,
-        StreamFactoryInterface $streamFactory,
-        string $baseUri
+        private ClientInterface $httpClient,
+        private RequestFactoryInterface $requestFactory,
+        private StreamFactoryInterface $streamFactory,
+        private string $baseUri
     ) {
-        $this->httpClient = $client;
-        $this->requestFactory = $requestFactory;
-        $this->streamFactory = $streamFactory;
         $this->baseUri = rtrim($baseUri, '/');
     }
 
     /**
      * @return Generator|Message[]
      */
-    public function findAllMessages(int $limit = 50)
+    public function findAllMessages(int $limit = 50): Generator
     {
         $start = 0;
         while (true) {

diff --git a/src/Message/Contact.php b/src/Message/Contact.php
@@ -9,20 +9,8 @@
 
 class Contact
 {
-    /**
-     * @var string
-     */
-    public $emailAddress;
-
-    /**
-     * @var string|null
-     */
-    public $name;
-
-    public function __construct(string $emailAddress, ?string $name = null)
+    public function __construct(private string $emailAddress, private string |null $name = null)
     {
-        $this->emailAddress = $emailAddress;
-        $this->name = $name;
     }
 
     public static function fromString(string $contact): Contact

diff --git a/src/Message/ContactCollection.php b/src/Message/ContactCollection.php
@@ -18,17 +18,11 @@
  */
 class ContactCollection implements Countable, IteratorAggregate
 {
-    /**
-     * @var array|Contact[]
-     */
-    private $contacts;
-
     /**
      * @param Contact[] $contacts
      */
-    public function __construct(array $contacts)
+    public function __construct(private array $contacts)
     {
-        $this->contacts = $contacts;
     }
 
     public static function fromString(string $contacts): ContactCollection

diff --git a/src/Message/Headers.php b/src/Message/Headers.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 namespace rpkamp\Mailhog\Message;
@@ -9,17 +8,11 @@
 
 class Headers
 {
-    /**
-     * @var array<string, string> $headers
-     */
-    private $headers;
-
     /**
      * @param array<string, string> $headers
      */
-    public function __construct(array $headers)
+    public function __construct(private array $headers)
     {
-        $this->headers = $headers;
     }
 
     /**
@@ -51,7 +44,7 @@ private static function fromRawHeaders(array $rawHeaders): self
 
             $decoded = iconv_mime_decode($header[0]);
 
-            $headers[strtolower($name)] = $decoded ? $decoded : $header[0];
+            $headers[strtolower($name)] = $decoded ?: $header[0];
         }
 
         return new Headers($headers);

diff --git a/src/Message/Message.php b/src/Message/Message.php
@@ -10,64 +10,19 @@
 
 class Message
 {
-    /**
-     * @var string
-     */
-    public $messageId;
-
-    /**
-     * @var Contact
-     */
-    public $sender;
-
-    /**
-     * @var ContactCollection
-     */
-    public $recipients;
-
-    /**
-     * @var ContactCollection
-     */
-    public $ccRecipients;
-
-    /**
-     * @var ContactCollection
-     */
-    public $bccRecipients;
-
-    /**
-     * @var string
-     */
-    public $subject;
-
-    /**
-     * @var string
-     */
-    public $body;
-
-    /**
-     * @var Attachment[]
-     */
-    public $attachments;
-
-    /**
-     * @var Headers
-     */
-    public $headers;
-
     /**
      * @param Attachment[] $attachments
      */
     public function __construct(
-        string $messageId,
-        Contact $sender,
-        ContactCollection $recipients,
-        ContactCollection $ccRecipients,
-        ContactCollection $bccRecipients,
-        string $subject,
-        string $body,
-        array $attachments,
-        Headers $headers
+        public string $messageId,
+        public Contact $sender,
+        public ContactCollection $recipients,
+        public ContactCollection $ccRecipients,
+        public ContactCollection $bccRecipients,
+        public string $subject,
+        public string $body,
+        public array $attachments,
+        public Headers $headers
     ) {
         foreach ($attachments as $i => $attachment) {
             if (!$attachment instanceof Attachment) {
@@ -81,15 +36,5 @@ public function __construct(
                 );
             }
         }
-
-        $this->messageId = $messageId;
-        $this->sender = $sender;
-        $this->recipients = $recipients;
-        $this->ccRecipients = $ccRecipients;
-        $this->bccRecipients = $bccRecipients;
-        $this->subject = $subject;
-        $this->body = $body;
-        $this->attachments = $attachments;
-        $this->headers = $headers;
     }
 }
diff --git a/src/Message/Mime/Attachment.php b/src/Message/Mime/Attachment.php
@@ -5,25 +5,10 @@
 
 class Attachment
 {
-    /**
-     * @var string
-     */
-    public $filename;
-
-    /**
-     * @var string
-     */
-    public $mimeType;
-
-    /**
-     * @var string
-     */
-    public $content;
-
-    public function __construct(string $filename, string $mimeType, string $content)
-    {
-        $this->filename = $filename;
-        $this->mimeType = $mimeType;
-        $this->content = $content;
+    public function __construct(
+        public string $filename,
+        public string $mimeType,
+        public string $content,
+    ) {
     }
 }
diff --git a/src/Message/Mime/MimePart.php b/src/Message/Mime/MimePart.php
@@ -13,43 +13,13 @@
 
 class MimePart
 {
-    /**
-     * @var string
-     */
-    private $contentType;
-
-    /**
-     * @var string|null
-     */
-    private $contentTransferEncoding;
-
-    /**
-     * @var bool
-     */
-    private $isAttachment;
-
-    /**
-     * @var string|null
-     */
-    private $filename;
-
-    /**
-     * @var string
-     */
-    private $body;
-
     private function __construct(
-        string $contentType,
-        ?string $contentTransferEncoding,
-        bool $isAttachment,
-        ?string $filename,
-        string $body
+        private string $contentType,
+        private string |null $contentTransferEncoding,
+        private bool $isAttachment,
+        private string |null $filename,
+        private string $body
     ) {
-        $this->contentType = $contentType;
-        $this->contentTransferEncoding = $contentTransferEncoding;
-        $this->isAttachment = $isAttachment;
-        $this->filename = $filename;
-        $this->body = $body;
     }
 
     /**

diff --git a/src/Message/Mime/MimePartCollection.php b/src/Message/Mime/MimePartCollection.php
@@ -10,16 +10,10 @@
 class MimePartCollection
 {
     /**
-     * @var MimePart[]
+     * @param array<MimePart> $mimeParts
      */
-    private $mimeParts;
-
-    /**
-     * @param MimePart[] $mimeParts
-     */
-    private function __construct(array $mimeParts)
+    private function __construct(private array $mimeParts)
     {
-        $this->mimeParts = $mimeParts;
     }
 
     /**

diff --git a/src/Specification/AndSpecification.php b/src/Specification/AndSpecification.php
@@ -10,20 +10,8 @@
 
 final class AndSpecification implements Specification
 {
-    /**
-     * @var Specification
-     */
-    private $left;
-
-    /**
-     * @var Specification
-     */
-    private $right;
-
-    public function __construct(Specification $left, Specification $right)
+    public function __construct(private Specification $left, private Specification $right)
     {
-        $this->left = $left;
-        $this->right = $right;
     }
 
     public static function all(Specification $specification, Specification ...$other): Specification

diff --git a/src/Specification/AttachmentSpecification.php b/src/Specification/AttachmentSpecification.php
@@ -7,14 +7,8 @@
 
 final class AttachmentSpecification implements Specification
 {
-    /**
-     * @var string
-     */
-    private $filename;
-
-    public function __construct(string $filename)
+    public function __construct(private string $filename)
     {
-        $this->filename = $filename;
     }
 
     public function isSatisfiedBy(Message $message): bool