Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 22cabd7

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: add hint for symlinked assets in htaccess adding light documentation to security.yml Removed the "_error" path from the sample security.yml file Simplified the security.yml configuration Removed AcmeDemoBundle updated VENDORS for 2.3.30 updated VENDORS for 2.3.29 fix documentation URLs forSensio bundles updated VENDORS for 2.3.28 It's common to need the request, which you get from type-hinting. Adding the use helps to remove a step for users in the future updated VENDORS for 2.3.27 updated VENDORS for 2.3.26
2 parents 5446b13 + 2379431 commit 22cabd7

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ released under the MIT or BSD license.
6262
Enjoy!
6363

6464
[1]: http://symfony.com/doc/2.7/book/installation.html
65-
[6]: http://symfony.com/doc/2.7/bundles/SensioFrameworkExtraBundle/index.html
65+
[6]: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
6666
[7]: http://symfony.com/doc/2.7/book/doctrine.html
6767
[8]: http://symfony.com/doc/2.7/book/templating.html
6868
[9]: http://symfony.com/doc/2.7/book/security.html

app/config/security.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
1+
# To get started with security, check out the documentation:
2+
# http://symfony.com/doc/current/book/security.html
13
security:
24

5+
# http://symfony.com/doc/current/book/security.html#where-do-users-come-from-user-providers
36
providers:
47
in_memory:
58
memory: ~
69

710
firewalls:
11+
# disables authentication for assets and the profiler, adapt it according to your needs
812
dev:
9-
pattern: ^/(_(profiler|wdt|error)|css|images|js)/
13+
pattern: ^/(_(profiler|wdt)|css|images|js)/
1014
security: false
1115

1216
main:
1317
anonymous: ~
18+
# activate different ways to authenticate
19+
20+
# http_basic: ~
21+
# http://symfony.com/doc/current/book/security.html#a-configuring-how-your-users-will-authenticate
22+
23+
# form_login: ~
24+
# http://symfony.com/doc/current/cookbook/security/form_login_setup.html

src/AppBundle/Controller/DefaultController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
66
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
7+
use Symfony\Component\HttpFoundation\Request;
78

89
class DefaultController extends Controller
910
{

web/.htaccess

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
66
DirectoryIndex app.php
77

8+
# uncomment the following line if you install assets as symlinks
9+
# or run into problems when compiling LESS/Sass/CoffeScript assets
10+
#
11+
# Options FollowSymlinks
12+
813
# Disabling MultiViews prevents unwanted negotiation, e.g. "/app" should not resolve
914
# to the front controller "/app.php" but be rewritten to "/app.php/app".
1015
<IfModule mod_negotiation.c>

0 commit comments

Comments
 (0)