Merge pull request #13696 from marcusmoore/bug/sc-23796

snipe · web-flow · commit a2773aa8955f · 2023-10-03T11:01:40.000+01:00
Fixed potential call to a member function toArray() on null
diff --git a/app/Models/Labels/Field.php b/app/Models/Labels/Field.php
@@ -21,6 +21,8 @@ public function toArray(Asset $asset) { return Field::makeArray($this, $asset);
 
     public static function makeArray(Field $field, Asset $asset) {
         return $field->getOptions()
+            // filter out any FieldOptions that are accidentally null
+            ->filter()
             ->map(fn($option) => $option->toArray($asset))
             ->filter(fn($result) => $result['value'] != null);
     }
@@ -36,4 +38,4 @@ public static function fromString(string $theString) {
             ->map(fn($optionString) => FieldOption::fromString($optionString));
         return $field;
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ public function toArray(Asset $asset) { return Field::makeArray($this, $asset);`
`21`	`21`
`22`	`22`	`public static function makeArray(Field $field, Asset $asset) {`
`23`	`23`	`return $field->getOptions()`
	`24`	`+ // filter out any FieldOptions that are accidentally null`
	`25`	`+ ->filter()`
`24`	`26`	`->map(fn($option) => $option->toArray($asset))`
`25`	`27`	`->filter(fn($result) => $result['value'] != null);`
`26`	`28`	`}`
`@@ -36,4 +38,4 @@ public static function fromString(string $theString) {`
`36`	`38`	`->map(fn($optionString) => FieldOption::fromString($optionString));`
`37`	`39`	`return $field;`
`38`	`40`	`}`
`39`		`-}`
	`41`	`+}`