Merge branch '2.7' into 2.8

* 2.7:
  add hint for symlinked assets in htaccess
  adding light documentation to security.yml
  [README] Add DebugBundle to the list
  updated VENDORS for 2.7.1
  updated deps
  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

Author: fabpot

README.md

@@ -53,13 +53,16 @@ It comes pre-configured with the following bundles:
   * [**SensioGeneratorBundle**][13] (in dev/test env) - Adds code generation
     capabilities
 
+  * **DebugBundle** (in dev/test env) - Adds Debug and VarDumper component
+    integration
+
 All libraries and bundles included in the Symfony Standard Edition are
 released under the MIT or BSD license.
 
 Enjoy!
 
 [1]:  http://symfony.com/doc/2.7/book/installation.html
-[6]:  http://symfony.com/doc/2.7/bundles/SensioFrameworkExtraBundle/index.html
+[6]:  http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
 [7]:  http://symfony.com/doc/2.7/book/doctrine.html
 [8]:  http://symfony.com/doc/2.7/book/templating.html
 [9]:  http://symfony.com/doc/2.7/book/security.html

app/config/security.yml

@@ -1,13 +1,24 @@
+# To get started with security, check out the documentation:
+# http://symfony.com/doc/current/book/security.html
 security:
 
+    # http://symfony.com/doc/current/book/security.html#where-do-users-come-from-user-providers
     providers:
         in_memory:
             memory: ~
 
     firewalls:
+        # disables authentication for assets and the profiler, adapt it according to your needs
         dev:
-            pattern: ^/(_(profiler|wdt|error)|css|images|js)/
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
 
         main:
             anonymous: ~
+            # activate different ways to authenticate
+
+            # http_basic: ~
+            # http://symfony.com/doc/current/book/security.html#a-configuring-how-your-users-will-authenticate
+
+            # form_login: ~
+            # http://symfony.com/doc/current/cookbook/security/form_login_setup.html

composer.json

@@ -15,7 +15,7 @@
         "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
-        "sensio/distribution-bundle": "~3.0,>=3.0.12",
+        "sensio/distribution-bundle": "~4.0",
         "sensio/framework-extra-bundle": "~3.0,>=3.0.2",
         "incenteev/composer-parameter-handler": "~2.0"
     },

src/AppBundle/Controller/DefaultController.php

@@ -4,6 +4,7 @@
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
 
 class DefaultController extends Controller
 {

web/.htaccess

@@ -5,6 +5,11 @@
 # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
 DirectoryIndex app.php
 
+# uncomment the following line if you install assets as symlinks
+# or run into problems when compiling LESS/Sass/CoffeScript assets
+#
+# Options FollowSymlinks
+
 # Disabling MultiViews prevents unwanted negotiation, e.g. "/app" should not resolve
 # to the front controller "/app.php" but be rewritten to "/app.php/app".
 <IfModule mod_negotiation.c>