[TASK] Use instanceof where applicable

liayn · Apr 15, 2022 · d561cf2 · d561cf2
1 parent e6446fe
commit d561cf2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Classes/Controller/AjaxController.php b/Classes/Controller/AjaxController.php
@@ -1004,7 +1004,8 @@ public function checkFieldKey(ServerRequest $request): Response
         // All other fields must be unique per table. Exception: If a field
         // with the same field type exists, it may be shared.
         $field = $this->tableDefinitionCollection->loadField($table, $fieldKey);
-        return new JsonResponse(['isAvailable' => ($field === null || $field->type->equals($type))]);
+
+        return new JsonResponse(['isAvailable' => (!$field instanceof TcaFieldDefinition || $field->type->equals($type))]);
     }
 
     /**

diff --git a/Classes/Domain/Repository/StorageRepository.php b/Classes/Domain/Repository/StorageRepository.php
@@ -134,13 +134,10 @@ public function add(array $element, array $fields, string $table, bool $isNew):
     public function remove(string $table, string $elementKey): array
     {
         $this->currentKey = $elementKey;
-        // Load
         $json = $this->load();
-
-        // Remove
         $element = $this->tableDefinitionCollection->loadElement($table, $elementKey);
 
-        if (!$element) {
+        if (!$element instanceof ElementTcaDefinition) {
             return $json;
         }