Update deps

This commit is contained in:
Jeremy Benoist 2015-06-01 17:39:05 +02:00
parent 2878416f8b
commit 51d9699fa1
2 changed files with 22 additions and 14 deletions

View File

@ -643,15 +643,15 @@ class SymfonyRequirements extends RequirementCollection
'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 SymfonyRequirements extends RequirementCollection
'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 =

22
composer.lock generated
View File

@ -1972,17 +1972,17 @@
},
{
"name": "sensio/distribution-bundle",
"version": "v3.0.25",
"version": "v3.0.28",
"target-dir": "Sensio/Bundle/DistributionBundle",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
"reference": "01931139b0f067a4016d5d56e82c2b3086533b89"
"reference": "8175618b07793b9d43c3be931f3d8d4c14c9e866"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/01931139b0f067a4016d5d56e82c2b3086533b89",
"reference": "01931139b0f067a4016d5d56e82c2b3086533b89",
"url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/8175618b07793b9d43c3be931f3d8d4c14c9e866",
"reference": "8175618b07793b9d43c3be931f3d8d4c14c9e866",
"shasum": ""
},
"require": {
@ -2028,7 +2028,7 @@
"configuration",
"distribution"
],
"time": "2015-05-29 22:35:41"
"time": "2015-06-01 15:04:20"
},
{
"name": "sensio/framework-extra-bundle",
@ -3475,16 +3475,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "2.0.17",
"version": "2.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "c4e8e7725e351184a76544634855b8a9c405a6e3"
"reference": "6b7d2094ca2a685a2cad846cb7cd7a30e8b9470f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c4e8e7725e351184a76544634855b8a9c405a6e3",
"reference": "c4e8e7725e351184a76544634855b8a9c405a6e3",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6b7d2094ca2a685a2cad846cb7cd7a30e8b9470f",
"reference": "6b7d2094ca2a685a2cad846cb7cd7a30e8b9470f",
"shasum": ""
},
"require": {
@ -3507,7 +3507,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
"dev-master": "2.1.x-dev"
}
},
"autoload": {
@ -3533,7 +3533,7 @@
"testing",
"xunit"
],
"time": "2015-05-25 05:11:59"
"time": "2015-06-01 07:35:26"
},
{
"name": "phpunit/php-file-iterator",