Skip to content

Commit 3f96f01

Browse files
petkcmb69
authored andcommitted
Bump phar and hash extension version to match PHP version
1 parent 4418d61 commit 3f96f01

File tree

7 files changed

+3
-10
lines changed

7 files changed

+3
-10
lines changed

ext/hash/php_hash.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include "php.h"
2525

2626
#define PHP_HASH_EXTNAME "hash"
27-
#define PHP_HASH_VERSION "1.0"
28-
#define PHP_MHASH_VERSION "1.0"
27+
#define PHP_HASH_VERSION PHP_VERSION
28+
#define PHP_MHASH_VERSION PHP_VERSION
2929

3030
#define PHP_HASH_HMAC 0x0001
3131

ext/phar/phar.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3553,7 +3553,6 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
35533553
phar_request_initialize();
35543554
php_info_print_table_start();
35553555
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
3556-
php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
35573556
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
35583557
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
35593558
php_info_print_table_row(2, "Tar-based phar archives", "enabled");

ext/phar/php_phar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#ifndef PHP_PHAR_H
2323
#define PHP_PHAR_H
2424

25-
#define PHP_PHAR_VERSION "2.0.2"
25+
#define PHP_PHAR_VERSION PHP_VERSION
2626

2727
#include "ext/standard/basic_functions.h"
2828
extern zend_module_entry phar_module_entry;

ext/phar/tests/phpinfo_001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ phpinfo(INFO_MODULES);
2424
%aPhar
2525

2626
Phar: PHP Archive support => enabled
27-
Phar EXT version => %s
2827
Phar API version => 1.1.1
2928
Phar-based phar archives => enabled
3029
Tar-based phar archives => enabled
@@ -45,7 +44,6 @@ phar.require_hash => Off => Off
4544
Phar
4645

4746
Phar: PHP Archive support => enabled
48-
Phar EXT version => %s
4947
Phar API version => 1.1.1
5048
Phar-based phar archives => enabled
5149
Tar-based phar archives => enabled

ext/phar/tests/phpinfo_002.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ phpinfo(INFO_MODULES);
2222
Phar
2323

2424
Phar: PHP Archive support => enabled
25-
Phar EXT version => %s
2625
Phar API version => 1.1.1
2726
Phar-based phar archives => enabled
2827
Tar-based phar archives => enabled

ext/phar/tests/phpinfo_003.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ phpinfo(INFO_MODULES);
2222
Phar
2323

2424
Phar: PHP Archive support => enabled
25-
Phar EXT version => %s
2625
Phar API version => 1.1.1
2726
Phar-based phar archives => enabled
2827
Tar-based phar archives => enabled

ext/phar/tests/phpinfo_004.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ phpinfo(INFO_MODULES);
2727
<h2><a name="module_phar">Phar</a></h2>
2828
<table>
2929
<tr class="h"><th>Phar: PHP Archive support</th><th>enabled</th></tr>
30-
<tr><td class="e">Phar EXT version </td><td class="v">%s </td></tr>
3130
<tr><td class="e">Phar API version </td><td class="v">1.1.1 </td></tr>
3231
<tr><td class="e">Phar-based phar archives </td><td class="v">enabled </td></tr>
3332
<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
5049
<h2><a name="module_phar">Phar</a></h2>
5150
<table>
5251
<tr class="h"><th>Phar: PHP Archive support</th><th>enabled</th></tr>
53-
<tr><td class="e">Phar EXT version </td><td class="v">%s </td></tr>
5452
<tr><td class="e">Phar API version </td><td class="v">1.1.1 </td></tr>
5553
<tr><td class="e">Phar-based phar archives </td><td class="v">enabled </td></tr>
5654
<tr><td class="e">Tar-based phar archives </td><td class="v">enabled </td></tr>

0 commit comments

Comments
 (0)