aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2015-06-01 17:39:05 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2015-06-01 17:39:05 +0200
commit51d9699fa130a18a1c5cd09d1b03a382d73e91db (patch)
tree5cff73a91e8ae98787b35f18e8c9629e5360adcd
parent2878416f8b4d94fb5e64c2fa61861526a7654d3d (diff)
downloadwallabag-51d9699fa130a18a1c5cd09d1b03a382d73e91db.tar.gz
wallabag-51d9699fa130a18a1c5cd09d1b03a382d73e91db.tar.zst
wallabag-51d9699fa130a18a1c5cd09d1b03a382d73e91db.zip
Update deps
-rw-r--r--app/SymfonyRequirements.php14
-rw-r--r--composer.lock22
2 files changed, 22 insertions, 14 deletions
diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
index caabe407..b9d62f72 100644
--- a/app/SymfonyRequirements.php
+++ b/app/SymfonyRequirements.php
@@ -643,15 +643,15 @@ class SymfonyRequirements extends RequirementCollection
643 'Install and enable the <strong>intl</strong> extension (used for validators).' 643 'Install and enable the <strong>intl</strong> extension (used for validators).'
644 ); 644 );
645 645
646 if (class_exists('Collator')) { 646 if (extension_loaded('intl')) {
647 // in some WAMP server installations, new Collator() returns null
647 $this->addRecommendation( 648 $this->addRecommendation(
648 null !== new Collator('fr_FR'), 649 null !== new Collator('fr_FR'),
649 'intl extension should be correctly configured', 650 'intl extension should be correctly configured',
650 'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds.' 651 'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds.'
651 ); 652 );
652 }
653 653
654 if (class_exists('Locale')) { 654 // check for compatible ICU versions (only done when you have the intl extension)
655 if (defined('INTL_ICU_VERSION')) { 655 if (defined('INTL_ICU_VERSION')) {
656 $version = INTL_ICU_VERSION; 656 $version = INTL_ICU_VERSION;
657 } else { 657 } else {
@@ -670,6 +670,14 @@ class SymfonyRequirements extends RequirementCollection
670 'intl ICU version should be at least 4+', 670 'intl ICU version should be at least 4+',
671 'Upgrade your <strong>intl</strong> extension with a newer ICU version (4+).' 671 'Upgrade your <strong>intl</strong> extension with a newer ICU version (4+).'
672 ); 672 );
673
674 $this->addPhpIniRecommendation(
675 'intl.error_level',
676 create_function('$cfgValue', 'return (int) $cfgValue === 0;'),
677 true,
678 'intl.error_level should be 0 in php.ini',
679 '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.'
680 );
673 } 681 }
674 682
675 $accelerator = 683 $accelerator =
diff --git a/composer.lock b/composer.lock
index c44ffee0..d32f0980 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1972,17 +1972,17 @@
1972 }, 1972 },
1973 { 1973 {
1974 "name": "sensio/distribution-bundle", 1974 "name": "sensio/distribution-bundle",
1975 "version": "v3.0.25", 1975 "version": "v3.0.28",
1976 "target-dir": "Sensio/Bundle/DistributionBundle", 1976 "target-dir": "Sensio/Bundle/DistributionBundle",
1977 "source": { 1977 "source": {
1978 "type": "git", 1978 "type": "git",
1979 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", 1979 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
1980 "reference": "01931139b0f067a4016d5d56e82c2b3086533b89" 1980 "reference": "8175618b07793b9d43c3be931f3d8d4c14c9e866"
1981 }, 1981 },
1982 "dist": { 1982 "dist": {
1983 "type": "zip", 1983 "type": "zip",
1984 "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/01931139b0f067a4016d5d56e82c2b3086533b89", 1984 "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/8175618b07793b9d43c3be931f3d8d4c14c9e866",
1985 "reference": "01931139b0f067a4016d5d56e82c2b3086533b89", 1985 "reference": "8175618b07793b9d43c3be931f3d8d4c14c9e866",
1986 "shasum": "" 1986 "shasum": ""
1987 }, 1987 },
1988 "require": { 1988 "require": {
@@ -2028,7 +2028,7 @@
2028 "configuration", 2028 "configuration",
2029 "distribution" 2029 "distribution"
2030 ], 2030 ],
2031 "time": "2015-05-29 22:35:41" 2031 "time": "2015-06-01 15:04:20"
2032 }, 2032 },
2033 { 2033 {
2034 "name": "sensio/framework-extra-bundle", 2034 "name": "sensio/framework-extra-bundle",
@@ -3475,16 +3475,16 @@
3475 }, 3475 },
3476 { 3476 {
3477 "name": "phpunit/php-code-coverage", 3477 "name": "phpunit/php-code-coverage",
3478 "version": "2.0.17", 3478 "version": "2.1.2",
3479 "source": { 3479 "source": {
3480 "type": "git", 3480 "type": "git",
3481 "url": "https://github.com/sebastianbergmann/php-code-coverage.git", 3481 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
3482 "reference": "c4e8e7725e351184a76544634855b8a9c405a6e3" 3482 "reference": "6b7d2094ca2a685a2cad846cb7cd7a30e8b9470f"
3483 }, 3483 },
3484 "dist": { 3484 "dist": {
3485 "type": "zip", 3485 "type": "zip",
3486 "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c4e8e7725e351184a76544634855b8a9c405a6e3", 3486 "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6b7d2094ca2a685a2cad846cb7cd7a30e8b9470f",
3487 "reference": "c4e8e7725e351184a76544634855b8a9c405a6e3", 3487 "reference": "6b7d2094ca2a685a2cad846cb7cd7a30e8b9470f",
3488 "shasum": "" 3488 "shasum": ""
3489 }, 3489 },
3490 "require": { 3490 "require": {
@@ -3507,7 +3507,7 @@
3507 "type": "library", 3507 "type": "library",
3508 "extra": { 3508 "extra": {
3509 "branch-alias": { 3509 "branch-alias": {
3510 "dev-master": "2.0.x-dev" 3510 "dev-master": "2.1.x-dev"
3511 } 3511 }
3512 }, 3512 },
3513 "autoload": { 3513 "autoload": {
@@ -3533,7 +3533,7 @@
3533 "testing", 3533 "testing",
3534 "xunit" 3534 "xunit"
3535 ], 3535 ],
3536 "time": "2015-05-25 05:11:59" 3536 "time": "2015-06-01 07:35:26"
3537 }, 3537 },
3538 { 3538 {
3539 "name": "phpunit/php-file-iterator", 3539 "name": "phpunit/php-file-iterator",