Resolve category lifecycle (#17)

* Resolve category lifecycle * Shorten php.xml.dist file
cable8mm · Mar 5, 2024 · b598b3a · b598b3a
1 parent ef0c6a6
commit b598b3a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="vendor/autoload.php"
-    cacheDirectory=".phpunit.cache"
-    executionOrder="depends,defects"
-    beStrictAboutCoverageMetadata="true"
-    beStrictAboutOutputDuringTests="true"
-    failOnRisky="true"
-    failOnWarning="true"
-    cacheResult="false">
-
+    colors="true"
+    testdox="true">
     <testsuites>
         <testsuite name="default">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
+    <source>
         <include>
             <directory>src</directory>
         </include>
     </source>
-</phpunit>
+</phpunit>
diff --git a/src/Models/Article.php b/src/Models/Article.php
@@ -15,6 +15,8 @@ class Article
 
     public ?string $categories = null;
 
+    private $resolveCategories;
+
     public string $body;
 
     private $bodyCallbacks;
@@ -63,6 +65,18 @@ private function slug(): void
     private function categories(): void
     {
         $this->categories = $this->row[$this->map['categories']];
+
+        if (! is_null($this->resolveCategories)) {
+            if (is_null($this->categories)) {
+                throw new InvalidArgumentException($this->slug.' slug\'s category must exist.');
+            }
+
+            if (! in_array($this->categories, array_keys($this->resolveCategories))) {
+                throw new InvalidArgumentException($this->categories.' is an invalid category. Categories must include one of '.implode(',', array_keys($this->resolveCategories)));
+            }
+
+            $this->categories = $this->resolveCategories[$this->categories];
+        }
     }
 
     private function body(): void
@@ -140,17 +154,7 @@ public function setAddHours(int $hours): static
 
     public function resolveCategories(?array $categories = null): static
     {
-        if (! is_null($categories)) {
-            if (is_null($this->categories)) {
-                throw new InvalidArgumentException($this->slug.' slug\'s category must exist.');
-            }
-
-            if (! in_array($this->categories, array_keys($categories))) {
-                throw new InvalidArgumentException($this->categories.' is an invalid category. Categories must include one of '.implode(',', array_keys($categories)));
-            }
-
-            $this->categories = $categories[$this->categories];
-        }
+        $this->resolveCategories = $categories;
 
         return $this;
     }