Browse Source

Use trait instead of extends (deprecated)

jmontoyaa 8 years ago
parent
commit
1539a7398f

+ 5 - 1
src/Chamilo/CoreBundle/Menu/CourseMenuBuilder.php

@@ -5,13 +5,17 @@ namespace Chamilo\CoreBundle\Menu;
 
 use Knp\Menu\FactoryInterface;
 use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
 /**
  * Class CourseMenuBuilder
  * @package Chamilo\CoreBundle\Menu
  */
-class CourseMenuBuilder extends ContainerAware
+class CourseMenuBuilder implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     /**
      * Course menu
      *

+ 8 - 3
src/Chamilo/CoreBundle/Menu/NavBuilder.php

@@ -9,14 +9,19 @@ use Chamilo\UserBundle\Entity\User;
 use Knp\Menu\FactoryInterface;
 use Knp\Menu\ItemInterface;
 use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\Routing\RouterInterface;
 
 /**
  * Class NavBuilder
  * @package Chamilo\CoreBundle\Menu
  */
-class NavBuilder extends ContainerAware
+class NavBuilder implements ContainerAwareInterface
+
 {
+    use ContainerAwareTrait;
+
     /**
      * @param array  $itemOptions The options given to the created menuItem
      * @param string $currentUri  The current URI
@@ -217,7 +222,7 @@ class NavBuilder extends ContainerAware
     public function profileMenu(FactoryInterface $factory, array $options)
     {
         $menu = $factory->createItem('root');
-        $security = $this->container->get('security.context');
+        $security = $this->container->get('security.authorization_checker');
         $translator = $this->container->get('translator');
 
         if ($security->isGranted('IS_AUTHENTICATED_FULLY')) {
@@ -296,7 +301,7 @@ class NavBuilder extends ContainerAware
     public function socialMenu(FactoryInterface $factory, array $options)
     {
         $menu = $factory->createItem('root');
-        $security = $this->container->get('security.context');
+        $security = $this->container->get('security.authorization_checker');
         $translator = $this->container->get('translator');
 
         if ($security->isGranted('IS_AUTHENTICATED_FULLY')) {

+ 5 - 1
src/Chamilo/CoreBundle/Menu/SimpleMenuBuilder.php

@@ -5,6 +5,8 @@ namespace Chamilo\CoreBundle\Menu;
 
 use Knp\Menu\FactoryInterface;
 use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
 /**
  * Class SimpleMenuBuilder
@@ -13,8 +15,10 @@ use Symfony\Component\DependencyInjection\ContainerAware;
  *
  * @author Hugo Briand <briand@ekino.com>
  */
-class SimpleMenuBuilder extends ContainerAware
+class SimpleMenuBuilder implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     /**
      * Register/reset password menu
      * @param FactoryInterface $factory