From 43740839ebc6198d0087d11c793499f9742a6529 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Mon, 8 Jan 2018 09:28:20 +0100 Subject: [PATCH] Update --- .../Resources/config/services.yml | 7 ++++++- src/FaqBundle/Resources/config/routing.yml | 6 +++--- src/FaqBundle/Resources/config/services.yml | 1 - src/PageBundle/Resources/config/routing.yml | 2 +- src/ThemeBundle/Resources/config/routing.yml | 3 ++- src/UserBundle/Resources/config/services.yml | 5 ++++- tests/behat/behat.yml | 19 +++++++++---------- 7 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/CourseBundle/Resources/config/services.yml b/src/CourseBundle/Resources/config/services.yml index caaa45dd63..1716578332 100644 --- a/src/CourseBundle/Resources/config/services.yml +++ b/src/CourseBundle/Resources/config/services.yml @@ -47,7 +47,12 @@ services: # Group voter, checks if a user has permissions to do actions chamilo_course.security.authorization.voter.group_voter: class: Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter - arguments: [ '@doctrine.orm.entity_manager', '@chamilo_core.entity.manager.course_manager', '@chamilo_course.manager.group', '@service_container' ] + arguments: [ + '@doctrine.orm.entity_manager', + '@chamilo_core.entity.manager.course_manager', + '@chamilo_course.manager.group', + '@service_container' + ] public: false tags: - { name: security.voter } diff --git a/src/FaqBundle/Resources/config/routing.yml b/src/FaqBundle/Resources/config/routing.yml index 09b82f6ad9..16fbe46de4 100644 --- a/src/FaqBundle/Resources/config/routing.yml +++ b/src/FaqBundle/Resources/config/routing.yml @@ -1,12 +1,12 @@ faq_index: path: /faq - defaults: { _controller: ChamiloFaqBundle:Faq:index, categorySlug: null, questionSlug: null } + defaults: { _controller: 'ChamiloFaqBundle:Faq:index', categorySlug: null, questionSlug: null } faq: path: /faq/{categorySlug}/{questionSlug} - defaults: { _controller: ChamiloFaqBundle:Faq:index, categorySlug: null, questionSlug: null } + defaults: { _controller: 'ChamiloFaqBundle:Faq:index', categorySlug: null, questionSlug: null } # Shows the entire FAQ at once, without collapsing any categories or questions. Useful if your FAQ is not that big. faq_without_collapse: path: /faq-without-collapse/{categorySlug} - defaults: { _controller: ChamiloFaqBundle:Faq:indexWithoutCollapse, categorySlug: null } \ No newline at end of file + defaults: { _controller: 'ChamiloFaqBundle:Faq:indexWithoutCollapse', categorySlug: null } \ No newline at end of file diff --git a/src/FaqBundle/Resources/config/services.yml b/src/FaqBundle/Resources/config/services.yml index f3e879a623..6eee5ecec0 100644 --- a/src/FaqBundle/Resources/config/services.yml +++ b/src/FaqBundle/Resources/config/services.yml @@ -4,4 +4,3 @@ services: Chamilo\FaqBundle\Repository\: resource: ../../Repository - diff --git a/src/PageBundle/Resources/config/routing.yml b/src/PageBundle/Resources/config/routing.yml index af3c44e193..7bf5edd89c 100644 --- a/src/PageBundle/Resources/config/routing.yml +++ b/src/PageBundle/Resources/config/routing.yml @@ -1,3 +1,3 @@ page: resource: '@ChamiloPageBundle/Controller/PageController.php' - type: annotation + type: annotation diff --git a/src/ThemeBundle/Resources/config/routing.yml b/src/ThemeBundle/Resources/config/routing.yml index 7acbab49d2..7e1d9c0cab 100644 --- a/src/ThemeBundle/Resources/config/routing.yml +++ b/src/ThemeBundle/Resources/config/routing.yml @@ -1,5 +1,6 @@ login: path: /login - defaults: { _controller: ChamiloThemeBundle:Security:login } + defaults: { _controller: 'ChamiloThemeBundle:Security:login' } + login_check: path: /login_check diff --git a/src/UserBundle/Resources/config/services.yml b/src/UserBundle/Resources/config/services.yml index 8542784485..0edb45e6ba 100644 --- a/src/UserBundle/Resources/config/services.yml +++ b/src/UserBundle/Resources/config/services.yml @@ -2,4 +2,7 @@ services: chamilo_user_provider: class: Chamilo\UserBundle\Security\FOSUBUserProvider #this is the place where the properties are passed to the UserProvider - see config.yml - arguments: ['@sonata.user.orm.user_manager', {facebook: facebookId, google: googleId, github: githubId} ] \ No newline at end of file + arguments: [ + '@sonata.user.orm.user_manager', + {facebook: facebookId, google: googleId, github: githubId} + ] \ No newline at end of file diff --git a/tests/behat/behat.yml b/tests/behat/behat.yml index 720f3f7f2a..3cf6478339 100644 --- a/tests/behat/behat.yml +++ b/tests/behat/behat.yml @@ -1,16 +1,15 @@ default: extensions: Behat\MinkExtension: - base_url: http://localhost - goutte: ~ - show_cmd: 'open %s' - selenium2: - wd_host: "http://127.0.0.1:4444/wd/hub" - browser: chrome - default_session: selenium2 - javascript_session: selenium2 - files_path: "%paths.base%/../../web/" - + base_url: http://localhost + goutte: ~ + show_cmd: 'open %s' + selenium2: + wd_host: "http://127.0.0.1:4444/wd/hub" + browser: chrome + default_session: selenium2 + javascript_session: selenium2 + files_path: "%paths.base%/../../web/" suites: default: paths: ["%paths.base%/features"]