Merge pull request #8 from Rareloop/support-php-82

Support PHP 8.2

Author: adamtomat

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php_version: ["7.4", "8.0", "8.1"]
+                php_version: ["8.0", "8.1", "8.2"]
                 composer_flags: ["", "--prefer-lowest"]
 
         steps:

composer.json

@@ -1,12 +1,12 @@
 {
     "name": "rareloop/primer-core",
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.0",
         "symfony/finder": "^4.2.5|^5.0",
         "twig/twig": "^2.6",
         "illuminate/collections": "^8.53.1||^9.0.0",
         "league/commonmark": "^1.5",
-        "mnapoli/front-yaml": "^1.6"
+        "spatie/yaml-front-matter": "^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0",

src/DocumentParsers/YAMLDocumentParser.php

@@ -2,28 +2,24 @@
 
 namespace Rareloop\Primer\DocumentParsers;
 
-use Mni\FrontYAML\Parser;
 use Rareloop\Primer\Contracts\DocumentParser;
 use Rareloop\Primer\Document;
 use Spatie\YamlFrontMatter\YamlFrontMatter;
 
 class YAMLDocumentParser implements DocumentParser
 {
-    public function parse(Document $document) : Document
+    public function parse(Document $document): Document
     {
-        $parser = new Parser;
-        $parsedDocument = $parser->parse($document->content(), false);
-        $yaml = $parsedDocument->getYAML();
+        $parsedDocument = YamlFrontMatter::parse($document->content());
 
-        $newDoc = new Document($document->id(), $parsedDocument->getContent());
-        $newDoc->setMeta($yaml ?? []);
+        $newDoc = new Document($document->id(), $parsedDocument->body());
+        $newDoc->setMeta($parsedDocument->matter() ?? []);
 
-        if (!empty($yaml['title'])) {
-            $newDoc->setTitle($yaml['title']);
+        if (!empty($parsedDocument->matter('title'))) {
+            $newDoc->setTitle($parsedDocument->matter('title'));
         }
 
-        $newDoc->setDescription($yaml['description'] ?? '');
-
+        $newDoc->setDescription($parsedDocument->matter('description') ?? '');
         return $newDoc;
     }
 }

src/FileSystemPatternProvider.php

@@ -14,6 +14,7 @@ class FileSystemPatternProvider implements PatternProvider, TemplateProvider
 {
     protected $paths;
     protected $fileExtension;
+    protected ?DataParser $dataParser;
 
     protected $patternPaths = [];