[OrderBundle, Pimcore] extract DataLoader from Controller to be used oustide

src/CoreShop/Bundle/OrderBundle/Controller/AbstractSaleController.php

@@ -16,6 +16,7 @@
 use CoreShop\Bundle\ResourceBundle\Controller\PimcoreController;
 use CoreShop\Component\Pimcore\BCLayer\Href;
 use CoreShop\Component\Pimcore\BCLayer\Multihref;
+use CoreShop\Component\Pimcore\DataObject\DataLoader;
 use Pimcore\Model\DataObject;
 
 abstract class AbstractSaleController extends PimcoreController
@@ -28,63 +29,8 @@ abstract class AbstractSaleController extends PimcoreController
      */
     protected function getDataForObject(DataObject\Concrete $data, $loadedObjects = [])
     {
-        if (!$data instanceof DataObject\AbstractObject) {
-            return [];
-        }
+        $dataLoader = new DataLoader();
 
-        $objectData = [];
-        DataObject\Service::loadAllObjectFields($data);
-
-        $loadedObjects[] = $data->getId();
-
-        foreach ($data->getClass()->getFieldDefinitions() as $key => $def) {
-            $getter = 'get' . ucfirst($key);
-
-            if (!method_exists($data, $getter)) {
-                continue;
-            }
-
-            $fieldData = $data->$getter();
-
-            if ($def instanceof Href) {
-                if ($fieldData instanceof DataObject\Concrete) {
-                    if (!in_array($fieldData->getId(), $loadedObjects)) {
-                        $objectData[$key] = $this->getDataForObject($fieldData, $loadedObjects);
-                    }
-                }
-            } elseif ($def instanceof Multihref) {
-                $objectData[$key] = [];
-
-                if (!is_array($fieldData)) {
-                    continue;
-                }
-
-                foreach ($fieldData as $object) {
-                    if ($object instanceof DataObject\Concrete) {
-                        if (!in_array($object->getId(), $loadedObjects)) {
-                            $objectData[$key][] = $this->getDataForObject($object, $loadedObjects);
-                        }
-                    }
-                }
-            } elseif ($def instanceof DataObject\ClassDefinition\Data) {
-                if ($def instanceof Money) {
-                    $value = $fieldData;
-                } else {
-                    $value = $def->getDataForEditmode($fieldData, $data, false);
-                }
-
-                $objectData[$key] = $value;
-            } else {
-                $objectData[$key] = null;
-            }
-        }
-
-        $loadedObjects[] = $data->getId();
-
-        $objectData['o_id'] = $data->getId();
-        $objectData['o_creationDate'] = $data->getCreationDate();
-        $objectData['o_modificationDate'] = $data->getModificationDate();
-
-        return $objectData;
+        return $dataLoader->getDataForObject($data, $loadedObjects);
     }
 }

src/CoreShop/Component/Pimcore/DataObject/DataLoader.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * CoreShop.
+ *
+ * This source file is subject to the GNU General Public License version 3 (GPLv3)
+ * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
+ * files that are distributed with this source code.
+ *
+ * @copyright  Copyright (c) 2015-2019 Dominik Pfaffenbauer (https://www.pfaffenbauer.at)
+ * @license    https://www.coreshop.org/license     GNU General Public License version 3 (GPLv3)
+ */
+
+namespace CoreShop\Component\Pimcore\DataObject;
+
+use CoreShop\Bundle\MoneyBundle\CoreExtension\Money;
+use CoreShop\Component\Pimcore\BCLayer\Href;
+use CoreShop\Component\Pimcore\BCLayer\Multihref;
+use Pimcore\Model\DataObject;
+
+class DataLoader implements DataLoaderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getDataForObject(DataObject\Concrete $data, $loadedObjects = [])
+    {
+        if (!$data instanceof DataObject\AbstractObject) {
+            return [];
+        }
+
+        $objectData = [];
+        DataObject\Service::loadAllObjectFields($data);
+
+        $loadedObjects[] = $data->getId();
+
+        foreach ($data->getClass()->getFieldDefinitions() as $key => $def) {
+            $getter = 'get'.ucfirst($key);
+
+            if (!method_exists($data, $getter)) {
+                continue;
+            }
+
+            $fieldData = $data->$getter();
+
+            if ($def instanceof Href) {
+                if ($fieldData instanceof DataObject\Concrete) {
+                    if (!in_array($fieldData->getId(), $loadedObjects)) {
+                        $objectData[$key] = $this->getDataForObject($fieldData, $loadedObjects);
+                    }
+                }
+            } elseif ($def instanceof Multihref) {
+                $objectData[$key] = [];
+
+                if (!is_array($fieldData)) {
+                    continue;
+                }
+
+                foreach ($fieldData as $object) {
+                    if ($object instanceof DataObject\Concrete) {
+                        if (!in_array($object->getId(), $loadedObjects)) {
+                            $objectData[$key][] = $this->getDataForObject($object, $loadedObjects);
+                        }
+                    }
+                }
+            } elseif ($def instanceof DataObject\ClassDefinition\Data) {
+                if ($def instanceof Money) {
+                    $value = $fieldData;
+                } else {
+                    $value = $def->getDataForEditmode($fieldData, $data, false);
+                }
+
+                $objectData[$key] = $value;
+            } else {
+                $objectData[$key] = null;
+            }
+        }
+
+        $loadedObjects[] = $data->getId();
+
+        $objectData['o_id'] = $data->getId();
+        $objectData['o_creationDate'] = $data->getCreationDate();
+        $objectData['o_modificationDate'] = $data->getModificationDate();
+
+        return $objectData;
+    }
+}

src/CoreShop/Component/Pimcore/DataObject/DataLoaderInterface.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * CoreShop.
+ *
+ * This source file is subject to the GNU General Public License version 3 (GPLv3)
+ * For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
+ * files that are distributed with this source code.
+ *
+ * @copyright  Copyright (c) 2015-2019 Dominik Pfaffenbauer (https://www.pfaffenbauer.at)
+ * @license    https://www.coreshop.org/license     GNU General Public License version 3 (GPLv3)
+ */
+
+namespace CoreShop\Component\Pimcore\DataObject;
+
+use Pimcore\Model\DataObject\Concrete;
+
+interface DataLoaderInterface
+{
+    /**
+     * @param Concrete $data
+     * @param array    $loadedObjects
+     *
+     * @return array
+     */
+    public function getDataForObject(Concrete $data, $loadedObjects = []);
+}