MOD: AnalyzeDcp.php BaseParser.php BaseWriter.php CplParserTest.php

brightfish-be · Sep 13, 2024 · d072abd · d072abd
1 parent 0a6677b
commit d072abd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/src/Folders/AnalyzeDcp.php b/src/Folders/AnalyzeDcp.php
@@ -96,6 +96,9 @@ private static function detectType(DcpFile $dcpFile): Type
             if (stripos($dcpFile->name, 'CPL') !== false) {
                 return Type::CPL;
             }
+            if (stripos($dcpFile->name, 'ASSETMAP') !== false) {
+                return Type::MAP;
+            }
             if (stripos($dcpFile->name, 'PKL') !== false) {
                 return Type::PKL;
             }

diff --git a/src/Parsers/BaseParser.php b/src/Parsers/BaseParser.php
@@ -9,11 +9,6 @@ class BaseParser
 {
     protected SimpleXMLElement $xml;
 
-    public function getXml(): SimpleXMLElement
-    {
-        return $this->xml;
-    }
-
     /**
      * @throws InputMissingException
      */
@@ -25,6 +20,11 @@ public function __construct(string $file)
         $this->xml = simplexml_load_file($file);
     }
 
+    public function getXml(): SimpleXMLElement
+    {
+        return $this->xml;
+    }
+
     public function Id(): string
     {
         return (string) $this->xml->Id ?? '';

diff --git a/src/Writers/BaseWriter.php b/src/Writers/BaseWriter.php
@@ -8,15 +8,15 @@
 use DOMDocument;
 use SimpleXMLElement;
 
-class BaseWriter
+final class BaseWriter
 {
-    protected SimpleXMLElement $contents;
+    private SimpleXMLElement $contents;
 
-    protected string $Issuer = 'Brightfish';
+    private string $Issuer = 'Brightfish';
 
-    protected string $Creator = 'Spottix Renamer';
+    private string $Creator = 'Spottix Renamer';
 
-    protected array $templates;
+    private array $templates;
 
     public function __construct()
     {

diff --git a/tests/Parsers/CplParserTest.php b/tests/Parsers/CplParserTest.php
@@ -2,6 +2,7 @@
 
 namespace Brightfish\DcpToolkit\Tests\Parsers;
 
+use Brightfish\DcpToolkit\Exceptions\InputMissingException;
 use Brightfish\DcpToolkit\Parsers\CplParser;
 use PHPUnit\Framework\TestCase;
 
@@ -11,6 +12,9 @@ class CplParserTest extends TestCase
 
     private CplParser $parser;
 
+    /**
+     * @throws InputMissingException
+     */
     protected function setUp(): void
     {
         $this->parser = new CplParser($this->cpl_file);