Merge branch '2.3'

fabpot · fabpot · commit cce1f938d275 · 2013-09-18T13:09:17.000+02:00
* 2.3: Revert "merged branch eventhorizonpl/fix_doctrine_common_dependency (PR symfony#591)" fix doctrine-common dependency for 2.3 version updated VENDORS for 2.3.4 updated VENDORS for 2.3.3 Update phpDoc to make it standard compliant Updated the profiler configuration for the 2.3 changes updated VENDORS for 2.3.2 Small typo/grammar fix. remove app cache, logs .gitkeep to ignore file
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 /app/cache/*
 /app/config/parameters.yml
 /app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
 /build/
 /vendor/
 /bin/
diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
@@ -16,7 +16,7 @@
  *
  * ************** CAUTION **************
  *
- * DO NOT EDIT THIS FILE as it will be overriden by Composer as part of
+ * DO NOT EDIT THIS FILE as it will be overridden by Composer as part of
  * the installation/update process. The original file resides in the
  * SensioDistributionBundle.
  *
@@ -307,7 +307,7 @@ public function getFailedRequirements()
     }
 
     /**
-     * Returns all optional recommmendations.
+     * Returns all optional recommendations.
      *
      * @return array Array of Requirement instances
      */
@@ -554,6 +554,20 @@ function_exists('simplexml_import_dom'),
             'Your project might not work properly due to the PHP bug #61453 ("Cannot dump definitions which have method calls"). Install PHP 5.4.1 or newer.'
         );
 
+        $this->addRecommendation(
+            version_compare($installedPhpVersion, '5.4.11', '>='),
+            'When using the logout handler from the Symfony Security Component, you should have at least PHP 5.4.11 due to PHP bug #63379 (as a workaround, you can also set invalidate_session to false in the security logout handler configuration)',
+            'Install PHP 5.4.11 or newer if your project uses the logout handler from the Symfony Security Component.'
+        );
+
+        $this->addRecommendation(
+            (version_compare($installedPhpVersion, '5.3.18', '>=') && version_compare($installedPhpVersion, '5.4.0', '<'))
+            ||
+            version_compare($installedPhpVersion, '5.4.8', '>='),
+            'You should use PHP 5.3.18+ or PHP 5.4.8+ to always get nice error messages for fatal errors in the development environment due to PHP bug #61767/#60909',
+            'Install PHP 5.3.18+ or PHP 5.4.8+ if you want nice error messages for all fatal errors in the development environment.'
+        );
+
         if (null !== $pcreVersion) {
             $this->addRecommendation(
                 $pcreVersion >= 8.0,
@@ -630,11 +644,15 @@ class_exists('Locale'),
         }
 
         $accelerator =
-            (function_exists('apc_store') && ini_get('apc.enabled'))
+            (extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'))
+            ||
+            (extension_loaded('apc') && ini_get('apc.enabled'))
+            ||
+            (extension_loaded('Zend OPcache') && ini_get('opcache.enable'))
             ||
-            function_exists('eaccelerator_put') && ini_get('eaccelerator.enable')
+            (extension_loaded('xcache') && ini_get('xcache.cacher'))
             ||
-            function_exists('xcache_set')
+            (extension_loaded('wincache') && ini_get('wincache.ocenabled'))
         ;
 
         $this->addRecommendation(
diff --git a/app/autoload.php b/app/autoload.php
@@ -4,7 +4,7 @@
 use Composer\Autoload\ClassLoader;
 
 /**
- * @var $loader ClassLoader
+ * @var ClassLoader $loader
  */
 $loader = require __DIR__.'/../vendor/autoload.php';
 
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
@@ -6,7 +6,7 @@ framework:
     session:
         storage_id: session.storage.mock_file
     profiler:
-        enabled: false
+        collect: false
 
 web_profiler:
     toolbar: false
diff --git a/web/.htaccess b/web/.htaccess
@@ -1,7 +1,7 @@
-# Use the front controller as index file. It serves as fallback solution when
+# Use the front controller as index file. It serves as a fallback solution when
 # every other rewrite/redirect fails (e.g. in an aliased environment without
 # mod_rewrite). Additionally, this reduces the matching process for the
-# startpage (path "/") because otherwise Apache will apply the rewritting rules
+# start page (path "/") because otherwise Apache will apply the rewriting rules
 # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
 DirectoryIndex app.php
 
@@ -24,7 +24,7 @@ DirectoryIndex app.php
     # endless redirect loop (request -> rewrite to front controller ->
     # redirect -> request -> ...).
     # So in case you get a "too many redirects" error or you always get redirected
-    # to the startpage because your Apache does not expose the REDIRECT_STATUS
+    # to the start page because your Apache does not expose the REDIRECT_STATUS
     # environment variable, you have 2 choices:
     # - disable this feature by commenting the following 2 lines or
     # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the
@@ -44,7 +44,7 @@ DirectoryIndex app.php
 <IfModule !mod_rewrite.c>
     <IfModule mod_alias.c>
         # When mod_rewrite is not available, we instruct a temporary redirect of
-        # the startpage to the front controller explicitly so that the website
+        # the start page to the front controller explicitly so that the website
         # and the generated links can still be used.
         RedirectMatch 302 ^/$ /app.php/
         # RedirectTemp cannot be used instead
