fix parser

linaphp · May 9, 2024 · 3a9b4a1 · 3a9b4a1
1 parent 2d32236
commit 3a9b4a1
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/app/ContentFinder.php b/app/ContentFinder.php
@@ -3,6 +3,7 @@
 namespace BangNokia\Lina;
 
 use BangNokia\Lina\Exceptions\ContentNotFoundException;
+use BangNokia\Lina\Exceptions\InvalidMarkdownContent;
 use BangNokia\Lina\Exceptions\ManyContentFound;
 use Symfony\Component\Finder\Finder;
 
@@ -47,7 +48,12 @@ public function get(string $filePath, $absolute = false): Content
 
         $content = file_get_contents($absolutePath);
 
-        $data = (new Parser(new MarkdownParser()))->parse($content);
+        try {
+            $data = (new Parser(new MarkdownParser()))->parse($content);
+        } catch (\Exception $exception) {
+            throw new InvalidMarkdownContent($filePath);
+        }
+
         $fileName = basename($filePath, '.md');
 
         if (preg_match('/(\d{4}-\d{2}-\d{2}-)?(.*)/', $fileName, $matches)) {

diff --git a/app/Exceptions/InvalidMarkdownContent.php b/app/Exceptions/InvalidMarkdownContent.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace BangNokia\Lina\Exceptions;
+
+class InvalidMarkdownContent extends \Exception
+{
+
+}
diff --git a/app/Parser.php b/app/Parser.php
@@ -3,6 +3,7 @@
 namespace BangNokia\Lina;
 
 use BangNokia\Lina\Contracts\MarkdownParser;
+use BangNokia\Lina\Exceptions\InvalidMarkdownContent;
 use Symfony\Component\Yaml\Yaml;
 
 class Parser
@@ -16,23 +17,34 @@ public function __construct(MarkdownParser $markdownParser)
 
     public function parse(string $text): array
     {
-        ['yaml' => $yaml, 'markdown' => $markdown] = $this->classify($text);
-
-        return [
-            'front_matter' => $this->parseFrontMatter($yaml),
-            'content'      => $this->markdownParser->parse($markdown)
-        ];
+        try {
+            ['yaml' => $yaml, 'markdown' => $markdown] = $this->classify($text);
+
+            return [
+                'front_matter' => $this->parseFrontMatter($yaml),
+                'content'      => $this->markdownParser->parse($markdown)
+            ];
+        } catch (\Exception $exception) {
+            throw new InvalidMarkdownContent($text);
+        }
     }
 
-    public function parseFrontMatter(string $text): array
+    public function parseFrontMatter(string $text): ?array
     {
-        return Yaml::parse($text);
+        return Yaml::parse($text) ?? [];
     }
 
     public function classify(string $text): array
     {
         $pos = strpos($text, '---', 1);
 
+        if ($pos === false) {
+            return [
+                'yaml'     => '',
+                'markdown' => $text,
+            ];
+        }
+
         return [
             'yaml'     => trim(substr($text, 4, $pos - 4)),
             'markdown' => trim(substr($text, $pos + 4)),