From 7bf091c5c20acfaafa5eb2fde2c1802c96c57431 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 12 Jun 2018 16:09:30 +0200 Subject: [PATCH] Remove SVN revision from phar phpinfo output The SVN revision was utilized with Subversion. The Git ident attribute applies only for particular file and since other core extensions don't output this information anymore this patch removes it from the phpinfo output to sync and make the phpinfo core extensions more consistent. --- .gitattributes | 1 - ext/phar/phar.c | 3 --- ext/phar/tests/phpinfo_001.phpt | 2 -- ext/phar/tests/phpinfo_002.phpt | 1 - ext/phar/tests/phpinfo_003.phpt | 1 - ext/phar/tests/phpinfo_004.phpt | 2 -- 6 files changed, 10 deletions(-) diff --git a/.gitattributes b/.gitattributes index 329df676630..98dfdd4fdcd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,7 +2,6 @@ ext/mysqlnd/mysqlnd.h ident ext/iconv/php_iconv.h ident ext/ext_skel.php ident ext/phar/phar/pharcommand.inc ident -ext/phar/phar.c ident ext/dba/libinifile/inifile.c ident ext/dba/libflatfile/flatfile.c ident ext/dba/libcdb/cdb_make.c ident diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 21f08c7b045..de3475b63ce 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -17,8 +17,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #define PHAR_MAIN 1 #include "phar_internal.h" #include "SAPI.h" @@ -3557,7 +3555,6 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */ 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, "SVN revision", "$Id$"); php_info_print_table_row(2, "Phar-based phar archives", "enabled"); php_info_print_table_row(2, "Tar-based phar archives", "enabled"); php_info_print_table_row(2, "ZIP-based phar archives", "enabled"); diff --git a/ext/phar/tests/phpinfo_001.phpt b/ext/phar/tests/phpinfo_001.phpt index d99ccd18031..32cb3c80a06 100644 --- a/ext/phar/tests/phpinfo_001.phpt +++ b/ext/phar/tests/phpinfo_001.phpt @@ -26,7 +26,6 @@ phpinfo(INFO_MODULES); Phar: PHP Archive support => enabled Phar EXT version => %s Phar API version => 1.1.1 -SVN revision => %sId: %s $ Phar-based phar archives => enabled Tar-based phar archives => enabled ZIP-based phar archives => enabled @@ -48,7 +47,6 @@ Phar Phar: PHP Archive support => enabled Phar EXT version => %s Phar API version => 1.1.1 -SVN revision => %sId: %s $ Phar-based phar archives => enabled Tar-based phar archives => enabled ZIP-based phar archives => enabled diff --git a/ext/phar/tests/phpinfo_002.phpt b/ext/phar/tests/phpinfo_002.phpt index ef505fedad5..f0d72eb461d 100644 --- a/ext/phar/tests/phpinfo_002.phpt +++ b/ext/phar/tests/phpinfo_002.phpt @@ -24,7 +24,6 @@ Phar Phar: PHP Archive support => enabled Phar EXT version => %s Phar API version => 1.1.1 -SVN revision => %sId: %s $ Phar-based phar archives => enabled Tar-based phar archives => enabled ZIP-based phar archives => enabled diff --git a/ext/phar/tests/phpinfo_003.phpt b/ext/phar/tests/phpinfo_003.phpt index 045f1a090d3..dee0bf4df49 100644 --- a/ext/phar/tests/phpinfo_003.phpt +++ b/ext/phar/tests/phpinfo_003.phpt @@ -24,7 +24,6 @@ Phar Phar: PHP Archive support => enabled Phar EXT version => %s Phar API version => 1.1.1 -SVN revision => %cId: %s $ Phar-based phar archives => enabled Tar-based phar archives => enabled ZIP-based phar archives => enabled diff --git a/ext/phar/tests/phpinfo_004.phpt b/ext/phar/tests/phpinfo_004.phpt index b6df3408158..a76a9ad6051 100644 --- a/ext/phar/tests/phpinfo_004.phpt +++ b/ext/phar/tests/phpinfo_004.phpt @@ -29,7 +29,6 @@ phpinfo(INFO_MODULES); Phar: PHP Archive supportenabled Phar EXT version %s Phar API version 1.1.1 -SVN revision %sId: %s $ Phar-based phar archives enabled Tar-based phar archives enabled ZIP-based phar archives enabled @@ -53,7 +52,6 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik.
Phar full Phar: PHP Archive supportenabled Phar EXT version %s Phar API version 1.1.1 -SVN revision %sId: %s $ Phar-based phar archives enabled Tar-based phar archives enabled ZIP-based phar archives enabled