chore(cleanup): cleanup some code problems

charcoalphp · Mar 5, 2024 · b4af3bf · b4af3bf
1 parent 47c1ae0
commit b4af3bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/packages/admin/src/Charcoal/Admin/Widget/FormGroup/StructureFormGroup.php b/packages/admin/src/Charcoal/Admin/Widget/FormGroup/StructureFormGroup.php
@@ -232,7 +232,7 @@ public function displayTemplate()
     {
         $display = $this->display();
 
-        return 'charcoal/admin/widget/form-group/structure/container-' . $display;
+        return 'charcoal/admin/widget/form-group/structure/container-'.$display;
     }
 
     /**
@@ -460,8 +460,7 @@ protected function findStructureFormGroup(): ?array
 
         if (isset($struct['admin']['default_form_group'])) {
             $groupName = $struct['admin']['default_form_group'];
-            if (
-                \is_string($groupName) &&
+            if (\is_string($groupName) &&
                 isset($struct['admin']['form_groups'][$groupName])
             ) {
                 return $struct['admin']['form_groups'][$groupName];

diff --git a/packages/property/src/Charcoal/Property/ModelStructureProperty.php b/packages/property/src/Charcoal/Property/ModelStructureProperty.php
@@ -21,6 +21,8 @@
 use Charcoal\Property\StructureProperty;
 use Charcoal\Property\Structure\StructureMetadata;
 use Charcoal\Property\Structure\StructureModel;
+// From 'charcoal-translator'
+use Charcoal\Translator\Translation;
 
 /**
  * Model Structure Data Property
@@ -186,8 +188,7 @@ public function validateModelStructure(): bool
         $result = true;
 
         $model = $this->structureProto();
-        if (
-            !($model instanceof ModelInterface) ||
+        if (!($model instanceof ModelInterface) ||
             !($model instanceof ValidatableInterface)
         ) {
             return $result;
@@ -374,7 +375,7 @@ protected function loadStructureMetadata()
 
                 $structureKey = $structureInterfaces;
                 array_unshift($structureKey, $this->ident());
-                $structureKey = 'property/structure=' . $metadataLoader->serializeMetaKey($structureKey);
+                $structureKey = 'property/structure='.$metadataLoader->serializeMetaKey($structureKey);
 
                 $structureMetadata = $metadataLoader->load(
                     $structureKey,
@@ -453,7 +454,7 @@ protected function setStructureModelClass($className)
                 $this->structureModelType = $className;
                 $prototype = $this->structureModelFactory()->get($className);
                 $className = get_class($prototype);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 throw new InvalidArgumentException(sprintf(
                     'Invalid structure class name: %s',
                     $className