Merge branch '2.5'

fabpot · fabpot · commit 03e336cc1408 · 2014-08-27T10:41:25.000+02:00
* 2.5:
  Fixed version in links
  updated VENDORS for 2.5.3
diff --git a/README.md b/README.md
@@ -155,16 +155,16 @@ released under the MIT or BSD license.
 
 Enjoy!
 
-[1]:  http://symfony.com/doc/2.4/book/installation.html
+[1]:  http://symfony.com/doc/2.5/book/installation.html
 [2]:  http://getcomposer.org/
 [3]:  http://symfony.com/download
-[4]:  http://symfony.com/doc/2.4/quick_tour/the_big_picture.html
-[5]:  http://symfony.com/doc/2.4/index.html
-[6]:  http://symfony.com/doc/2.4/bundles/SensioFrameworkExtraBundle/index.html
-[7]:  http://symfony.com/doc/2.4/book/doctrine.html
-[8]:  http://symfony.com/doc/2.4/book/templating.html
-[9]:  http://symfony.com/doc/2.4/book/security.html
-[10]: http://symfony.com/doc/2.4/cookbook/email.html
-[11]: http://symfony.com/doc/2.4/cookbook/logging/monolog.html
-[12]: http://symfony.com/doc/2.4/cookbook/assetic/asset_management.html
-[13]: http://symfony.com/doc/2.4/bundles/SensioGeneratorBundle/index.html
+[4]:  http://symfony.com/doc/2.5/quick_tour/the_big_picture.html
+[5]:  http://symfony.com/doc/2.5/index.html
+[6]:  http://symfony.com/doc/2.5/bundles/SensioFrameworkExtraBundle/index.html
+[7]:  http://symfony.com/doc/2.5/book/doctrine.html
+[8]:  http://symfony.com/doc/2.5/book/templating.html
+[9]:  http://symfony.com/doc/2.5/book/security.html
+[10]: http://symfony.com/doc/2.5/cookbook/email.html
+[11]: http://symfony.com/doc/2.5/cookbook/logging/monolog.html
+[12]: http://symfony.com/doc/2.5/cookbook/assetic/asset_management.html
+[13]: http://symfony.com/doc/2.5/bundles/SensioGeneratorBundle/index.html
diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
@@ -602,6 +602,12 @@ function_exists('utf8_decode'),
             'Install and enable the <strong>XML</strong> extension.'
         );
 
+        $this->addRecommendation(
+            function_exists('filter_var'),
+            'filter_var() should be available',
+            'Install and enable the <strong>filter</strong> extension.'
+        );
+
         if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
             $this->addRecommendation(
                 function_exists('posix_isatty'),
@@ -662,7 +668,7 @@ class_exists('Locale'),
         $this->addRecommendation(
             $accelerator,
             'a PHP accelerator should be installed',
-            'Install and enable a <strong>PHP accelerator</strong> like APC (highly recommended).'
+            'Install and/or enable a <strong>PHP accelerator</strong> (highly recommended).'
         );
 
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
