Merge branch 'master' into features/activity-form

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -52,7 +52,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/export.yaml');
         $loader->load('services/repositories.yaml');
         $loader->load('services/fixtures.yaml');
-        $loader->load('services/menu.yaml');
         $loader->load('services/controller.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/templating.yaml');

src/Bundle/ChillActivityBundle/config/services.yaml

@@ -25,3 +25,9 @@ services:
         public: true
         tags:
             - { name: chill.timeline, context: 'person' }
+
+    Chill\ActivityBundle\Menu\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Menu/'
+        tags: ['chill.menu_builder']

src/Bundle/ChillActivityBundle/config/services/menu.yaml

@@ -1,17 +0,0 @@
-services:
-    Chill\ActivityBundle\Menu\MenuBuilder:
-        arguments:
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
-        tags:
-            - { name: 'chill.menu_builder' }
-
-    Chill\ActivityBundle\Menu\AccompanyingCourseMenuBuilder:
-        arguments:
-            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
-            $entityManager: '@Doctrine\ORM\EntityManagerInterface'
-        tags:
-            - { name: 'chill.menu_builder' }