Properties are camel-cased by default.

locomotivemtl · Jul 31, 2019 · a7d0a2e · a7d0a2e
1 parent 913e701
commit a7d0a2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Charcoal/Model/AbstractMetadata.php b/src/Charcoal/Model/AbstractMetadata.php
@@ -66,14 +66,17 @@ public function defaultData()
     }
 
     /**
-     * Set the properties.
+     * Set the properties. Ensure the property idents (keys) are camel-cased.
      *
      * @param array $properties One or more properties.
      * @return self
      */
     public function setProperties(array $properties)
     {
-        $this->properties = $properties;
+        $this->properties = [];
+        foreach ($properties as $k => $v) {
+            $this->properties[$this->camelize($k)] = $v;
+        }
         return $this;
     }
 

diff --git a/src/Charcoal/Model/AbstractModel.php b/src/Charcoal/Model/AbstractModel.php
@@ -111,6 +111,7 @@ public function __construct(array $data = null)
      *
      * @param  array $data The entity data. Will call setters.
      * @return self
+     * @see AbstractEntity::setData()
      */
     public function setData(array $data)
     {
@@ -211,7 +212,8 @@ public function setFlatData(array $flatData)
             foreach ($fields as $k => $f) {
                 if (is_string($k)) {
                     $fid = $f->ident();
-                    $key = str_replace($propertyIdent.'_', '', $fid);
+                    $snake = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $propertyIdent));
+                    $key = str_replace($snake.'_', '', $fid);
                     if (isset($flatData[$fid])) {
                         $data[$propertyIdent][$key] = $flatData[$fid];
                         unset($flatData[$fid]);
@@ -251,12 +253,14 @@ public function flatData()
 
     /**
      * Retrieve the value for the given property.
+     * Force camelcase on the parameter.
      *
      * @param  string $propertyIdent The property identifier to fetch.
      * @return mixed
      */
     public function propertyValue($propertyIdent)
     {
+        $propertyIdent = $this->camelize($propertyIdent);
         return $this[$propertyIdent];
     }