Merge pull request #37 from YouweGit/cleanup/objectBridgeDataClass

[CLEANUP] Object bridge data class
YouweGit · Nov 28, 2019 · acd1f5b · acd1f5b
2 parents 25c577b + 5014a7e
commit acd1f5b
Show file tree

Hide file tree

Showing 7 changed files with 459 additions and 448 deletions.
diff --git a/Controller/ObjectBridgeController.php b/Controller/ObjectBridgeController.php
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -17,8 +17,7 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('object_bridge');
+        $treeBuilder = new TreeBuilder('object_bridge');
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for

diff --git a/EventListener/CopyEventListener.php b/EventListener/CopyEventListener.php
@@ -6,7 +6,6 @@
 use Pimcore\Event\Model\DataObjectEvent;
 use Pimcore\Model\DataObject;
 use Pimcore\Model\Element;
-use Pimcore\Model\Version;
 
 /**
  * Copy event listener
@@ -32,6 +31,7 @@ public function __construct()
     /**
      * @param DataObjectEvent $dataObjectEvent
      * @return void
+     * @throws \Exception
      */
     public function postCopy(DataObjectEvent $dataObjectEvent): void
     {
@@ -62,7 +62,7 @@ protected function copyObjectBridgeDataObjects(DataObject\Concrete $dataObject,
         $bridgeDataObjectsSetter = 'set' . ucfirst($objectBridge->getName());
         unset($objectBridge);
 
-        if (!method_exists($dataObject, $bridgeDataObjectsGetter) || !method_exists($dataObject, $bridgeDataObjectsGetter)) {
+        if (!method_exists($dataObject, $bridgeDataObjectsGetter) || !method_exists($dataObject, $bridgeDataObjectsSetter)) {
             return;
         }
 
@@ -81,17 +81,18 @@ protected function copyObjectBridgeDataObjects(DataObject\Concrete $dataObject,
     }
 
     /**
+     * @param DataObject\Concrete $dataObject
      * @param string $sourceDataObjectGetter
      * @param DataObject\Concrete ...$bridgeDataObjects
      * @return DataObject\Concrete[]
+     * @throws \Exception
      */
     protected function copyBridgeDataObjects(
         DataObject\Concrete $dataObject,
         string $sourceDataObjectGetter,
         DataObject\Concrete ...$bridgeDataObjects
     ): array {
         $copiedBridgeDataObjects = [];
-        $i = 0;
         foreach ($bridgeDataObjects as $bridgeDataObject) {
             if (!$bridgeDataObject instanceof DataObject\Concrete) {
                 continue;
@@ -120,10 +121,11 @@ protected function copyBridgeDataObjects(
      * @param DataObject\AbstractObject $target Folder to copy data object to
      * @param DataObject\Concrete $source Data object to copy
      * @return DataObject\Concrete
-     *
+     * @throws \Exception
      */
     protected function copyAsChild(DataObject\AbstractObject $target, DataObject\Concrete $source): DataObject\Concrete
     {
+        /* @var $new DataObject\Concrete */
         $new = Element\Service::cloneMe($source);
         $new->setId(null);