From: Peter Kokot Date: Tue, 26 Jun 2018 22:51:02 +0000 (+0200) Subject: Remove unused Git ident attributes from zip extension X-Git-Tag: php-7.3.0beta1~45 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0eabd5231b37105fd99b75cfb8c98735e5a3f83f;p=php Remove unused Git ident attributes from zip extension $Id attributes were used with SVN. With Git most of the Git ident attributes in source code files are not used anymore. --- diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index afca4efc9f..740e5a8b3d 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -1,6 +1,4 @@ -dnl -dnl $Id$ -dnl +dnl config.m4 for extension zip PHP_ARG_ENABLE(zip, for zip archive read/writesupport, [ --enable-zip Include Zip read/write support]) diff --git a/ext/zip/config.w32 b/ext/zip/config.w32 index 74da33467b..17fbbc9806 100644 --- a/ext/zip/config.w32 +++ b/ext/zip/config.w32 @@ -1,4 +1,3 @@ -// $Id$ // vim:ft=javascript ARG_ENABLE("zip", "ZIP support", "yes"); diff --git a/ext/zip/examples/im.php b/ext/zip/examples/im.php index 3721434054..e954576ad6 100644 --- a/ext/zip/examples/im.php +++ b/ext/zip/examples/im.php @@ -1,5 +1,5 @@ open('zip://' . dirname(__FILE__) . '/test.odt#meta.xml'); diff --git a/ext/zip/tests/bug11216.phpt b/ext/zip/tests/bug11216.phpt index 7601e6af85..e6f76af218 100644 --- a/ext/zip/tests/bug11216.phpt +++ b/ext/zip/tests/bug11216.phpt @@ -2,7 +2,6 @@ Bug #11216 (::addEmptyDir() crashes when the directory already exists) --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/bug14962.phpt b/ext/zip/tests/bug14962.phpt index 0006fd4b68..63a63b6eb9 100644 --- a/ext/zip/tests/bug14962.phpt +++ b/ext/zip/tests/bug14962.phpt @@ -2,7 +2,6 @@ Bug #14962 (::extractTo second argument is not really optional) --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/bug47667.phpt b/ext/zip/tests/bug47667.phpt index 9c17de6f9b..749a5ef6b8 100644 --- a/ext/zip/tests/bug47667.phpt +++ b/ext/zip/tests/bug47667.phpt @@ -2,7 +2,6 @@ Bug #47667 (ZipArchive::OVERWRITE seems to have no effect) --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/bug49072.phpt b/ext/zip/tests/bug49072.phpt index 04bd06e4ad..2ad727d905 100644 --- a/ext/zip/tests/bug49072.phpt +++ b/ext/zip/tests/bug49072.phpt @@ -2,7 +2,6 @@ Bug #49072 (feof never returns true for damaged file in zip) --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/bug64342_1-mb.phpt b/ext/zip/tests/bug64342_1-mb.phpt index 4ba564ee1e..a4525f0cc8 100644 --- a/ext/zip/tests/bug64342_1-mb.phpt +++ b/ext/zip/tests/bug64342_1-mb.phpt @@ -2,7 +2,6 @@ Bug #64342 ZipArchive::addFile() has to check file existence (variation 2) --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/bug64342_1.phpt b/ext/zip/tests/bug64342_1.phpt index 1463170e7e..d1d0f49931 100644 --- a/ext/zip/tests/bug64342_1.phpt +++ b/ext/zip/tests/bug64342_1.phpt @@ -2,7 +2,6 @@ Bug #64342 ZipArchive::addFile() has to check file existence (variation 2) --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/bug7214.phpt b/ext/zip/tests/bug7214.phpt index f791b7940d..02455fa421 100644 --- a/ext/zip/tests/bug7214.phpt +++ b/ext/zip/tests/bug7214.phpt @@ -2,7 +2,6 @@ Bug #7214 (zip_entry_read() binary safe) --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/bug72258.phpt b/ext/zip/tests/bug72258.phpt index 87ba618450..6ab5c5ee7e 100644 --- a/ext/zip/tests/bug72258.phpt +++ b/ext/zip/tests/bug72258.phpt @@ -2,7 +2,6 @@ Bug #72258 ZipArchive converts filenames to unrecoverable form --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/bug7658.phpt b/ext/zip/tests/bug7658.phpt index 6a873c2043..a09848a679 100644 --- a/ext/zip/tests/bug7658.phpt +++ b/ext/zip/tests/bug7658.phpt @@ -2,7 +2,6 @@ Bug #7658 (modify archive with general bit flag 3 set) --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/bug8009.phpt b/ext/zip/tests/bug8009.phpt index 5dd363d2da..a5c023288b 100644 --- a/ext/zip/tests/bug8009.phpt +++ b/ext/zip/tests/bug8009.phpt @@ -2,7 +2,6 @@ Bug #8009 (cannot add again same entry to an archive) --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/bug8700.phpt b/ext/zip/tests/bug8700.phpt index c394cf0bec..280097c926 100644 --- a/ext/zip/tests/bug8700.phpt +++ b/ext/zip/tests/bug8700.phpt @@ -2,7 +2,6 @@ Bug #8700 (getFromIndex(0) fails) --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_addemptydir.phpt b/ext/zip/tests/oo_addemptydir.phpt index 7e739008cc..271410b938 100644 --- a/ext/zip/tests/oo_addemptydir.phpt +++ b/ext/zip/tests/oo_addemptydir.phpt @@ -2,7 +2,6 @@ ziparchive::addEmptyDir --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_addfile.phpt b/ext/zip/tests/oo_addfile.phpt index 2c85255068..b41e3dbf2c 100644 --- a/ext/zip/tests/oo_addfile.phpt +++ b/ext/zip/tests/oo_addfile.phpt @@ -2,7 +2,6 @@ ziparchive::addFile() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_addglob.phpt b/ext/zip/tests/oo_addglob.phpt index d9fab95060..ea21f0161a 100644 --- a/ext/zip/tests/oo_addglob.phpt +++ b/ext/zip/tests/oo_addglob.phpt @@ -6,7 +6,6 @@ w/Kenzo over the shoulder #phptek Chicago 2014 --SKIPIF-- diff --git a/ext/zip/tests/oo_addpattern.phpt b/ext/zip/tests/oo_addpattern.phpt index ce31dd26d6..73806d5a56 100644 --- a/ext/zip/tests/oo_addpattern.phpt +++ b/ext/zip/tests/oo_addpattern.phpt @@ -6,7 +6,6 @@ w/Kenzo over the shoulder #phptek Chicago 2014 --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_close.phpt b/ext/zip/tests/oo_close.phpt index d2b743db9c..46ecfaf43a 100644 --- a/ext/zip/tests/oo_close.phpt +++ b/ext/zip/tests/oo_close.phpt @@ -2,7 +2,6 @@ zip::close() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_count.phpt b/ext/zip/tests/oo_count.phpt index 7d646ceacf..a553e17156 100644 --- a/ext/zip/tests/oo_count.phpt +++ b/ext/zip/tests/oo_count.phpt @@ -2,7 +2,6 @@ ziparchive::count() --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_delete.phpt b/ext/zip/tests/oo_delete.phpt index ccc75b4867..20e1f38fda 100644 --- a/ext/zip/tests/oo_delete.phpt +++ b/ext/zip/tests/oo_delete.phpt @@ -2,7 +2,6 @@ Delete entries --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_encryption.phpt b/ext/zip/tests/oo_encryption.phpt index b703611667..fb5caef495 100644 --- a/ext/zip/tests/oo_encryption.phpt +++ b/ext/zip/tests/oo_encryption.phpt @@ -2,7 +2,6 @@ ZipArchive::setEncryption*() functions --SKIPIF-- diff --git a/ext/zip/tests/oo_ext_zip.phpt b/ext/zip/tests/oo_ext_zip.phpt index bebce8cf16..d35094daeb 100644 --- a/ext/zip/tests/oo_ext_zip.phpt +++ b/ext/zip/tests/oo_ext_zip.phpt @@ -2,7 +2,6 @@ Extending Zip class and array property --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_externalattributes.phpt b/ext/zip/tests/oo_externalattributes.phpt index 8f53e99a61..7527a5582d 100644 --- a/ext/zip/tests/oo_externalattributes.phpt +++ b/ext/zip/tests/oo_externalattributes.phpt @@ -2,7 +2,6 @@ ZipArchive::*ExternalAttributes*() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_extract.phpt b/ext/zip/tests/oo_extract.phpt index 755d7ae906..ef3e3406f3 100644 --- a/ext/zip/tests/oo_extract.phpt +++ b/ext/zip/tests/oo_extract.phpt @@ -2,7 +2,6 @@ extractTo --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_getcomment.phpt b/ext/zip/tests/oo_getcomment.phpt index d05385c7df..c6b505828d 100644 --- a/ext/zip/tests/oo_getcomment.phpt +++ b/ext/zip/tests/oo_getcomment.phpt @@ -2,7 +2,6 @@ getComment --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_getnameindex.phpt b/ext/zip/tests/oo_getnameindex.phpt index 9f501204fa..aa96b4cfbe 100644 --- a/ext/zip/tests/oo_getnameindex.phpt +++ b/ext/zip/tests/oo_getnameindex.phpt @@ -2,7 +2,6 @@ getNameIndex --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_namelocate.phpt b/ext/zip/tests/oo_namelocate.phpt index ea800130a8..17f3cb9c28 100644 --- a/ext/zip/tests/oo_namelocate.phpt +++ b/ext/zip/tests/oo_namelocate.phpt @@ -2,7 +2,6 @@ Locate entries by name --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_open.phpt b/ext/zip/tests/oo_open.phpt index 0760db34c4..0b33cfb489 100644 --- a/ext/zip/tests/oo_open.phpt +++ b/ext/zip/tests/oo_open.phpt @@ -2,7 +2,6 @@ zip::open() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_properties.phpt b/ext/zip/tests/oo_properties.phpt index 886317b57b..4fa38dd100 100644 --- a/ext/zip/tests/oo_properties.phpt +++ b/ext/zip/tests/oo_properties.phpt @@ -2,7 +2,6 @@ ziparchive::properties isset()/empty() checks --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_rename.phpt b/ext/zip/tests/oo_rename.phpt index dbb80fa1e2..fe54fd812b 100644 --- a/ext/zip/tests/oo_rename.phpt +++ b/ext/zip/tests/oo_rename.phpt @@ -2,7 +2,6 @@ Rename entries --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_setcomment.phpt b/ext/zip/tests/oo_setcomment.phpt index f6469c9524..0135084253 100644 --- a/ext/zip/tests/oo_setcomment.phpt +++ b/ext/zip/tests/oo_setcomment.phpt @@ -2,7 +2,6 @@ setComment --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_setcompression.phpt b/ext/zip/tests/oo_setcompression.phpt index 8a746a83d7..4ea96acfa3 100644 --- a/ext/zip/tests/oo_setcompression.phpt +++ b/ext/zip/tests/oo_setcompression.phpt @@ -2,7 +2,6 @@ setCompressionName and setCompressionIndex methods --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/oo_stream.phpt b/ext/zip/tests/oo_stream.phpt index 126e78f6f7..83fe7e8466 100644 --- a/ext/zip/tests/oo_stream.phpt +++ b/ext/zip/tests/oo_stream.phpt @@ -2,7 +2,6 @@ getStream --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/utils.inc b/ext/zip/tests/utils.inc index 02e37f6d54..c7cd2a8b0b 100644 --- a/ext/zip/tests/utils.inc +++ b/ext/zip/tests/utils.inc @@ -1,5 +1,5 @@ numFiles; $i++) { $sb = $z->statIndex($i); diff --git a/ext/zip/tests/zip_close.phpt b/ext/zip/tests/zip_close.phpt index 7f9d09ae36..d95f6da3c2 100644 --- a/ext/zip/tests/zip_close.phpt +++ b/ext/zip/tests/zip_close.phpt @@ -2,7 +2,6 @@ zip_close() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/zip_entry_close.phpt b/ext/zip/tests/zip_entry_close.phpt index 20e2123401..aed4acc661 100644 --- a/ext/zip/tests/zip_entry_close.phpt +++ b/ext/zip/tests/zip_entry_close.phpt @@ -2,7 +2,6 @@ zip_entry_close() function: simple and double call --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/zip_entry_compressedsize.phpt b/ext/zip/tests/zip_entry_compressedsize.phpt index fefa6e5977..cc59a0e318 100644 --- a/ext/zip/tests/zip_entry_compressedsize.phpt +++ b/ext/zip/tests/zip_entry_compressedsize.phpt @@ -2,7 +2,6 @@ zip_entry_compressedsize() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/zip_entry_compressionmethod.phpt b/ext/zip/tests/zip_entry_compressionmethod.phpt index cabdbb797f..966bdf1b34 100644 --- a/ext/zip/tests/zip_entry_compressionmethod.phpt +++ b/ext/zip/tests/zip_entry_compressionmethod.phpt @@ -2,7 +2,6 @@ zip_entry_compressionmethod() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/zip_entry_filesize.phpt b/ext/zip/tests/zip_entry_filesize.phpt index b8d8820b64..db69bbf61a 100644 --- a/ext/zip/tests/zip_entry_filesize.phpt +++ b/ext/zip/tests/zip_entry_filesize.phpt @@ -2,7 +2,6 @@ zip_entry_filesize() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/zip_entry_name.phpt b/ext/zip/tests/zip_entry_name.phpt index 1916e25dac..91b6f5c82e 100644 --- a/ext/zip/tests/zip_entry_name.phpt +++ b/ext/zip/tests/zip_entry_name.phpt @@ -2,7 +2,6 @@ zip_entry_name() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/zip_entry_open.phpt b/ext/zip/tests/zip_entry_open.phpt index c32fe57407..9b7a388323 100644 --- a/ext/zip/tests/zip_entry_open.phpt +++ b/ext/zip/tests/zip_entry_open.phpt @@ -2,7 +2,6 @@ zip_entry_open() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/zip_entry_read.phpt b/ext/zip/tests/zip_entry_read.phpt index d876f03fb5..bb136ceef1 100644 --- a/ext/zip/tests/zip_entry_read.phpt +++ b/ext/zip/tests/zip_entry_read.phpt @@ -2,7 +2,6 @@ zip_entry_read() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/zip_open.phpt b/ext/zip/tests/zip_open.phpt index 91474bc6fd..6b176532ce 100644 --- a/ext/zip/tests/zip_open.phpt +++ b/ext/zip/tests/zip_open.phpt @@ -2,7 +2,6 @@ zip_open() function --SKIPIF-- --FILE-- diff --git a/ext/zip/tests/zip_read.phpt b/ext/zip/tests/zip_read.phpt index 5cadb2d1ef..743ab05626 100644 --- a/ext/zip/tests/zip_read.phpt +++ b/ext/zip/tests/zip_read.phpt @@ -2,7 +2,6 @@ zip_read() function --SKIPIF-- --FILE--