Merge pull request #6 from lifestyle-publications/guzzle7

Update to Guzzle 7.x and PhpUnit 8.x
f500 · Feb 1, 2022 · 5e94716 · 5e94716
2 parents b440c2a + 898efab
commit 5e94716
Show file tree

Hide file tree

Showing 17 changed files with 204 additions and 182 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /build/logs/
 /vendor/
 composer.lock
+/.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
+  - 7.2
+  - 7.3
+  - 7.4
+  - 8.0
 
 before_install:
   - composer selfupdate

diff --git a/composer.json b/composer.json
@@ -9,13 +9,13 @@
   ],
 
   "require": {
-    "guzzlehttp/guzzle": "^6.0",
-    "php-http/guzzle6-adapter": "^1.1",
+    "ext-json": "*",
     "sparkpost/sparkpost": "^2.0",
-    "swiftmailer/swiftmailer": "^5.4"
+    "swiftmailer/swiftmailer": "^6.0",
+    "php-http/guzzle7-adapter": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8",
+    "phpunit/phpunit": "^8.0",
     "squizlabs/php_codesniffer": "^2.7"
   },
 

diff --git a/src/Configuration.php b/src/Configuration.php
@@ -37,7 +37,7 @@ final class Configuration
     /**
      * @return Configuration
      */
-    public static function newInstance()
+    public static function newInstance(): Configuration
     {
         return new self();
     }
@@ -50,15 +50,15 @@ public function __construct()
         $this->ipPoolProbability  = 1.0;
     }
 
-    public function overrideRecipients()
+    public function overrideRecipients(): bool
     {
         return $this->recipientOverride !== '';
     }
 
     /**
      * @return bool
      */
-    public function overrideGmailStyle()
+    public function overrideGmailStyle(): bool
     {
         return $this->overrideGmailStyle;
     }
@@ -68,7 +68,7 @@ public function overrideGmailStyle()
      *
      * @return Configuration
      */
-    public function setOverrideGmailStyle($overrideGmailStyle)
+    public function setOverrideGmailStyle(bool $overrideGmailStyle): Configuration
     {
         $this->overrideGmailStyle = (bool) $overrideGmailStyle;
 
@@ -78,18 +78,18 @@ public function setOverrideGmailStyle($overrideGmailStyle)
     /**
      * @return string
      */
-    public function getRecipientOverride()
+    public function getRecipientOverride(): string
     {
         return $this->recipientOverride;
     }
 
     /**
-     * @param string $recipientOverride
+     * @param string|null $recipientOverride
      *
      * @return Configuration
      * @throws Exception
      */
-    public function setRecipientOverride($recipientOverride)
+    public function setRecipientOverride(?string $recipientOverride): Configuration
     {
         if (!$recipientOverride) {
             return $this;
@@ -107,7 +107,7 @@ public function setRecipientOverride($recipientOverride)
     /**
      * @return array
      */
-    public function getOptions()
+    public function getOptions(): array
     {
         return $this->options;
     }
@@ -117,7 +117,7 @@ public function getOptions()
      *
      * @return Configuration
      */
-    public function setOptions(array $options)
+    public function setOptions(array $options): Configuration
     {
         $this->options = array_merge(
             $this->options,
@@ -130,7 +130,7 @@ public function setOptions(array $options)
     /**
      * @return float
      */
-    public function getIpPoolProbability()
+    public function getIpPoolProbability(): float
     {
         return $this->ipPoolProbability;
     }
@@ -141,7 +141,7 @@ public function getIpPoolProbability()
      * @return Configuration
      * @throws Exception
      */
-    public function setIpPoolProbability($ipPoolProbability)
+    public function setIpPoolProbability(float $ipPoolProbability): Configuration
     {
         if ($ipPoolProbability < 0 || $ipPoolProbability > 1) {
             throw new Exception('IP pool probability must be between 0 and 1');

diff --git a/src/ExtendedMessage.php b/src/ExtendedMessage.php
@@ -6,108 +6,107 @@
 
 namespace SwiftSparkPost;
 
-use Swift_Mime_Message;
 use Swift_OutputByteStream;
 
 /**
  * @copyright Future500 B.V.
  * @author    Jasper N. Brouwer <[email protected]>
  */
-interface ExtendedMessage extends Swift_Mime_Message
+interface ExtendedMessage
 {
     /**
      * @return string
      */
-    public function getCampaignId();
+    public function getCampaignId(): string;
 
     /**
      * @param string $campaignId
      *
      * @return static
      */
-    public function setCampaignId($campaignId);
+    public function setCampaignId(string $campaignId): ExtendedMessage;
 
     /**
      * @return array
      */
-    public function getPerRecipientTags();
+    public function getPerRecipientTags(): array;
 
     /**
      * @param string $recipient
      * @param array  $tags
      *
      * @return static
      */
-    public function setPerRecipientTags($recipient, array $tags);
+    public function setPerRecipientTags(string $recipient, array $tags): ExtendedMessage;
 
     /**
      * @return array
      */
-    public function getMetadata();
+    public function getMetadata(): array;
 
     /**
      * @param array $metadata
      *
      * @return static
      */
-    public function setMetadata(array $metadata);
+    public function setMetadata(array $metadata): ExtendedMessage;
 
     /**
      * @return array
      */
-    public function getPerRecipientMetadata();
+    public function getPerRecipientMetadata(): array;
 
     /**
      * @param string $recipient
      * @param array  $metadata
      *
      * @return static
      */
-    public function setPerRecipientMetadata($recipient, array $metadata);
+    public function setPerRecipientMetadata(string $recipient, array $metadata): ExtendedMessage;
 
     /**
      * @return array
      */
-    public function getSubstitutionData();
+    public function getSubstitutionData(): array;
 
     /**
      * @param array $substitutionData
      *
      * @return static
      */
-    public function setSubstitutionData(array $substitutionData);
+    public function setSubstitutionData(array $substitutionData): ExtendedMessage;
 
     /**
      * @return array
      */
-    public function getPerRecipientSubstitutionData();
+    public function getPerRecipientSubstitutionData(): array;
 
     /**
      * @param string $recipient
      * @param array  $substitutionData
      *
      * @return static
      */
-    public function setPerRecipientSubstitutionData($recipient, array $substitutionData);
+    public function setPerRecipientSubstitutionData(string $recipient, array $substitutionData): ExtendedMessage;
 
     /**
      * @return array
      */
-    public function getOptions();
+    public function getOptions(): array;
 
     /**
      * @param array $options
      *
      * @return static
      */
-    public function setOptions(array $options);
+    public function setOptions(array $options): ExtendedMessage;
 
     /**
      * @param string|Swift_OutputByteStream $body
-     * @param string|null                   $contentType
-     * @param string|null                   $charset
+     * @param string|null $contentType
+     * @param string|null $charset
      *
      * @return static
      */
-    public function addPart($body, $contentType = null, $charset = null);
+    public function addPart($body, string $contentType = null, string $charset = null);
 }