Better handle missing canonical value

hydephp · Dec 18, 2022 · e98d8e1 · e98d8e1
1 parent 4a0afa4
commit e98d8e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/packages/framework/src/Framework/Actions/CreatesNewPublicationPage.php b/packages/framework/src/Framework/Actions/CreatesNewPublicationPage.php
@@ -12,6 +12,7 @@
 use Illuminate\Console\OutputStyle;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
+use InvalidArgumentException;
 use Rgasch\Collection\Collection;
 use RuntimeException;
 use function str_starts_with;
@@ -77,11 +78,15 @@ protected function handleCreate(): void
 
     protected function getCanonicalValue(PublicationFieldType $canonicalFieldDefinition, string $canonicalFieldName): string
     {
-        if ($canonicalFieldDefinition->type === PublicationFieldTypes::Array) {
-            $canonicalValue = $this->fieldData->{$canonicalFieldName}[0];
-        } else {
-            $canonicalValue = $this->fieldData->{$canonicalFieldName};
+        try {
+            if ($canonicalFieldDefinition->type === PublicationFieldTypes::Array) {
+                $canonicalValue = $this->fieldData->{$canonicalFieldName}[0];
+            } else {
+                $canonicalValue = $this->fieldData->{$canonicalFieldName};
+            }
+            return $canonicalValue;
+        } catch (InvalidArgumentException $exception) {
+            throw new RuntimeException("Could not find field value for '$canonicalFieldName' which is required for as it's the type's canonical field", 404, $exception);
         }
-        return $canonicalValue;
     }
 }
diff --git a/packages/framework/tests/Feature/Actions/CreatesNewPublicationPageTest.php b/packages/framework/tests/Feature/Actions/CreatesNewPublicationPageTest.php
@@ -61,7 +61,7 @@ public function testCreateWithoutSupplyingCanonicalField()
         ]);
 
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Could not find field value for title which is required for this type as it\'s the canonical field');
+        $this->expectExceptionMessage("Could not find field value for 'title' which is required for as it's the type's canonical field");
         $creator = new CreatesNewPublicationPage($pubType, $fieldData);
         $creator->create();
     }