Skip to content

Commit 6c7b0ce

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: always check for all fields to be mapped clarify exception when no args are configured [PropertyAccess] Handle interfaces in the invalid argument exception [Debug] Workaround "null" $context [Debug] Remove $context arg from handleError(), preparing for PHP 7.2 [Routing] Fix BC break in AnnotationClassLoader defaults attributes handling Fix tests with ICU 57.1 Fix the condition checking the minimum ICU version
2 parents 8a55cad + fd93d12 commit 6c7b0ce

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Util/IntlTestHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static function requireIntl(\PHPUnit_Framework_TestCase $testCase, $minim
4141
// * the intl extension is loaded with version Intl::getIcuStubVersion()
4242
// * the intl extension is not loaded
4343

44-
if (($minimumIcuVersion || defined('HHVM_VERSION_ID')) && IcuVersion::compare(Intl::getIcuVersion(), $minimumIcuVersion, '!=', 1)) {
44+
if (($minimumIcuVersion || defined('HHVM_VERSION_ID')) && IcuVersion::compare(Intl::getIcuVersion(), $minimumIcuVersion, '<', 1)) {
4545
$testCase->markTestSkipped('ICU version '.$minimumIcuVersion.' is required.');
4646
}
4747

0 commit comments

Comments
 (0)