Merge branch '2.7' into 2.8

fabpot · fabpot · commit 4066f99c3911 · 2015-06-11T22:43:48.000+02:00
* 2.7:
  The security.yml file now uses the same configuration as in Symfony 2.3 (the "default" firewall is now called "main")
  fixed PHP dep
  Removed AcmeDemoBundle
  Removed beta flag from release version
  PSR-4 path to `SymfonyStandard` is incorrect
  updated VENDORS for 2.7.0
  updated VENDORS for 2.6.9
  updated VENDORS for 2.6.8
  Changed ORM default naming strategy to underscore
  updated VENDORS for 2.7.0-BETA2
  updated VENDORS for 2.6.7

Conflicts:
	composer.json
	composer.lock
diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
@@ -643,15 +643,15 @@ class_exists('Locale'),
             'Install and enable the <strong>intl</strong> extension (used for validators).'
         );
 
-        if (class_exists('Collator')) {
+        if (extension_loaded('intl')) {
+            // in some WAMP server installations, new Collator() returns null
             $this->addRecommendation(
                 null !== new Collator('fr_FR'),
                 'intl extension should be correctly configured',
                 'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds.'
             );
-        }
 
-        if (class_exists('Locale')) {
+            // check for compatible ICU versions (only done when you have the intl extension)
             if (defined('INTL_ICU_VERSION')) {
                 $version = INTL_ICU_VERSION;
             } else {
@@ -670,6 +670,14 @@ class_exists('Locale'),
                 'intl ICU version should be at least 4+',
                 'Upgrade your <strong>intl</strong> extension with a newer ICU version (4+).'
             );
+
+            $this->addPhpIniRecommendation(
+                'intl.error_level',
+                create_function('$cfgValue', 'return (int) $cfgValue === 0;'),
+                true,
+                'intl.error_level should be 0 in php.ini',
+                'Set "<strong>intl.error_level</strong>" to "<strong>0</strong>" in php.ini<a href="#phpini">*</a> to inhibit the messages when an error occurs in ICU functions.'
+            );
         }
 
         $accelerator =
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/config.yml b/app/config/config.yml
@@ -68,6 +68,7 @@ doctrine:
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
+        naming_strategy: doctrine.orm.naming_strategy.underscore
         auto_mapping: true
 
 # Swiftmailer Configuration
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: ~
diff --git a/composer.json b/composer.json
@@ -4,10 +4,10 @@
     "type": "project",
     "description": "The \"Symfony Standard Edition\" distribution",
     "autoload": {
-        "psr-4": { "": "src/", "SymfonyStandard\\": "app/" }
+        "psr-4": { "": "src/", "SymfonyStandard\\": "app/SymfonyStandard/" }
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.3.9",
         "symfony/symfony": "2.8.x-dev",
         "doctrine/orm": "~2.2,>=2.2.3,<2.5",
         "doctrine/dbal": "<2.5",
diff --git a/composer.lock b/composer.lock

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`	`}`