remove nested & update navigation version (#16)

everlutionsk · May 10, 2018 · 5ca14a7 · 5ca14a7
1 parent 7e1c8f5
commit 5ca14a7
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 163 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "symfony/templating": "^3.0|^4.0",
         "symfony/translation": "^3.0|^4.0",
         "symfony/twig-bundle": "^3.0|^4.0",
-        "everlutionsk/navigation": "^2.2"
+        "everlutionsk/navigation": "^2.3"
     },
     "license": "MIT",
     "authors": [

diff --git a/src/DependencyInjection/Compiler/NestedRegistryCompilerPass.php b/src/DependencyInjection/Compiler/NestedRegistryCompilerPass.php
diff --git a/src/EverlutionNavigationBundle.php b/src/EverlutionNavigationBundle.php
@@ -22,7 +22,6 @@ class EverlutionNavigationBundle extends Bundle
     public function build(ContainerBuilder $container)
     {
         $container->addCompilerPass(new RegistryCompilerPass());
-        $container->addCompilerPass(new NestedRegistryCompilerPass());
         $container->addCompilerPass(new UrlProviderCompilerPass());
         $container->addCompilerPass(new VoterCompilerPass());
         $container->addCompilerPass(new RegisterStandaloneItemsCompilerPass());

diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -7,7 +7,6 @@ services:
     Everlution\NavigationBundle\Bridge\Item\RequestAttributesContainer: ~
 
     Everlution\Navigation\Registry: ~
-    Everlution\Navigation\Nested\Registry: ~
     Everlution\Navigation\Url\UrlProviderContainer: ~
     Everlution\NavigationBundle\Bridge\NavigationAliasContainer: ~
     Everlution\NavigationBundle\Bridge\Matcher: ~
@@ -21,11 +20,8 @@ services:
     # twig extension
     Everlution\NavigationBundle\Twig\ItemHelper: ~
     Everlution\NavigationBundle\Twig\NavigationHelper: ~
-    Everlution\NavigationBundle\Twig\NestedNavigationHelper: ~
     Everlution\NavigationBundle\Twig\NavigationExtension:
         tags: ['twig.extension']
-    Everlution\NavigationBundle\Twig\NestedNavigationExtension:
-        tags: ['twig.extension']
     Everlution\NavigationBundle\Twig\ItemExtension:
         tags: ['twig.extension']
 

diff --git a/src/Twig/NavigationHelper.php b/src/Twig/NavigationHelper.php
@@ -51,7 +51,11 @@ public function isCurrent(string $identifier, ItemInterface $item): bool
 
     public function isAncestor(string $identifier, ItemInterface $item): bool
     {
-        return $this->getNavigation($identifier)->isAncestor($item);
+        try {
+            return $this->getNavigation($identifier)->isAncestor($item);
+        } catch (NoCurrentItemFoundException $e) {
+            return false;
+        }
     }
 
     public function getNavigation(string $navigation): NavigationBuilder

diff --git a/src/Twig/NestedNavigationExtension.php b/src/Twig/NestedNavigationExtension.php
diff --git a/src/Twig/NestedNavigationHelper.php b/src/Twig/NestedNavigationHelper.php