Skip to content

Commit

Permalink
updated VENDORS for 2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed Sep 11, 2012
1 parent d772606 commit 6272172
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 39 deletions.
12 changes: 3 additions & 9 deletions app/SymfonyRequirements.php
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,8 @@ public function __construct()

$this->addRequirement(
version_compare($installedPhpVersion, '5.3.16', '!='),
'Symfony won\'t work properly with PHP 5.3.16 due to PHP bug #62874',
'Install PHP 5.3.17 or newer when possible, or downgrade to PHP 5.3.15.'
'PHP version must not be 5.3.16 as Symfony won\'t work properly with it',
'Install PHP 5.3.17 or newer (or downgrade to an earlier PHP version)'
);

$this->addRequirement(
Expand Down Expand Up @@ -477,13 +477,7 @@ function_exists('simplexml_import_dom'),

$this->addPhpIniRequirement('detect_unicode', false);

ob_start();
phpinfo();
$phpinfo = ob_get_contents();
ob_end_clean();

// the phpinfo check is necessary when Suhosin is compiled into PHP
if (extension_loaded('suhosin') || false !== strpos($phpinfo, 'Suhosin')) {
if (extension_loaded('suhosin')) {
$this->addPhpIniRequirement(
'suhosin.executor.include.whitelist',
create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'),
Expand Down
48 changes: 18 additions & 30 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6272172

Please sign in to comment.