diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-03-02 13:03:22 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-03-02 13:03:22 +0300 |
| commit | 95eda16fe97aa6c3647f8624fe2345f3c571f0c2 (patch) | |
| tree | fab17d4df51628179d601a2901212ef8e8048e75 | |
| parent | e66ac376cfa604c988a5ae59e65d9b93614d27ec (diff) | |
| parent | afedd4fd59afa73ebebb46caf6ddfa8aa338bea6 (diff) | |
| download | php-git-95eda16fe97aa6c3647f8624fe2345f3c571f0c2.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test (sizeof(zend_string) is different on 32 and 64-bit systems)
| -rw-r--r-- | ext/standard/tests/strings/str_pad_variation5.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/strings/str_pad_variation5.phpt b/ext/standard/tests/strings/str_pad_variation5.phpt index d050ae80e8..f1f47b932c 100644 --- a/ext/standard/tests/strings/str_pad_variation5.phpt +++ b/ext/standard/tests/strings/str_pad_variation5.phpt @@ -31,4 +31,4 @@ var_dump( str_pad($input, $pad_length) ); --EXPECTF-- *** Testing str_pad() function: with large value for for 'pad_length' argument *** -Fatal error: Allowed memory size of 134217728 bytes exhausted%s(tried to allocate 2147483648 bytes) in %s on line %d +Fatal error: Allowed memory size of 134217728 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d |