Update to PHP8 and add support for mailgun-php ^3.0 (#88)

* Experiments * Make the logger conditional * Update dev dependencies * Add php7.3 version, fix unit tests * Migrate XML configuration * Update symfony dependencies
tehplague · Sep 13, 2021 · b77b8e4 · b77b8e4
1 parent c6520f2
commit b77b8e4
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 52 deletions.
diff --git a/DependencyInjection/cspooSwiftmailerMailgunExtension.php b/DependencyInjection/cspooSwiftmailerMailgunExtension.php
@@ -2,7 +2,7 @@
 
 namespace cspoo\Swiftmailer\MailgunBundle\DependencyInjection;
 
-use Mailgun\HttpClientConfigurator;
+use Mailgun\HttpClient\HttpClientConfigurator;
 use Mailgun\Mailgun;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -63,8 +63,7 @@ private function registerMailgunService(ContainerBuilder $container, array $conf
         }
 
         $mailgunDef = new Definition(Mailgun::class);
-        $mailgunDef->setFactory([Mailgun::class, 'configure'])
-            ->addArgument($configuratorDef);
+        $mailgunDef->addArgument($configuratorDef);
 
         $container->setDefinition('mailgun.library', $mailgunDef);
     }

diff --git a/Service/MailgunTransport.php b/Service/MailgunTransport.php
@@ -47,7 +47,7 @@ public function __construct(
         \Swift_Events_EventDispatcher $eventDispatcher,
         Mailgun $mailgun,
         $domain,
-        LoggerInterface $logger
+        LoggerInterface $logger = null
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->domain = $domain;
@@ -97,7 +97,7 @@ public function stop()
      * @param string[]           $failedRecipients An array of failures by-reference
      *
      * @throws \Swift_TransportException
-     * 
+     *
      * @return int number of mails sent
      */
     public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
@@ -133,7 +133,9 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
                     'mailgun_http_response_body' => $e->getResponseBody()
                 ];
             }
