refactor

eliberty · Apr 10, 2018 · 10abbc2 · 10abbc2
1 parent a70328f
commit 10abbc2
Showing 1 changed file with 23 additions and 48 deletions.
diff --git a/src/Controller/CRUDController.php b/src/Controller/CRUDController.php
@@ -230,22 +230,7 @@ public function deleteAction($id)
             throw $this->createNotFoundException(sprintf('unable to find the object with id: %s', $id));
         }
 
-        if ($parentAdmin = $this->admin->getParent()) {
-            $parentId = $request->get($parentAdmin->getIdParameter());
-
-            $propertyAccessor = PropertyAccess::createPropertyAccessor();
-            $propertyPath = new PropertyPath($this->admin->getParentAssociationMapping());
-
-            $parent = $propertyAccessor->getValue($object, $propertyPath);
-
-            if ($parentAdmin->getObject($parentId) !== $parent) {
-                // NEXT_MAJOR: make this exception
-                @trigger_error("Deleting a child that isn't connected to a given parent is deprecated since 3.x"
-                    ." and won't be allowed in 4.0.",
-                    E_USER_DEPRECATED
-                );
-            }
-        }
+        $this->checkParentChildAssociation($request, $object);
 
         $this->admin->checkAccess('delete', $object);
 
@@ -325,22 +310,7 @@ public function editAction($id = null)
             throw $this->createNotFoundException(sprintf('unable to find the object with id: %s', $id));
         }
 
-        if ($parentAdmin = $this->admin->getParent()) {
-            $parentId = $request->get($parentAdmin->getIdParameter());
-
-            $propertyAccessor = PropertyAccess::createPropertyAccessor();
-            $propertyPath = new PropertyPath($this->admin->getParentAssociationMapping());
-
-            $parent = $propertyAccessor->getValue($existingObject, $propertyPath);
-
-            if ($parentAdmin->getObject($parentId) !== $parent) {
-                // NEXT_MAJOR: make this exception
-                @trigger_error("Editing a child that isn't connected to a given parent is deprecated since 3.x"
-                    ." and won't be allowed in 4.0.",
-                    E_USER_DEPRECATED
-                );
-            }
-        }
+        $this->checkParentChildAssociation($request, $existingObject);
 
         $this->admin->checkAccess('edit', $existingObject);
 
@@ -692,22 +662,7 @@ public function showAction($id = null)
             throw $this->createNotFoundException(sprintf('unable to find the object with id: %s', $id));
         }
 
-        if ($parentAdmin = $this->admin->getParent()) {
-            $parentId = $request->get($parentAdmin->getIdParameter());
-
-            $propertyAccessor = PropertyAccess::createPropertyAccessor();
-            $propertyPath = new PropertyPath($this->admin->getParentAssociationMapping());
-
-            $parent = $propertyAccessor->getValue($object, $propertyPath);
-
-            if ($parentAdmin->getObject($parentId) !== $parent) {
-                // NEXT_MAJOR: make this exception
-                @trigger_error("Viewing a child that isn't connected to a given parent is deprecated since 3.x"
-                    ." and won't be allowed in 4.0.",
-                    E_USER_DEPRECATED
-                );
-            }
-        }
+        $this->checkParentChildAssociation($request, $object);
 
         $this->admin->checkAccess('show', $object);
 
@@ -1497,6 +1452,26 @@ final protected function trans($id, array $parameters = [], $domain = null, $loc
         return $this->get('translator')->trans($id, $parameters, $domain, $locale);
     }
 
+    private function checkParentChildAssociation(Request $request, $object)
+    {
+        if (!($parentAdmin = $this->admin->getParent())) {
+            return;
+        }
+
+        $parentId = $request->get($parentAdmin->getIdParameter());
+
+        $propertyAccessor = PropertyAccess::createPropertyAccessor();
+        $propertyPath = new PropertyPath($this->admin->getParentAssociationMapping());
+
+        if ($parentAdmin->getObject($parentId) !== $propertyAccessor->getValue($object, $propertyPath)) {
+            // NEXT_MAJOR: make this exception
+            @trigger_error("Accessing a child that isn't connected to a given parent is deprecated since 3.x"
+                ." and won't be allowed in 4.0.",
+                E_USER_DEPRECATED
+            );
+        }
+    }
+
     /**
      * Sets the admin form theme to form view. Used for compatibility between Symfony versions.
      *