Merge pull request #18 from ter-informatique/basepath-and-url

Martin Damien · web-flow · commit b86c6f1b62a9 · 2018-06-15T11:20:02.000+02:00
Dont append base path to complete URLs
diff --git a/src/ImageEmbedPlugin.php b/src/ImageEmbedPlugin.php
@@ -72,7 +72,13 @@ protected function embedImages(Swift_Mime_SimpleMessage $message, Swift_Mime_Sim
              */
             if (strpos($src, 'cid:') === false) {
 
-                $entity = \Swift_Image::fromPath($this->basePath . $src);
+                $path = $src;
+
+                if (filter_var($src, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED) === false) {
+                    $path = $this->basePath . $src;
+                }
+
+                $entity = \Swift_Image::fromPath($path);
                 $message->setChildren(
                     array_merge($message->getChildren(), [$entity])
                 );
diff --git a/tests/EmbedImagePluginTest.php b/tests/EmbedImagePluginTest.php
@@ -111,6 +111,49 @@ public function testAttachment()
         );
     }
 
+    public function testBasePathAndUrl()
+    {
+        $this->mailer = new Swift_Mailer(new Swift_NullTransport());
+        $this->mailer->registerPlugin(new ImageEmbedPlugin(__DIR__));
+
+        $message = $this->createMessage();
+
+        $html = <<<HTML
+<html>
+    <head></head>
+    <body>
+        <p>some text</p>
+        <img src="%s" alt="localPath">
+        <img src="%s" alt="url">
+    </body>
+</html>
+HTML;
+        $html = sprintf(
+            $html,
+            '/fixtures/placeholder.png',
+            'https://github.com/Hexanet/swiftmailer-image-embed/raw/master/tests/fixtures/placeholder.png'
+        );
+
+        $message->setBody($html, 'text/html');
+
+        $this->mailer->send($message);
+
+        $children = $message->getChildren();
+
+        $this->assertInstanceOf('\Swift_Image', $children[0], 'Local image is embedded in the message');
+        $this->assertContains(
+            sprintf('<img src="cid:%s" alt="localPath">', $children[0]->getId()),
+            $message->getBody(),
+            'Image is linked in body'
+        );
+        $this->assertInstanceOf('\Swift_Image', $children[1], 'Remote image is embedded in the message');
+        $this->assertContains(
+            sprintf('<img src="cid:%s" alt="url">', $children[1]->getId()),
+            $message->getBody(),
+            'Image is linked in body'
+        );
+    }
+
     /**
      * @return Swift_Message
      */
