Clean and sync .gitignore

diff --git a/.gitignore b/.gitignore
index 1499729868a1d51f1513b8820437ae09d3ea5254..7fc6848de100831ec7b3e5dc9cf1532f479d260d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# General Ignores
+# General ignores
 *~
 .#*
 *.
@@ -74,7 +74,6 @@ missing
 mkinstalldirs
 modules
 php
-php-*.tar.gz
 php7.spec
 php_lcov.info
 php_test_results_*.txt
@@ -84,10 +83,49 @@ shlibtool
 stamp-h
 test.php3
 tmp-php.ini
-want_dependencies
 stamp-h.in
 scan_makefile_in.awk
+main/php_config.h
+main/php_config.h.in
+main/build-defs.h
+main/internal_functions_cli.c
+main/config.w32.h
+main/stamp-h1
+main/streams/build-defs.h
+main/streams/stamp-h1
+pear/install-pear-nozlib.phar
+pear/phpize
+pear/run-tests
+pear/php-config
+pear/scripts
+sapi/apache2handler/libphp7.module
+sapi/cgi/php-cgi
+sapi/cgi/php-cgi.1
+sapi/cli/php.1
+sapi/fpm/php-fpm
+sapi/fpm/php-fpm.1
+sapi/fpm/init.d.php-fpm
+sapi/fpm/php-fpm.conf
+sapi/fpm/fpm/php-cgi
+sapi/fpm/php-fpm.8
+sapi/fpm/php-fpm.service
+sapi/fpm/status.html
+sapi/fpm/www.conf
+sapi/phpdbg/phpdbg_parser.c
+sapi/phpdbg/phpdbg_parser.h
+sapi/phpdbg/phpdbg
+sapi/phpdbg/build
+sapi/phpdbg/*.output
+scripts/php-config
+scripts/phpize
+scripts/man1/*.1
 TSRM/tsrm_config.h
+win32/*.suo
+win32/*.aps
+win32/*.positions
+win32/ext
+win32/phpts.def
+win32/wsyslog.h
 Zend/zend_config.h
 Zend/zend_dtrace_gen.h
 Zend/zend_dtrace_gen.hbak
@@ -97,13 +135,8 @@ Zend/zend_ini_parser.output
 Zend/zend_language_parser.c
 Zend/zend_language_parser.h
 Zend/zend_language_parser.output
-ext/date/lib/timelib_config.h
-ext/iconv/php_iconv_aliased_libiconv.h
-ext/phar/phar.php
-main/php_config.h
-main/php_config.h.in
 
-# Extension specifc ignores
+# Extension specific ignores
 ext/*/configure.in
 ext/*/configure.ac
 ext/*/ltmain.sh
@@ -113,9 +146,7 @@ ext/*/scan_makefile_in.awk
 ext/*/Makefile.global
 ext/*/acinclude.m4
 ext/*/config.sub
-
-# Extension specific
-ext/iconv/scan_makefile_in.awk
+ext/date/lib/timelib_config.h
 ext/iconv/php_have_bsd_iconv.h
 ext/iconv/php_have_ibm_iconv.h
 ext/iconv/php_have_libiconv.h
@@ -125,6 +156,7 @@ ext/iconv/php_php_iconv_impl.h
 ext/iconv/php_have_iconv.h
 ext/iconv/php_iconv_supports_errno.h
 ext/iconv/php_iconv_broken_ignore.h
+ext/iconv/php_iconv_aliased_libiconv.h
 ext/mbstring/libmbfl/Makefile.in
 ext/mbstring/libmbfl/autoscan.log
 ext/mbstring/libmbfl/config.sub
@@ -142,14 +174,6 @@ ext/mbstring/libmbfl/mbfl/Makefile.in
 ext/mbstring/libmbfl/mbfl/EastAsianWidth.txt
 ext/mbstring/libmbfl/nls/Makefile.in
 ext/mbstring/oniguruma/oniguruma.h
-ext/mssql/#*#
-ext/mssql/Makefile.global
-ext/mssql/acinclude.m4
-ext/mssql/config.sub
-ext/mssql/configure.in
-ext/mssql/configure.ac
-ext/mssql/ltmain.sh
-ext/mysql/weztest.sqlite
 ext/oci8/tests/*.vglog
 ext/pdo/conftest*
 ext/pdo_firebird/conftest*
@@ -162,51 +186,13 @@ ext/pdo_sqlite/sqlite3.h
 ext/phar/phar.phar
 ext/phar/phar.1
 ext/phar/phar.phar.1
+ext/phar/phar.php
 ext/reflection/xml
 ext/reflection/html
 ext/reflection/spl.chm
-ext/simplexml/examples/security.new.xml
 ext/spl/examples/.htaccess
 ext/spl/examples/*.phps
 ext/sqlite3/tests/phpsql*
-main/build-defs.h
-main/internal_functions_cli.c
-main/config.w32.h
-main/stamp-h1
-main/streams/build-defs.h
-main/streams/stamp-h1
-#pear/install-pear-nozlib.phar
-pear/phpize
-pear/run-tests
-pear/php-config
-pear/scripts
-sapi/apache2handler/libphp7.module
-sapi/cgi/php-cgi
-sapi/cgi/php-cgi.1
-sapi/cli/php.1
-sapi/fpm/php-fpm
-sapi/fpm/php-fpm.1
-sapi/fpm/init.d.php-fpm
-sapi/fpm/php-fpm.conf
-sapi/fpm/fpm/php-cgi
-sapi/fpm/php-fpm.8
-sapi/fpm/php-fpm.service
-sapi/fpm/status.html
-sapi/fpm/www.conf
-sapi/phpdbg/phpdbg_parser.c
-sapi/phpdbg/phpdbg_parser.h
-sapi/phpdbg/phpdbg
-sapi/phpdbg/build
-sapi/phpdbg/*.output
-scripts/php-config
-scripts/phpize
-scripts/man1/*.1
-win32/*.suo
-win32/*.aps
-win32/*.positions
-win32/ext
-win32/phpts.def
-win32/wsyslog.h
 
 # ------------------------------------------------------------------------------ Windows
 # Generated by `/buildconf.bat`
@@ -222,7 +208,7 @@ win32/wsyslog.h
 /x64/
 
 # ------------------------------------------------------------------------------ Tests
-# Generated by `/run-tests.php` upon failure.
+# Generated by `/run-tests.php` upon failure
 **/tests/**/*.diff
 **/tests/**/*.out*
 **/tests/**/*.php
@@ -235,6 +221,7 @@ win32/wsyslog.h
 **/tests/**/*.txt
 **/tests/**/*.tmp
 
-# special cases to invert previous ignore rules
+# Special cases to invert previous ignore rules
 !ext/fileinfo/libmagic.patch
 !ext/mbstring/oniguruma.patch
+!scripts/dev/generate-phpt/tests/*.php