merge #58 Update dependencies (pierredup)

This PR was merged into the 0.4 branch. Discussion ---------- Commits ------- 255369e Update dependencies 3c1ab1a Added the security:check to travis
SolidInvoice · Aug 16, 2015 · 8afc32e · 8afc32e
2 parents 840d298 + 3c1ab1a
commit 8afc32e
Show file tree

Hide file tree

Showing 5 changed files with 303 additions and 286 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,6 +33,7 @@ before_script:
   - php app/check.php
 
 script:
+  - php app/console security:check
   - ./bin/behat --suite=installation -n -f progress
   - ./bin/phpunit -c app
 

diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
@@ -638,20 +638,20 @@ function_exists('posix_isatty'),
         }
 
         $this->addRecommendation(
-            class_exists('Locale'),
+            extension_loaded('intl'),
             'intl extension should be available',
             '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/check.php b/app/check.php
@@ -42,9 +42,9 @@
 }
 
 if ($checkPassed) {
-    echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects', true);
+    echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
 } else {
-    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects', true);
+    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
 
     echo_title('Fix the following mandatory requirements', 'red');
 

diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "stof/doctrine-extensions-bundle": "~1.1",
         "friendsofsymfony/jsrouting-bundle": "~1.5",
         "knplabs/knp-menu-bundle": "~2.0",
-        "rhumsaa/uuid": "~2.8",
+        "ramsey/uuid": "~2.8",
         "moontoast/math": "~1.1",
         "oyejorge/less.php": "~1.7",
         "ircmaxell/password-compat": "dev-master",
@@ -73,7 +73,8 @@
         "phpunit/phpunit": "~4.4",
         "johnkary/phpunit-speedtrap": "~1.0@dev",
         "fzaninotto/faker": "~1.3",
-        "mockery/mockery": "0.9.*"
+        "mockery/mockery": "0.9.*",
+        "sensiolabs/security-checker": "~3.0"
     },
     "scripts": {
         "post-root-package-install": [