From: Peter Kokot <peterkokot@gmail.com>
Date: Tue, 19 Jun 2018 23:32:26 +0000 (+0200)
Subject: Bump phar and hash extension version to match PHP version
X-Git-Tag: php-7.3.0alpha3~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f96f01e9e4d50f47aa89da03853201304a58bba;p=php

Bump phar and hash extension version to match PHP version
---

diff --git a/ext/hash/php_hash.h b/ext/hash/php_hash.h
index d92f697480..2be80c9a43 100644
--- a/ext/hash/php_hash.h
+++ b/ext/hash/php_hash.h
@@ -24,8 +24,8 @@
 #include "php.h"
 
 #define PHP_HASH_EXTNAME	"hash"
-#define PHP_HASH_VERSION	"1.0"
-#define PHP_MHASH_VERSION	"1.0"
+#define PHP_HASH_VERSION	PHP_VERSION
+#define PHP_MHASH_VERSION	PHP_VERSION
 
 #define PHP_HASH_HMAC		0x0001
 
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 5b4f79846c..5265660a0e 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3553,7 +3553,6 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
 	phar_request_initialize();
 	php_info_print_table_start();
 	php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
-	php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
 	php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
 	php_info_print_table_row(2, "Phar-based phar archives", "enabled");
 	php_info_print_table_row(2, "Tar-based phar archives", "enabled");
diff --git a/ext/phar/php_phar.h b/ext/phar/php_phar.h
index e21002afa6..ce140d473f 100644
--- a/ext/phar/php_phar.h
+++ b/ext/phar/php_phar.h
@@ -22,7 +22,7 @@
 #ifndef PHP_PHAR_H
 #define PHP_PHAR_H
 
-#define PHP_PHAR_VERSION "2.0.2"
+#define PHP_PHAR_VERSION PHP_VERSION
 
 #include "ext/standard/basic_functions.h"
 extern zend_module_entry phar_module_entry;
diff --git a/ext/phar/tests/phpinfo_001.phpt b/ext/phar/tests/phpinfo_001.phpt
index 32cb3c80a0..be726647a0 100644
--- a/ext/phar/tests/phpinfo_001.phpt
+++ b/ext/phar/tests/phpinfo_001.phpt
@@ -24,7 +24,6 @@ phpinfo(INFO_MODULES);
 %aPhar
 
 Phar: PHP Archive support => enabled
-Phar EXT version => %s
 Phar API version => 1.1.1
 Phar-based phar archives => enabled
 Tar-based phar archives => enabled
@@ -45,7 +44,6 @@ phar.require_hash => Off => Off
 Phar
 
 Phar: PHP Archive support => enabled
-Phar EXT version => %s
 Phar API version => 1.1.1
 Phar-based phar archives => enabled
 Tar-based phar archives => enabled
diff --git a/ext/phar/tests/phpinfo_002.phpt b/ext/phar/tests/phpinfo_002.phpt
index f0d72eb461..10303e5280 100644
--- a/ext/phar/tests/phpinfo_002.phpt
+++ b/ext/phar/tests/phpinfo_002.phpt
@@ -22,7 +22,6 @@ phpinfo(INFO_MODULES);
 Phar
 
 Phar: PHP Archive support => enabled
-Phar EXT version => %s
 Phar API version => 1.1.1
 Phar-based phar archives => enabled
 Tar-based phar archives => enabled
diff --git a/ext/phar/tests/phpinfo_003.phpt b/ext/phar/tests/phpinfo_003.phpt
index dee0bf4df4..05d70bc086 100644
--- a/ext/phar/tests/phpinfo_003.phpt
+++ b/ext/phar/tests/phpinfo_003.phpt
@@ -22,7 +22,6 @@ phpinfo(INFO_MODULES);
 Phar
 
 Phar: PHP Archive support => enabled
-Phar EXT version => %s
 Phar API version => 1.1.1
 Phar-based phar archives => enabled
 Tar-based phar archives => enabled
diff --git a/ext/phar/tests/phpinfo_004.phpt b/ext/phar/tests/phpinfo_004.phpt
index a76a9ad605..280fa0b157 100644
--- a/ext/phar/tests/phpinfo_004.phpt
+++ b/ext/phar/tests/phpinfo_004.phpt
@@ -27,7 +27,6 @@ phpinfo(INFO_MODULES);
 <h2><a name="module_phar">Phar</a></h2>
 <table>
 <tr class="h"><th>Phar: PHP Archive support</th><th>enabled</th></tr>
-<tr><td class="e">Phar EXT version </td><td class="v">%s </td></tr>
 <tr><td class="e">Phar API version </td><td class="v">1.1.1 </td></tr>
 <tr><td class="e">Phar-based phar archives </td><td class="v">enabled </td></tr>
 <tr><td class="e">Tar-based phar archives </td><td class="v">enabled </td></tr>
@@ -50,7 +49,6 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik.<br />Phar full
 <h2><a name="module_phar">Phar</a></h2>
 <table>
 <tr class="h"><th>Phar: PHP Archive support</th><th>enabled</th></tr>
-<tr><td class="e">Phar EXT version </td><td class="v">%s </td></tr>
 <tr><td class="e">Phar API version </td><td class="v">1.1.1 </td></tr>
 <tr><td class="e">Phar-based phar archives </td><td class="v">enabled </td></tr>
 <tr><td class="e">Tar-based phar archives </td><td class="v">enabled </td></tr>