merged branch cordoval/fixclicgi (PR symfony#144)

fabpot · fabpot · commit c143c2f1dfb6 · 2011-07-16T08:07:10.000+02:00
Commits ------- d868bf7 * fixed run of web/check.php and app/check.php for cgi and cli Discussion ---------- * fixed run of web/check.php and app/check.php for cgi and cli --------------------------------------------------------------------------- by fabpot at 2011/07/15 01:03:22 -0700 Please, remove all the changes you made that does not change anything feature-wise and then squash all the commits. Thanks. --------------------------------------------------------------------------- by cordoval at 2011/07/15 06:37:49 -0700 gah sorry, I should not have clicked on phpstorm reformat code :) I will work on it and get it back to you --------------------------------------------------------------------------- by cordoval at 2011/07/15 22:38:09 -0700 @fabpot: it took me a lot of trials but i did the job, thanks for teaching me how to PR rightly I hope one day to be as smart as you are :)
diff --git a/app/check.php b/app/check.php
@@ -54,8 +54,13 @@
         $reflector->info();
         $output = ob_get_clean();
 
-        preg_match('/^ICU version => (.*)$/m', $output, $matches);
-        $version = $matches[1];
+        if (preg_match('/^ICU version => (.*)$/m', $output, $matches)) {
+            $version = $matches[1];
+        } elseif ( preg_match('/^<tr><td class="e">ICU version <\/td><td class="v">(.*)<\/td><\/tr>$/m', $output, $matches) ) {
+            $version = $matches[1];
+        } else {
+            $version = '';
+        }
     }
 
     check(version_compare($matches[1], '4.0', '>='), 'Checking that the intl ICU version is at least 4+', 'Upgrade your intl extension with a newer ICU version (4+)', false);
