summaryrefslogtreecommitdiff
path: root/ext/bz2
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-07-03 02:52:16 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2018-07-25 00:53:25 +0200
commit8d3f8ca12a0b00f2a74a27424790222536235502 (patch)
treef35ddbdb8b5bc9259712d0275cb461ab7de9b7b9 /ext/bz2
parentdcd6a6ff367a91f8c03303a4dc2e3c8b17d692ed (diff)
downloadphp-git-8d3f8ca12a0b00f2a74a27424790222536235502.tar.gz
Remove unused Git attributes ident
The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore.
Diffstat (limited to 'ext/bz2')
-rw-r--r--ext/bz2/bz2.c2
-rw-r--r--ext/bz2/bz2_filter.c2
-rw-r--r--ext/bz2/config.m44
-rw-r--r--ext/bz2/config.w321
-rw-r--r--ext/bz2/php_bz2.h2
-rw-r--r--ext/bz2/tests/bz2_filter_compress.phpt2
-rw-r--r--ext/bz2/tests/bz2_filter_decompress.phpt2
-rw-r--r--ext/bz2/tests/with_files.phpt2
-rw-r--r--ext/bz2/tests/with_strings.phpt2
9 files changed, 5 insertions, 14 deletions
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index c4d7904887..274f381c35 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -16,8 +16,6 @@
+----------------------------------------------------------------------+
*/
-/* $Id$ */
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c
index 2dc3b74362..0287a1159f 100644
--- a/ext/bz2/bz2_filter.c
+++ b/ext/bz2/bz2_filter.c
@@ -16,8 +16,6 @@
+----------------------------------------------------------------------+
*/
-/* $Id$ */
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4
index 55917c07f4..1f3d52a7a0 100644
--- a/ext/bz2/config.m4
+++ b/ext/bz2/config.m4
@@ -1,6 +1,4 @@
-dnl
-dnl $Id$
-dnl
+dnl config.m4 for extension bz2
PHP_ARG_WITH(bz2, for BZip2 support,
[ --with-bz2[=DIR] Include BZip2 support])
diff --git a/ext/bz2/config.w32 b/ext/bz2/config.w32
index ae30c84f9f..96214faf9c 100644
--- a/ext/bz2/config.w32
+++ b/ext/bz2/config.w32
@@ -1,4 +1,3 @@
-// $Id$
// vim:ft=javascript
ARG_WITH("bz2", "BZip2", "no");
diff --git a/ext/bz2/php_bz2.h b/ext/bz2/php_bz2.h
index bbb48e41bf..d025058b1b 100644
--- a/ext/bz2/php_bz2.h
+++ b/ext/bz2/php_bz2.h
@@ -16,8 +16,6 @@
+----------------------------------------------------------------------+
*/
-/* $Id$ */
-
#ifndef PHP_BZ2_H
#define PHP_BZ2_H
diff --git a/ext/bz2/tests/bz2_filter_compress.phpt b/ext/bz2/tests/bz2_filter_compress.phpt
index 3de9a9d3ec..3ca0c3901d 100644
--- a/ext/bz2/tests/bz2_filter_compress.phpt
+++ b/ext/bz2/tests/bz2_filter_compress.phpt
@@ -3,7 +3,7 @@ bzip2.compress (with convert.base64-encode)
--SKIPIF--
<?php if (!extension_loaded("bz2")) print "skip"; ?>
--FILE--
-<?php /* $Id$ */
+<?php
$text = 'I am the very model of a modern major general, I\'ve information vegetable, animal, and mineral.';
$fp = fopen('php://stdout', 'w');
diff --git a/ext/bz2/tests/bz2_filter_decompress.phpt b/ext/bz2/tests/bz2_filter_decompress.phpt
index 951d572cb2..c9b8ac0499 100644
--- a/ext/bz2/tests/bz2_filter_decompress.phpt
+++ b/ext/bz2/tests/bz2_filter_decompress.phpt
@@ -3,7 +3,7 @@ bzip2.decompress (with convert.base64-decode)
--SKIPIF--
<?php if (!extension_loaded("bz2")) print "skip"; ?>
--FILE--
-<?php /* $Id$ */
+<?php
$text = 'QlpoNDFBWSZTWRN6QG0AAAoVgECFACA395UgIABIintI1N6mpowIQ0E1MTTAQGYTNcRyMZm5kgW3ib7hVboE7Tmqj3ToGZ5G3q1ZauD2G58hibSck8KS95EEAbx1Cn+LuSKcKEgJvSA2gA==';
$fp = fopen('php://stdout', 'w');
diff --git a/ext/bz2/tests/with_files.phpt b/ext/bz2/tests/with_files.phpt
index 3763398a14..74bb2bab8b 100644
--- a/ext/bz2/tests/with_files.phpt
+++ b/ext/bz2/tests/with_files.phpt
@@ -3,7 +3,7 @@ BZ2 with files
--SKIPIF--
<?php if (!extension_loaded("bz2")) print "skip"; ?>
--FILE--
-<?php // $Id$
+<?php
error_reporting(E_ALL);
diff --git a/ext/bz2/tests/with_strings.phpt b/ext/bz2/tests/with_strings.phpt
index adf07e16f9..f1e71bf3ed 100644
--- a/ext/bz2/tests/with_strings.phpt
+++ b/ext/bz2/tests/with_strings.phpt
@@ -3,7 +3,7 @@ BZ2 with strings
--SKIPIF--
<?php if (!extension_loaded("bz2")) print "skip"; ?>
--FILE--
-<?php // $Id$
+<?php
error_reporting(E_ALL);