Merge branch '2.6' into 2.7

fabpot · fabpot · commit 8b25d1b5f9d5 · 2015-06-11T21:22:36.000+02:00
* 2.6:
  The security.yml file now uses the same configuration as in Symfony 2.3 (the "default" firewall is now called "main")
  Removed AcmeDemoBundle
  updated VENDORS for 2.6.9
  updated VENDORS for 2.6.8
  updated VENDORS for 2.6.7

Conflicts:
	composer.lock
diff --git a/app/SymfonyStandard/RootPackageInstallSubscriber.php b/app/SymfonyStandard/RootPackageInstallSubscriber.php
@@ -18,11 +18,6 @@
 
 class RootPackageInstallSubscriber implements EventSubscriberInterface
 {
-    public static function installAcmeDemoBundle(CommandEvent $event)
-    {
-        ScriptHandler::installAcmeDemoBundle($event);
-    }
-
     public static function setupNewDirectoryStructure(CommandEvent $event)
     {
         ScriptHandler::defineDirectoryStructure($event);
@@ -33,7 +28,6 @@ public static function getSubscribedEvents()
         return array(
             ScriptEvents::POST_INSTALL_CMD => array(
                 array('setupNewDirectoryStructure', 512),
-                array('installAcmeDemoBundle', 0)
             ),
         );
     }
diff --git a/app/config/security.yml b/app/config/security.yml
@@ -1,4 +1,5 @@
 security:
+
     providers:
         in_memory:
             memory: ~
@@ -8,5 +9,5 @@ security:
             pattern: ^/(_(profiler|wdt|error)|css|images|js)/
             security: false
 
-        default:
+        main:
             anonymous: ~

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,6 @@`
`18`	`18`
`19`	`19`	`class RootPackageInstallSubscriber implements EventSubscriberInterface`
`20`	`20`	`{`
`21`		`- public static function installAcmeDemoBundle(CommandEvent $event)`
`22`		`- {`
`23`		`- ScriptHandler::installAcmeDemoBundle($event);`
`24`		`- }`
`25`		`-`
`26`	`21`	`public static function setupNewDirectoryStructure(CommandEvent $event)`
`27`	`22`	`{`
`28`	`23`	`ScriptHandler::defineDirectoryStructure($event);`
`@@ -33,7 +28,6 @@ public static function getSubscribedEvents()`
`33`	`28`	`return array(`
`34`	`29`	`ScriptEvents::POST_INSTALL_CMD => array(`
`35`	`30`	`array('setupNewDirectoryStructure', 512),`
`36`		`- array('installAcmeDemoBundle', 0)`
`37`	`31`	`),`
`38`	`32`	`);`
`39`	`33`	`}`