Added regex match check

johnnyhuy · Jun 3, 2020 · c2c0544 · c2c0544
1 parent 761aaa7
commit c2c0544
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/src/Inline/Parser/CodepenParser.php b/src/Inline/Parser/CodepenParser.php
@@ -33,7 +33,11 @@ public function parse(InlineParserContext $inlineContext): bool
         }
 
         $matches = [];
-        preg_match($regex, $validate, $matches);
+        $exists = preg_match($regex, $validate, $matches);
+
+        if (!$exists) {
+            return false;
+        }
 
         // Return the given codepen url to the renderer class
         $inlineContext->getContainer()->appendChild(new Codepen($matches[1]));

diff --git a/src/Inline/Parser/GistParser.php b/src/Inline/Parser/GistParser.php
@@ -34,7 +34,11 @@ public function parse(InlineParserContext $inlineContext): bool
         }
 
         $matches = [];
-        preg_match($regex, $validate, $matches);
+        $exists = preg_match($regex, $validate, $matches);
+
+        if (!$exists) {
+            return false;
+        }
 
         // Return the given gist url to the renderer class
         $inlineContext->getContainer()->appendChild(new Gist($matches[1]));

diff --git a/src/Inline/Parser/SoundCloudParser.php b/src/Inline/Parser/SoundCloudParser.php
@@ -34,7 +34,11 @@ public function parse(InlineParserContext $inlineContext): bool
         }
 
         $matches = [];
-        preg_match($regex, $validate, $matches);
+        $exists = preg_match($regex, $validate, $matches);
+
+        if (!$exists) {
+            return false;
+        }
 
         $inlineContext->getContainer()->appendChild(new SoundCloud($matches[1]));
 

diff --git a/src/Inline/Parser/YouTubeParser.php b/src/Inline/Parser/YouTubeParser.php
@@ -38,15 +38,20 @@ public function parse(InlineParserContext $inlineContext): bool
         $videoMatches = [];
         $timeMatches = [];
         $timeContinueMatches = [];
-        preg_match($videoRegex, $validate, $videoMatches);
-        preg_match($timeRegex, $validate, $timeMatches);
-        preg_match($timeContinueRegex, $validate, $timeContinueMatches);
+        $videoExists = preg_match($videoRegex, $validate, $videoMatches);
+        $timeMatchesExist = preg_match($timeRegex, $validate, $timeMatches);
+        $timeContinueMatchesExist = preg_match($timeContinueRegex, $validate, $timeContinueMatches);
+
+        if (!$videoExists) {
+            return false;
+        }
+
         $videoId = $videoMatches[1];
         $startTime = '';
 
-        if ($timeMatches) {
+        if ($timeMatchesExist) {
             $startTime = "?start={$timeMatches[1]}";
-        } elseif ($timeContinueMatches) {
+        } elseif ($timeContinueMatchesExist) {
             $startTime = "?start={$timeContinueMatches[1]}";
         }
 

diff --git a/tests/Elements/Inline/YouTubeTest.php b/tests/Elements/Inline/YouTubeTest.php
@@ -52,6 +52,7 @@ public function failedStrings()
             [':youtube .youtube.com/watch?v=USL6P8haroY', '<p>:youtube .youtube.com/watch?v=USL6P8haroY</p>'],
             [':youtube .com/watch?v=USL6P8haroY', '<p>:youtube .com/watch?v=USL6P8haroY</p>'],
             [':youtube poop.com/watch?v=USL6P8haroY', '<p>:youtube poop.com/watch?v=USL6P8haroY</p>'],
+            [':youtube poop.com/watch?v=', '<p>:youtube poop.com/watch?v=</p>'],
         ];
     }