Merge v0.3.1

Author: colinodell

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased][unreleased]
 
+## [0.3.1] - 2019-06-17
+
+### Fixed
+
+ - Fixed extension incorrectly double-linking standard CommonMark autolinks (#12)
+
 ## [1.0.0-beta2] - 2019-06-05
 
 ### Changed
@@ -56,6 +62,7 @@ Initial release!
 [unreleased]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v1.0.0-beta2...HEAD
 [1.0.0-beta2]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v1.0.0-beta1...v1.0.0-beta2
 [1.0.0-beta1]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v0.3.0...v1.0.0-beta1
+[0.3.1]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v0.1.0...v0.2.0

src/EmailAutolinkProcessor.php

@@ -29,8 +29,9 @@ public function __invoke(DocumentParsedEvent $e)
         $walker = $e->getDocument()->walker();
 
         while ($event = $walker->next()) {
-            if ($event->getNode() instanceof Text) {
-                self::processAutolinks($event->getNode());
+            $node = $event->getNode();
+            if ($node instanceof Text && !($node->parent() instanceof Link)) {
+                self::processAutolinks($node);
             }
         }
     }

src/UrlAutolinkProcessor.php

@@ -58,8 +58,9 @@ public function __invoke(DocumentParsedEvent $e)
         $walker = $e->getDocument()->walker();
 
         while ($event = $walker->next()) {
-            if ($event->getNode() instanceof Text) {
-                self::processAutolinks($event->getNode(), $this->finalRegex);
+            $node = $event->getNode();
+            if ($node instanceof Text && !($node->parent() instanceof Link)) {
+                self::processAutolinks($node, $this->finalRegex);
             }
         }
     }

tests/EmailAutolinkProcessorTest.php

@@ -47,5 +47,8 @@ public function dataProviderForEmailAutolinks()
         yield ['a.b-c_d@a.b.', '<p><a href="mailto:a.b-c_d@a.b">a.b-c_d@a.b</a>.</p>'];
         yield ['a.b-c_d@a.b-', '<p>a.b-c_d@a.b-</p>'];
         yield ['a.b-c_d@a.b_', '<p>a.b-c_d@a.b_</p>'];
+
+        // Regression: CommonMark autolinks should not be double-linked
+        yield ['<foo@example.com>', '<p><a href="mailto:foo@example.com">foo@example.com</a></p>'];
     }
 }

tests/UrlAutolinkProcessorTest.php

@@ -72,5 +72,8 @@ public function dataProviderForAutolinkTests()
 
         // Regression: two links with one underscore each
         yield ["https://eventum.example.net/history.php?iss_id=107092\nhttps://gitlab.example.net/group/project/merge_requests/39#note_150630", "<p><a href=\"https://eventum.example.net/history.php?iss_id=107092\">https://eventum.example.net/history.php?iss_id=107092</a>\n<a href=\"https://gitlab.example.net/group/project/merge_requests/39#note_150630\">https://gitlab.example.net/group/project/merge_requests/39#note_150630</a></p>"];
+
+        // Regression: CommonMark autolinks should not be double-linked
+        yield ['<https://www.google.com>', '<p><a href="https://www.google.com">https://www.google.com</a></p>'];
     }
 }