Fix the functional test config to make it more simple

ajgarlag · ajgarlag · commit c877aadc069c · 2016-09-12T09:06:45.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SimpleLoginBundle/Resources/views/Login/after_login.html.twig b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SimpleLoginBundle/Resources/views/Login/after_login.html.twig
@@ -0,0 +1,7 @@
+{% extends "::base.html.twig" %}
+
+{% block body %}
+    Hello {{ user.username }}!<br /><br />
+    You're browsing to path "{{ app.request.pathInfo }}".
+
+{% endblock %}
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SimpleLoginBundle/SimpleLoginBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SimpleLoginBundle/SimpleLoginBundle.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\SimpleLoginBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class SimpleLoginBundle extends Bundle
+{
+    public function getParent()
+    {
+        return 'FormLoginBundle';
+    }
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SessionExpiration/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SessionExpiration/bundles.php
@@ -1,6 +1,7 @@
 <?php
 
 use Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\FormLoginBundle;
+use Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\SimpleLoginBundle\SimpleLoginBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
@@ -10,4 +11,5 @@
     new SecurityBundle(),
     new TwigBundle(),
     new FormLoginBundle(),
+    new SimpleLoginBundle(),
 );
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SessionExpiration/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SessionExpiration/config.yml
@@ -23,19 +23,10 @@ security:
             form_login:
                 check_path: /login_check
                 default_target_path: /profile
-            logout: ~
             anonymous: ~
             session_expiration:
                 max_idle_time: 1
                 expiration_url: /expired
 
-        # This firewall is here just to check its the logout functionality
-        second_area:
-            http_basic: ~
-            anonymous: ~
-            logout:
-                target: /second/target
-                path: /second/logout
-
     access_control:
-        - { path: .*, roles: IS_AUTHENTICATED_FULLY }
+        - { path: .*, roles: IS_AUTHENTICATED_FULLY }