-            $this->logger->error($e->getMessage(), $context);
+            if($this->logger) {
+                $this->logger->error($e->getMessage(), $context);
+            }
         }
 
         if ($evt) {

diff --git a/Tests/DependencyInjection/cspooSwiftmailerMailgunExtensionTest.php b/Tests/DependencyInjection/cspooSwiftmailerMailgunExtensionTest.php
@@ -11,7 +11,7 @@
  */
 class cspooSwiftmailerMailgunExtensionTest extends AbstractExtensionTestCase
 {
-    protected function getContainerExtensions()
+    protected function getContainerExtensions(): array
     {
         return array(
             new cspooSwiftmailerMailgunExtension()
@@ -21,7 +21,7 @@ protected function getContainerExtensions()
     /**
      * @inheritDoc
      */
-    protected function getMinimalConfiguration()
+    protected function getMinimalConfiguration(): array
     {
         return array('key' => 'foo', 'domain' => 'bar', 'endpoint' => 'baz');
     }
@@ -54,4 +54,4 @@ public function after_loading_the_correct_parameter_has_been_set()
 
         $this->assertContainerBuilderHasServiceDefinitionWithArgument('mailgun.swift_transport.transport', 0, 'mailgun.swift_transport.eventdispatcher');
     }
-}
+}
diff --git a/Tests/Service/MailgunTransportTest.php b/Tests/Service/MailgunTransportTest.php
@@ -124,7 +124,7 @@ public function testSendMessageOk()
     public function testSendMessageWithException()
     {
         $dispatcher = $this->getMockBuilder('Swift_Events_EventDispatcher')->getMock();
-        $mailgun = $this->getMockBuilder('Mailgun\Mailgun')->getMock();
+        $mailgun = $this->getMockBuilder('Mailgun\Mailgun')->disableOriginalConstructor()->getMock();
         $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
         $logger->expects($this->once())
             ->method('error');
@@ -161,7 +161,7 @@ public function testSendMessageWithException()
     public function testSendMessageWithHttpClientException()
     {
         $dispatcher = $this->getMockBuilder('Swift_Events_EventDispatcher')->getMock();
-        $mailgun = $this->getMockBuilder('Mailgun\Mailgun')->getMock();
+        $mailgun = $this->getMockBuilder('Mailgun\Mailgun')->disableOriginalConstructor()->getMock();
         $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
 
         $logger->expects($this->once())
@@ -196,6 +196,10 @@ public function testSendMessageWithHttpClientException()
             ->method('getReasonPhrase')
             ->willReturn('UNAUTHORIZED');
 
+        $response->expects($this->any())
+            ->method('getHeaderLine')
+            ->willReturn('');
+
         $messageApi = $this->getMockBuilder('Mailgun\Api\Message')
             ->disableOriginalConstructor()
             ->getMock();
@@ -243,6 +247,7 @@ private function getTransport()
             ->willReturn(SendResponse::create(['id'=>'123', 'message'=>'OK']));
 
         $mailgun = $this->getMockBuilder('Mailgun\Mailgun')
+            ->disableOriginalConstructor()
             ->getMock();
 
         $mailgun->expects($this->any())

diff --git a/composer.json b/composer.json
@@ -16,22 +16,22 @@
     ],
     "minimum-stability" : "stable",
     "require": {
-        "php": "^7.0",
+        "php": "^7.3 || ^8.0",
         "swiftmailer/swiftmailer": "^6.0",
-        "mailgun/mailgun-php": "^2.3",
-        "symfony/config": "^3.3 || ^4.0",
-        "symfony/dependency-injection": "^3.3 || ^4.0",
-        "symfony/http-kernel": "^3.3 || ^4.0",
+        "mailgun/mailgun-php": "^3.0",
+        "symfony/config": "^3.3 || ^4.0 || ^5.0",
+        "symfony/dependency-injection": "^3.3 || ^4.0 || ^5.0",
+        "symfony/http-kernel": "^3.3 || ^4.0 || ^5.0",
         "psr/log": "^1.1"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^2.3.1 || ^3.0",
+        "symfony/phpunit-bridge": "^4.0 || ^5.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^2.3.1 || ^4.0",
         "nyholm/symfony-bundle-test": "^1.4",
         "symfony/swiftmailer-bundle": "^2.5.1 || ^3.2",
-        "php-http/curl-client": "^1.7",
-        "zendframework/zend-diactoros": "^1.7",
-        "symfony/framework-bundle": "^3.3 || ^4.0",
+        "php-http/curl-client": "^2.0",
+        "laminas/laminas-diactoros": "^2.0",
+        "symfony/framework-bundle": "^3.3 || ^4.0 ||^5.0",
         "doctrine/annotations": "^1.3"
     },
     "suggest": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,33 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="./vendor/autoload.php"
-        >
-
-    <testsuites>
-        <testsuite name="All Tests">
-            <directory>./Tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./</directory>
-            <exclude>
-                <directory>vendor</directory>
-                <directory>Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\CoverageListener"/>
-    </listeners>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="./vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">./</directory>
+    </include>
+    <exclude>
+      <directory>vendor</directory>
+      <directory>Tests</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="All Tests">
+      <directory>./Tests</directory>
+    </testsuite>
+  </testsuites>
+  <listeners>
+    <listener class="Symfony\Bridge\PhpUnit\CoverageListener"/>
+  </listeners>
 </phpunit>
diff --git a/phpunit.xml.dist.bak b/phpunit.xml.dist.bak
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         bootstrap="./vendor/autoload.php"
+        >
+
+    <testsuites>
+        <testsuite name="All Tests">
+            <directory>./Tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./</directory>
+            <exclude>
+                <directory>vendor</directory>
+                <directory>Tests</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\CoverageListener"/>
+    </listeners>
+</phpunit>