diff --git a/composer.json b/composer.json index b633ee7..f04de77 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,8 @@ "require": { "php": ">=5.4.0", - "symfony/framework-bundle": "~2.6|~3.0", - "doctrine/orm": "~2.4" + "symfony/framework-bundle": "^2.6|^3.0", + "doctrine/orm": "^2.4" }, "require-dev": { @@ -28,14 +28,14 @@ "ext-pdo": "*", "ext-pdo_sqlite": "*", - "symfony/symfony": "~2.7.0|~3.0", - "doctrine/orm": "~2.5.0", - "doctrine/doctrine-bundle": "~1.5", - "doctrine/doctrine-fixtures-bundle": "~2.2.0", - "sensio/framework-extra-bundle": "~3.0.9", - "knplabs/knp-menu-bundle": "~2.0", - "knplabs/knp-time-bundle": "~1.3", - "data-dog/pager-bundle": "~0.2", + "symfony/symfony": "^3.0", + "doctrine/orm": "^2.5", + "doctrine/doctrine-bundle": "^1.6", + "doctrine/doctrine-fixtures-bundle": "^2.2", + "sensio/framework-extra-bundle": "^3.0.2", + "knplabs/knp-menu-bundle": "^2.0", + "knplabs/knp-time-bundle": "^1.3", + "data-dog/pager-bundle": "^0.2", "phpunit/phpunit": "~4.7.0" }, diff --git a/example/src/AppBundle/Menu/MenuBuilder.php b/example/src/AppBundle/Menu/MenuBuilder.php index 8016c34..4e31521 100644 --- a/example/src/AppBundle/Menu/MenuBuilder.php +++ b/example/src/AppBundle/Menu/MenuBuilder.php @@ -3,14 +3,17 @@ namespace AppBundle\Menu; use Knp\Menu\FactoryInterface; -use Symfony\Component\DependencyInjection\ContainerAware; +use Symfony\Component\DependencyInjection\ContainerAwareInterface; +use Symfony\Component\DependencyInjection\ContainerAwareTrait; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Security\Core\SecurityContextInterface; -class MenuBuilder extends ContainerAware +class MenuBuilder implements ContainerAwareInterface { + use ContainerAwareTrait; + /** * @param FactoryInterface $factory * @return \Knp\Menu\ItemInterface