diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-23 17:12:52 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-23 17:12:52 -0800 |
| commit | 34c1ba5685e5f86f98f0e1b38c95c7dacc106e3b (patch) | |
| tree | f082be380cc0fcc9e71d5e5c8cfc351c55cbd962 | |
| parent | de075d172c1fe218e1a7a5c2dbd5fa84f9af0e1d (diff) | |
| parent | 5351ecbfca18a86b44e5cadef67a2d6fc153a907 (diff) | |
| download | php-git-34c1ba5685e5f86f98f0e1b38c95c7dacc106e3b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Correct two zlib tests to use a string, not a const
| -rw-r--r-- | ext/zlib/tests/gzfile_variation4.phpt | 2 | ||||
| -rw-r--r-- | ext/zlib/tests/readgzfile_variation4.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/zlib/tests/gzfile_variation4.phpt b/ext/zlib/tests/gzfile_variation4.phpt index 3310231566..9b3128125a 100644 --- a/ext/zlib/tests/gzfile_variation4.phpt +++ b/ext/zlib/tests/gzfile_variation4.phpt @@ -2,7 +2,7 @@ Test function gzfile() by substituting argument 1 with float values. --SKIPIF-- <?php -if (!extension_loaded(zlib)) die ('skip zlib extension not available in this build'); +if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build'); ?> --FILE-- <?php diff --git a/ext/zlib/tests/readgzfile_variation4.phpt b/ext/zlib/tests/readgzfile_variation4.phpt index 00211f7dfe..32f434cba2 100644 --- a/ext/zlib/tests/readgzfile_variation4.phpt +++ b/ext/zlib/tests/readgzfile_variation4.phpt @@ -2,7 +2,7 @@ Test function readgzfile() by substituting argument 1 with float values. --SKIPIF-- <?php -if (!extension_loaded(zlib)) die ('skip zlib extension not available in this build'); +if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build'); ?> --FILE-- <?php |