diff options
| author | Anatol Belski <ab@php.net> | 2018-05-03 17:16:42 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-05-03 17:16:42 +0200 |
| commit | b0def5bde9b09e88aec016a096dad1494744d55d (patch) | |
| tree | 762a57dfe05b59d3d221a8444dffd551d880637c | |
| parent | e01d0387d1a0b3b752c140a44a0ae7567986158d (diff) | |
| parent | 6b8592610465097119dc2f23af312227fee5b1a6 (diff) | |
| download | php-git-b0def5bde9b09e88aec016a096dad1494744d55d.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix tests, ref bug #74385
| -rw-r--r-- | ext/intl/tests/collator_create.phpt | 4 | ||||
| -rw-r--r-- | ext/intl/tests/collator_create2.phpt | 4 | ||||
| -rw-r--r-- | ext/intl/tests/collator_create3.phpt | 4 | ||||
| -rw-r--r-- | ext/intl/tests/collator_create4.phpt | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ext/intl/tests/collator_create.phpt b/ext/intl/tests/collator_create.phpt index eed8cf1b23..1607d41a00 100644 --- a/ext/intl/tests/collator_create.phpt +++ b/ext/intl/tests/collator_create.phpt @@ -22,7 +22,7 @@ function ut_main() '', 'root', 'uk@currency=EURO', - '1234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' + '12345678911131517192123252729313335373941434547495153575961636567697173757779818385878991939597991234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' ); foreach( $locales as $locale ) @@ -79,4 +79,4 @@ Locale: 'uk@currency=EURO' ULOC_REQUESTED_LOCALE = 'uk@currency=EURO' ULOC_VALID_LOCALE = 'uk' ULOC_ACTUAL_LOCALE = 'uk' -Error creating collator with '1234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' locale: Locale string too long, should be no longer than 80 characters: U_ILLEGAL_ARGUMENT_ERROR +Error creating collator with '12345678911131517192123252729313335373941434547495153575961636567697173757779818385878991939597991234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' locale: Locale string too long, should be no longer than %d characters: U_ILLEGAL_ARGUMENT_ERROR diff --git a/ext/intl/tests/collator_create2.phpt b/ext/intl/tests/collator_create2.phpt index 5d9f35741b..60f818e9ee 100644 --- a/ext/intl/tests/collator_create2.phpt +++ b/ext/intl/tests/collator_create2.phpt @@ -23,7 +23,7 @@ function ut_main() '', 'root', 'uk@currency=EURO', - '1234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' + '12345678911131517192123252729313335373941434547495153575961636567697173757779818385878991939597991234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' ); foreach( $locales as $locale ) @@ -80,4 +80,4 @@ Locale: 'uk@currency=EURO' ULOC_REQUESTED_LOCALE = 'uk@currency=EURO' ULOC_VALID_LOCALE = 'uk' ULOC_ACTUAL_LOCALE = 'uk' -Error creating collator with '1234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' locale: Locale string too long, should be no longer than 80 characters: U_ILLEGAL_ARGUMENT_ERROR +Error creating collator with '12345678911131517192123252729313335373941434547495153575961636567697173757779818385878991939597991234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' locale: Locale string too long, should be no longer than %d characters: U_ILLEGAL_ARGUMENT_ERROR diff --git a/ext/intl/tests/collator_create3.phpt b/ext/intl/tests/collator_create3.phpt index 5041e635fa..8d9308aca1 100644 --- a/ext/intl/tests/collator_create3.phpt +++ b/ext/intl/tests/collator_create3.phpt @@ -23,7 +23,7 @@ function ut_main() '', 'root', 'uk@currency=EURO', - '1234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' + '12345678911131517192123252729313335373941434547495153575961636567697173757779818385878991939597991234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' ); foreach( $locales as $locale ) @@ -80,4 +80,4 @@ Locale: 'uk@currency=EURO' ULOC_REQUESTED_LOCALE = 'uk@currency=EURO' ULOC_VALID_LOCALE = 'uk' ULOC_ACTUAL_LOCALE = 'uk' -Error creating collator with '1234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' locale: Locale string too long, should be no longer than 80 characters: U_ILLEGAL_ARGUMENT_ERROR +Error creating collator with '12345678911131517192123252729313335373941434547495153575961636567697173757779818385878991939597991234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' locale: Locale string too long, should be no longer than %d characters: U_ILLEGAL_ARGUMENT_ERROR diff --git a/ext/intl/tests/collator_create4.phpt b/ext/intl/tests/collator_create4.phpt index 2c22e6a442..0e2126eca4 100644 --- a/ext/intl/tests/collator_create4.phpt +++ b/ext/intl/tests/collator_create4.phpt @@ -22,7 +22,7 @@ function ut_main() '', 'root', 'uk@currency=EURO', - '1234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' + '12345678911131517192123252729313335373941434547495153575961636567697173757779818385878991939597991234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' ); foreach( $locales as $locale ) @@ -76,4 +76,4 @@ Locale: 'uk@currency=EURO' ULOC_REQUESTED_LOCALE = 'uk@currency=EURO' ULOC_VALID_LOCALE = 'uk' ULOC_ACTUAL_LOCALE = 'uk' -Error creating collator with '1234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' locale: Locale string too long, should be no longer than 80 characters: U_ILLEGAL_ARGUMENT_ERROR +Error creating collator with '12345678911131517192123252729313335373941434547495153575961636567697173757779818385878991939597991234567891113151719212325272931333537394143454749515357596163656769717375777981838587899193959799' locale: Locale string too long, should be no longer than %d characters: U_ILLEGAL_ARGUMENT_ERROR |