IBX-6312: View matcher ParentContentType should not throw execption i…

…f parent is not available
ezsystems · Aug 14, 2023 · db0db7e · db0db7e
1 parent 20bebf9
commit db0db7e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/eZ/Publish/Core/MVC/Symfony/Matcher/ContentBased/Id/ParentContentType.php b/eZ/Publish/Core/MVC/Symfony/Matcher/ContentBased/Id/ParentContentType.php
@@ -56,9 +56,13 @@ public function match(View $view)
         if (!$view instanceof LocationValueView) {
             return false;
         }
-        $parent = $this->loadParentLocation(
-            $view->getLocation()->parentLocationId
-        );
+        try {
+            $parent = $this->loadParentLocation(
+                $view->getLocation()->parentLocationId
+            );
+        } catch (\eZ\Publish\API\Repository\Exceptions\NotFoundException $e) {
+            return false;
+        }
 
         return isset($this->values[$parent->getContentInfo()->contentTypeId]);
     }

diff --git a/eZ/Publish/Core/MVC/Symfony/Matcher/ContentBased/Identifier/ParentContentType.php b/eZ/Publish/Core/MVC/Symfony/Matcher/ContentBased/Identifier/ParentContentType.php
@@ -25,15 +25,19 @@ class ParentContentType extends MultipleValued
      */
     public function matchLocation(APILocation $location)
     {
-        $parentContentType = $this->repository->sudo(
-            static function (Repository $repository) use ($location) {
-                $parent = $repository->getLocationService()->loadLocation($location->parentLocationId);
+        try {
+            $parentContentType = $this->repository->sudo(
+                static function (Repository $repository) use ($location) {
+                    $parent = $repository->getLocationService()->loadLocation($location->parentLocationId);
 
-                return $repository
-                    ->getContentTypeService()
-                    ->loadContentType($parent->getContentInfo()->contentTypeId);
-            }
-        );
+                    return $repository
+                        ->getContentTypeService()
+                        ->loadContentType($parent->getContentInfo()->contentTypeId);
+                }
+            );
+        } catch (\eZ\Publish\API\Repository\Exceptions\NotFoundException $e) {
+            return false;
+        }
 
         return isset($this->values[$parentContentType->identifier]);
     }