summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-06-30 14:15:40 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2018-06-30 15:35:43 +0200
commit7c042190988dc51ac60ba6171dce66361394ae22 (patch)
tree934e7b5238b91dfa418e9c48ceac13c2ca170524
parent8bc2163c8add87bdb096cca5c09449fb69b22ec4 (diff)
downloadphp-git-7c042190988dc51ac60ba6171dce66361394ae22.tar.gz
Fix pecl vs ext typo in phar
Phar phpinfo output lists also info about bz2 extension if it's disabled and a quick info about installation. Instead of not maintained pecl package bz2 the ext/bz2 should be mentioned. Also some outdated pecl/phar are updated to ext/phar instead in test comments.
-rw-r--r--ext/phar/phar.c2
-rw-r--r--ext/phar/tests/nophar.phpt2
-rw-r--r--ext/phar/tests/phpinfo_003.phpt2
-rw-r--r--ext/phar/tests/withphar.phpt2
4 files changed, 4 insertions, 4 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 5265660a0e..d0624bcc39 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3567,7 +3567,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
if (PHAR_G(has_bz2)) {
php_info_print_table_row(2, "bzip2 compression", "enabled");
} else {
- php_info_print_table_row(2, "bzip2 compression", "disabled (install pecl/bz2)");
+ php_info_print_table_row(2, "bzip2 compression", "disabled (install ext/bz2)");
}
#ifdef PHAR_HAVE_OPENSSL
php_info_print_table_row(2, "Native OpenSSL support", "enabled");
diff --git a/ext/phar/tests/nophar.phpt b/ext/phar/tests/nophar.phpt
index d97df8af2e..0534c17cd9 100644
--- a/ext/phar/tests/nophar.phpt
+++ b/ext/phar/tests/nophar.phpt
@@ -1,5 +1,5 @@
--TEST--
-Phar: phar run without pecl/phar with default stub
+Phar: phar run without ext/phar with default stub
--SKIPIF--
<?php if (extension_loaded("phar")) die("skip Phar extension must be disabled for this test"); ?>
--FILE--
diff --git a/ext/phar/tests/phpinfo_003.phpt b/ext/phar/tests/phpinfo_003.phpt
index 05d70bc086..fb27fb6fb9 100644
--- a/ext/phar/tests/phpinfo_003.phpt
+++ b/ext/phar/tests/phpinfo_003.phpt
@@ -27,7 +27,7 @@ Phar-based phar archives => enabled
Tar-based phar archives => enabled
ZIP-based phar archives => enabled
gzip compression => disabled (install ext/zlib)
-bzip2 compression => disabled (install pecl/bz2)
+bzip2 compression => disabled (install ext/bz2)
OpenSSL support => disabled (install ext/openssl)
diff --git a/ext/phar/tests/withphar.phpt b/ext/phar/tests/withphar.phpt
index c422fa9843..26c86d2f1b 100644
--- a/ext/phar/tests/withphar.phpt
+++ b/ext/phar/tests/withphar.phpt
@@ -1,5 +1,5 @@
--TEST--
-Phar: phar run with pecl/phar with default stub
+Phar: phar run with ext/phar with default stub
--SKIPIF--
<?php if (!extension_loaded("phar")) die("skip"); ?>
--FILE--