Merge branch '7.1' into 7.x

* 7.1: [AllBundles] Fix incorrect return types (#3385)
Kunstmaan · Apr 3, 2024 · 264d4b3 · 264d4b3
2 parents 6bfd2f0 + a5f8ec8
commit 264d4b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Kunstmaan/MenuBundle/Twig/MenuTwigExtension.php b/src/Kunstmaan/MenuBundle/Twig/MenuTwigExtension.php
@@ -54,7 +54,7 @@ public function getFunctions(): array
      * @param string $lang
      * @param array  $options
      */
-    public function getMenu(Environment $environment, $name, $lang, $options = []): string
+    public function getMenu(Environment $environment, $name, $lang, $options = []): string|array
     {
         $options = array_merge($this->getDefaultOptions(), $options);
 

diff --git a/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php b/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php
@@ -112,11 +112,9 @@ public function getFunctions(): array
      * @param int    $nodeId
      * @param string $lang
      */
-    public function getNodeTranslationByNodeId($nodeId, $lang): NodeTranslation
+    public function getNodeTranslationByNodeId($nodeId, $lang): ?NodeTranslation
     {
-        $repo = $this->em->getRepository(NodeTranslation::class);
-
-        return $repo->getNodeTranslationByNodeId($nodeId, $lang);
+        return $this->em->getRepository(NodeTranslation::class)->getNodeTranslationByNodeId($nodeId, $lang);
     }
 
     public function getPageByNodeTranslation(NodeTranslation $nodeTranslation): ?object
@@ -129,7 +127,7 @@ public function getNodeFor(PageInterface $page): Node
         return $this->em->getRepository(Node::class)->getNodeFor($page);
     }
 
-    public function getNodeTranslationFor(PageInterface $page): NodeTranslation
+    public function getNodeTranslationFor(PageInterface $page): ?NodeTranslation
     {
         return $this->em->getRepository(NodeTranslation::class)->getNodeTranslationFor($page);
     }