Merge pull request #318 from thephpleague/bugfix

Bug fix
thephpleague · Mar 26, 2018 · ea1f655 · ea1f655
2 parents 2353513 + f8d0d70
commit ea1f655
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [Unreleased][unreleased]
 
+## [0.17.2] - 2017-03-25
+
+### Added
+
+ - Added new `RegexHelper::isEscapable()` method
+
+### Fixed
+
+ - Fixed spec compliance bug where escaped spaces should not be allowed in link destinations
+
 ## [0.17.1] - 2017-03-18
 
 ### Added
@@ -615,7 +625,8 @@ An unused constant and static method were deprecated and will be removed in a fu
 ### Added
  - Initial commit (compatible with jgm/stmd:spec.txt @ 0275f34)
 
-[unreleased]: https://github.com/thephpleague/commonmark/compare/0.17.1...HEAD
+[unreleased]: https://github.com/thephpleague/commonmark/compare/0.17.2...HEAD
+[0.17.2]: https://github.com/thephpleague/commonmark/compare/0.17.1...0.17.2
 [0.17.1]: https://github.com/thephpleague/commonmark/compare/0.17.0...0.17.1
 [0.17.0]: https://github.com/thephpleague/commonmark/compare/0.16.0...0.17.0
 [0.16.0]: https://github.com/thephpleague/commonmark/compare/0.15.7...0.16.0

diff --git a/src/Inline/Parser/EscapableParser.php b/src/Inline/Parser/EscapableParser.php
@@ -48,9 +48,7 @@ public function parse(InlineParserContext $inlineContext)
             $inlineContext->getContainer()->appendChild(new Newline(Newline::HARDBREAK));
 
             return true;
-        } elseif ($nextChar !== null &&
-            preg_match('/' . RegexHelper::PARTIAL_ESCAPABLE . '/', $nextChar)
-        ) {
+        } elseif (RegexHelper::isEscapable($nextChar)) {
             $cursor->advanceBy(2);
             $inlineContext->getContainer()->appendChild(new Text($nextChar));
 

diff --git a/src/Util/LinkParserHelper.php b/src/Util/LinkParserHelper.php
@@ -37,7 +37,7 @@ public static function parseLinkDestination(Cursor $cursor)
         $oldState = $cursor->saveState();
         $openParens = 0;
         while (($c = $cursor->getCharacter()) !== null) {
-            if ($c === '\\') {
+            if ($c === '\\' && RegexHelper::isEscapable($cursor->peek())) {
                 $cursor->advanceBy(2);
             } elseif ($c === '(') {
                 $cursor->advance();

diff --git a/src/Util/RegexHelper.php b/src/Util/RegexHelper.php
@@ -174,6 +174,20 @@ public static function getInstance()
         return self::$instance;
     }
 
+    /**
+     * @param string|null $character
+     *
+     * @return bool
+     */
+    public static function isEscapable($character)
+    {
+        if ($character === null) {
+            return false;
+        }
+
+        return preg_match('/' . self::PARTIAL_ESCAPABLE . '/', $character) === 1;
+    }
+
     /**
      * Returns a partial regex
      *

diff --git a/tests/unit/Util/RegexHelperTest.php b/tests/unit/Util/RegexHelperTest.php
@@ -269,6 +269,13 @@ public function testUnescape()
         $this->assertEquals('foo(and(bar))', RegexHelper::unescape('foo(and\\(bar\\))'));
     }
 
+    public function testIsEscapable()
+    {
+        $this->assertFalse(RegexHelper::isEscapable(null));
+        $this->assertFalse(RegexHelper::isEscapable('A'));
+        $this->assertTrue(RegexHelper::isEscapable('\\'));
+    }
+
     /**
      * @param $regex
      * @param $string