update to support symfony 6

put root name into constructor update composer switch security lib change translator namespace use AbstractExtension update role update composer getMaster to getMainRequest update composer to 6.0
everlutionsk · Oct 7, 2022 · efe19fb · efe19fb
1 parent 41d0e5e
commit efe19fb
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -459,7 +459,7 @@ class ItemFilteredByRole implements Everlution\Navigation\Item\ItemInterface, Ev
     public function getSupportedRoles(): array
     {
         return [
-            'IS_AUTHENTICATED_ANONYMOUSLY',
+            'PUBLIC_ACCESS',
         ];
     }
 }

diff --git a/composer.json b/composer.json
@@ -9,15 +9,15 @@
     },
     "require": {
         "php": "^7.1|^8.0",
-        "symfony/framework-bundle": "^3.0|^4.0",
-        "symfony/config": "^3.0|^4.0",
-        "symfony/dependency-injection": "^3.0|^4.0",
-        "symfony/http-foundation": "^3.0|^4.0",
-        "symfony/http-kernel": "^3.0|^4.0",
-        "symfony/routing": "^3.0|^4.0",
-        "symfony/security": "^3.0|^4.0",
-        "symfony/translation": "^3.0|^4.0",
-        "symfony/twig-bundle": "^3.0|^4.0",
+        "symfony/framework-bundle": ">=6.0",
+        "symfony/config": ">=6.0",
+        "symfony/dependency-injection": ">=6.0",
+        "symfony/http-foundation": ">=6.0",
+        "symfony/http-kernel": ">=6.0",
+        "symfony/routing": ">=6.0",
+        "symfony/security-core": ">=6.0",
+        "symfony/translation": ">=6.0",
+        "symfony/twig-bundle": ">=6.0",
         "everlutionsk/navigation": "^2.4"
     },
     "license": "MIT",

diff --git a/src/Bridge/Filter/RolesProvider.php b/src/Bridge/Filter/RolesProvider.php
@@ -26,11 +26,11 @@ public function getRoles(): array
     {
         try {
             return array_merge(
-                $this->tokenStorage->getToken()->getUser()->getRoles(),
+                $this->tokenStorage->getToken()?->getUser()?->getRoles(),
                 ['IS_AUTHENTICATED_FULLY']
             );
         } catch (\Exception $exception) {
-            return ['IS_AUTHENTICATED_ANONYMOUSLY'];
+            return ['PUBLIC_ACCESS'];
         }
     }
 }
diff --git a/src/Bridge/Item/RequestAttributesContainer.php b/src/Bridge/Item/RequestAttributesContainer.php
@@ -24,7 +24,7 @@ public function __construct(RequestStack $requestStack)
 
     public function get(string $name, string $default = ''): string
     {
-        $request = $this->requestStack->getMasterRequest();
+        $request = $this->requestStack->getMainRequest();
 
         if (!$request) {
             return '';

diff --git a/src/Bridge/Matcher.php b/src/Bridge/Matcher.php
@@ -24,7 +24,7 @@ class Matcher implements MatcherInterface
 
     public function __construct(RequestStack $requestStack, UrlMatchVoterInterface $voter)
     {
-        $this->request = $requestStack->getMasterRequest();
+        $this->request = $requestStack->getMainRequest();
         $this->voter = $voter;
     }
 

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -18,13 +18,13 @@ class Configuration implements ConfigurationInterface
 
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('everlution_navigation');
-
-        $rootNode
+        $treeBuilder = new TreeBuilder('everlution_navigation');
+        $treeBuilder
+            ->getRootNode()
             ->children()
                 ->scalarNode(self::CONFIG_ROUTER_SERVICE)->defaultValue('router.default')->end()
-            ->end();
+            ->end()
+        ;
 
         return $treeBuilder;
     }

diff --git a/src/Twig/ItemExtension.php b/src/Twig/ItemExtension.php
@@ -7,13 +7,14 @@
 use Everlution\Navigation\Builder\MatcherInterface;
 use Everlution\NavigationBundle\Bridge\Item\Container\ItemContainerInterface;
 use Twig\Environment;
+use Twig\Extension\AbstractExtension;
 
 /**
  * Class ItemExtension.
  *
  * @author Ivan Barlog <[email protected]>
  */
-class ItemExtension extends \Twig_Extension
+class ItemExtension extends AbstractExtension
 {
     /** @var NavigationHelper */
     private $helper;

diff --git a/src/Twig/ItemHelper.php b/src/Twig/ItemHelper.php
@@ -8,7 +8,7 @@
 use Everlution\Navigation\Url\CannotProvideUrlForItemException;
 use Everlution\Navigation\Url\UrlProviderContainer;
 use Everlution\NavigationBundle\Bridge\Item\TranslatableItemLabelInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class Helper.

diff --git a/src/Twig/NavigationExtension.php b/src/Twig/NavigationExtension.php
@@ -6,13 +6,14 @@
 
 use Everlution\Navigation\Builder\NoCurrentItemFoundException;
 use Twig\Environment;
+use Twig\Extension\AbstractExtension;
 
 /**
  * Class NavigationExtension.
  *
  * @author Ivan Barlog <[email protected]>
  */
-class NavigationExtension extends \Twig_Extension
+class NavigationExtension extends AbstractExtension
 {
     /** @var ItemHelper */
     private $helper;