Breaking changes: Enhance getModelProperty()

- Convert the incoming property parameter into a valid property key - Prefer to call a property getter method over calling `_getProperty()`
cundd · Feb 21, 2019 · 53ce98c · 53ce98c
1 parent 8d6be0d
commit 53ce98c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/Classes/DataProvider/DataProvider.php b/Classes/DataProvider/DataProvider.php
@@ -162,17 +162,29 @@ public function createModel(array $data, ResourceType $resourceType)
         return $model;
     }
 
-    public function getModelProperty($model, $propertyKey)
+    public function getModelProperty($model, string $propertyParameter)
     {
-        if ($model instanceof DomainObjectInterface) {
-            return $this->getModelData($model->_getProperty($propertyKey));
+        $propertyKey = $this->convertPropertyParameterToKey($propertyParameter);
+
+        $normalizedGetter = 'get' . ucfirst($propertyKey);
+        if (method_exists($model, $normalizedGetter) && is_callable([$model, $normalizedGetter])) {
+            return $this->getModelData($model->$normalizedGetter());
         }
 
-        $getter = 'get' . ucfirst($propertyKey);
-        if (is_callable([$model, $getter])) {
+        $getter = 'get' . ucfirst($propertyParameter);
+        if (method_exists($model, $getter) && is_callable([$model, $getter])) {
             return $this->getModelData($model->$getter());
         }
 
+        if ($model instanceof DomainObjectInterface) {
+            $value = $model->_getProperty($propertyKey);
+            if (null !== $value) {
+                return $this->getModelData($value);
+            } else {
+                return $this->getModelData($model->_getProperty($propertyParameter));
+            }
+        }
+
         return null;
     }
 
@@ -245,6 +257,20 @@ protected function getUidOfModelWithIdentityForResourceType($identifier, Resourc
         return $model ? $model->getUid() : null;
     }
 
+    /**
+     * Convert incoming property parameter names into property keys
+     *
+     * Example:
+     *  'dog-name' => 'dogName'
+     *
+     * @param string $propertyParameter
+     * @return string
+     */
+    protected function convertPropertyParameterToKey(string $propertyParameter): string
+    {
+        return str_replace(' ', '', ucwords(str_replace(['_', '-'], ' ', $propertyParameter)));
+    }
+
     /**
      * Return the configuration for property mapping
      *

diff --git a/Classes/DataProvider/DataProviderInterface.php b/Classes/DataProvider/DataProviderInterface.php
@@ -70,10 +70,10 @@ public function getModelData($model);
      * Return the property data from the given Model
      *
      * @param object|DomainObjectInterface $model
-     * @param string                       $propertyKey
+     * @param string                       $propertyParameter
      * @return mixed
      */
-    public function getModelProperty($model, $propertyKey);
+    public function getModelProperty($model, string $propertyParameter);
 
     /**
      * Add or update the given Model in the repository

diff --git a/Classes/DataProvider/VirtualObjectDataProvider.php b/Classes/DataProvider/VirtualObjectDataProvider.php
@@ -117,13 +117,17 @@ public function getModelData($model)
         return $properties;
     }
 
-    public function getModelProperty($model, $propertyKey)
+    public function getModelProperty($model, string $propertyParameter)
     {
         /** @var VirtualObject $model */
         $modelData = $model->getData();
+        $propertyKey = $this->convertPropertyParameterToKey($propertyParameter);
         if (isset($modelData[$propertyKey])) {
             return $modelData[$propertyKey];
         }
+        if (isset($modelData[$propertyParameter])) {
+            return $modelData[$propertyParameter];
+        }
 
         return null;
     }