diff --git a/.gitignore b/.gitignore
index a23f574fef2..b77c69880d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,177 +1,228 @@
-# General ignores
+# These files are generated during building or development and are intentionally
+# untracked to ignore by Git. For other development environment specific files,
+# such as editor configuration, a good practice is to exclude them using the
+# .git/info/exclude in the cloned repository or a global .gitignore file.
+
+# ------------------------------------------------------------------------------
+# Common files ignored across the repository
+# ------------------------------------------------------------------------------
+
+# Backup copies created by various editors or development tools
 *~
-.#*
-*.
-*.mk
-*.mem
-*.gcda
-*.gcno
-*.la
-*.lo
-*.loT
-*.o
-*.a
-*.ncb
-*.opt
-*.plg
-*swp
+
+# Patches downloaded to patch files or to apply open source contributions
 *.patch
-*.tgz
-*.tar.gz
-*.tar.bz2
-*.tar.xz
-*.tar.gz.asc
-*.tar.bz2.asc
-*.tar.xz.asc
-.FBCIndex
-.FBCLockFolder
-.libs
-phpt.*
-core
-dynlib.m4
+
+# Swap files created by editors and tools to indicate a locked file
+*.swp
+
+# ------------------------------------------------------------------------------
+# Generated by the PHP build system
+# ------------------------------------------------------------------------------
+
+# Archive library containing .o files, generated during build process
+*.a
+
+# Libtool library files generated during build process
+*.la
+
+# Directories created by Libtool for storing generated library files
+.libs/
+
+# Library object files generated during build process
+*.lo
+
+# Temporary library object files generated by compiler and libtool due to failure
+*.loT
+
+# Standard object files generated during build process
+*.o
+
+# Generated by `./buildconf` or `phpize`
+aclocal.m4
+
+# Cache directories generated by Autoconf tools - autoconf, autoreconf...
+autom4te.cache/
+
+# Stamp file generated by `./buildconf` to run `./build/buildcheck.sh`
+/buildmk.stamp
+
+# Cache file(s) generated by Autoconf's configure when run as `configure -C`
+config.cache
+
+# A log file(s) generated by Autoconf during *nix build system
+config.log
+
+# Helper(s) generated by *nix build system to save the last configure command
+config.nice
+
+# Generated by Autoconf's configure script for instantiating templates
+config.status
+
+# Main *nix build system configuration script(s) generated by Autoconf
+configure
+
+# Generated by `./configure` when test programs create temporary files
+confdefs.h
+conftest*
+
+# Generated by `./buildconf` script as a helper for further build/build2.mk file
+/generated_lists
+
+# Generated by configure scripts on all systems
+/main/internal_functions.c
+/main/internal_functions_cli.c
+
+# The Libtool script(s) generated by the *nix build system
+libtool
+
+# Makefile(s) generated from Makefile fragment templates by `./configure`
 Makefile
 Makefile.fragments
 Makefile.objects
-_libs
-acconfig.h
-aclocal.m4
-autom4te.cache
-buildmk.stamp
-confdefs.h
-config.h
-config.cache
-config.h.in
-config.log
-config.nice
-config.status
-configure
-conftest
-conftest.c
-debug.log
-diff
-generated_lists
-include
+
+# Generated by `./buildconf` or `cd ext/name && phpize`
 install-sh
-internal_functions.c
-lcov_data
-lcov_html
-libs
-libtool
-meta_cc
-meta_ccld
 missing
 mkinstalldirs
-modules
+
+# RPM specification file generated by `./configure`
+/php7.spec
+
+# Directories for shared object files and headers generated by `./configure`
+include/
+libs/
+modules/
+
+# ------------------------------------------------------------------------------
+# Configuration headers generated by the PHP build system
+# ------------------------------------------------------------------------------
+config.h
+config.h.in
+/ext/date/lib/timelib_config.h
+/ext/iconv/php_have_bsd_iconv.h
+/ext/iconv/php_have_glibc_iconv.h
+/ext/iconv/php_have_ibm_iconv.h
+/ext/iconv/php_have_iconv.h
+/ext/iconv/php_have_libiconv.h
+/ext/iconv/php_iconv_aliased_libiconv.h
+/ext/iconv/php_iconv_broken_ignore.h
+/ext/iconv/php_iconv_supports_errno.h
+/ext/iconv/php_php_iconv_h_path.h
+/ext/iconv/php_php_iconv_impl.h
+/ext/mbstring/oniguruma/oniguruma.h
+/main/build-defs.h
+/main/php_config.h.in
+/main/php_config.h
+/TSRM/tsrm_config.h
+/Zend/zend_config.h
+
+# ------------------------------------------------------------------------------
+# Manual (man 1 and 8) pages generated from templates for *nix alike systems
+# ------------------------------------------------------------------------------
+/ext/phar/phar.1
+/ext/phar/phar.phar.1
+/sapi/cgi/php-cgi.1
+/sapi/cli/php.1
+/sapi/fpm/php-fpm.1
+/sapi/fpm/php-fpm.8
+/sapi/phpdbg/phpdbg.1
+/scripts/man1/*.1
+
+# ------------------------------------------------------------------------------
+# SAPIs specific ignores
+# ------------------------------------------------------------------------------
+/sapi/apache2handler/libphp7.module
+/sapi/fpm/fpm/php-cgi
+/sapi/fpm/init.d.php-fpm
+/sapi/fpm/php-fpm.conf
+/sapi/fpm/php-fpm.service
+/sapi/fpm/status.html
+/sapi/fpm/www.conf
+
+# ------------------------------------------------------------------------------
+# Executable binaries and scripts generated during the build process
+# ------------------------------------------------------------------------------
+/ext/phar/phar.phar
+/ext/phar/phar.php
+/pear/install-pear-nozlib.phar
+/sapi/cgi/php-cgi
+/sapi/fpm/php-fpm
+/sapi/phpdbg/phpdbg
+/scripts/php-config
+/scripts/phpize
 php
-php7.spec
-php_lcov.info
-php_test_results_*.txt
-php_version.h
-results.txt
-shlibtool
-test.php3
-tmp-php.ini
-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/streams/build-defs.h
-pear/install-pear-nozlib.phar
-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/phpdbg.1
-sapi/phpdbg/build
-sapi/phpdbg/*.output
-scripts/php-config
-scripts/phpize
-scripts/man1/*.1
-TSRM/tsrm_config.h
-win32/build/deplister.exe
-win32/build/deplister.obj
-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
-Zend/zend_ini_parser.c
-Zend/zend_ini_parser.h
-Zend/zend_ini_parser.output
-Zend/zend_language_parser.c
-Zend/zend_language_parser.h
-Zend/zend_language_parser.output
 
-# Extension specific ignores
-ext/*/configure.ac
-ext/*/ltmain.sh
-ext/*/libs.mk
-ext/*/build
-ext/*/scan_makefile_in.awk
-ext/*/Makefile.global
-ext/*/acinclude.m4
-ext/*/config.guess
-ext/*/config.sub
-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
-ext/iconv/php_php_iconv_h_path.h
-ext/iconv/php_have_glibc_iconv.h
-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/oniguruma/oniguruma.h
-ext/oci8/tests/*.vglog
-ext/pdo/conftest*
-ext/pdo_firebird/conftest*
-ext/pdo_mysql/conftest*
-ext/pdo_oci/conftest*
-ext/pdo_odbc/tests/*.mdb
-ext/pdo_pgsql/conftest*
-ext/pdo_sqlite/conftest*
-ext/pdo_sqlite/sqlite3.h
-ext/phar/phar.phar
-ext/phar/phar.1
-ext/phar/phar.phar.1
-ext/phar/phar.php
-ext/sqlite3/tests/phpsql*
+# ------------------------------------------------------------------------------
+# PHP parser files generated by bison during the build process
+# ------------------------------------------------------------------------------
+/sapi/phpdbg/phpdbg_parser.c
+/sapi/phpdbg/phpdbg_parser.h
+/sapi/phpdbg/phpdbg_parser.output
+/Zend/zend_ini_parser.c
+/Zend/zend_ini_parser.h
+/Zend/zend_ini_parser.output
+/Zend/zend_language_parser.c
+/Zend/zend_language_parser.h
+/Zend/zend_language_parser.output
+
+# ------------------------------------------------------------------------------
+# Extensions files additionally generated by `cd ext/name && phpize && ./configure`
+# ------------------------------------------------------------------------------
+/ext/*/acinclude.m4
+/ext/*/build/
+/ext/*/config.guess
+/ext/*/config.sub
+/ext/*/configure.ac
+/ext/*/ltmain.sh
+/ext/*/Makefile.global
+/ext/*/run-tests.php
+
+# ------------------------------------------------------------------------------
+# Generated by Windows build system
+# ------------------------------------------------------------------------------
 
-# ------------------------------------------------------------------------------ Windows
 # Generated by `/buildconf.bat`
 /configure.bat
 /configure.js
 
 # Generated by `/configure.(bat|js)` (architecture dependend)
 /config.nice.bat
+
+# NTS debug build x86
 /Debug/
+
+# ZTS debug build x86
 /Debug_TS/
+
+# NTS build x86
 /Release/
+
+# ZTS build x86
 /Release_TS/
+
+# Generated by x64 compiler, includes Debug, Debug_TS, Release, Release_TS
 /x64/
 
-# ------------------------------------------------------------------------------ Tests
-# Generated by `/run-tests.php` upon failure
+# Miscellaneous files generated by Windows build sytem
+/main/config.w32.h
+/win32/build/deplister.exe
+/win32/build/deplister.obj
+/win32/*.aps
+/win32/*.positions
+/win32/*.suo
+/win32/ext
+/win32/phpts.def
+/win32/wsyslog.h
+
+# Standard object files generated by Visual Studio
+*.obj
+
+# ------------------------------------------------------------------------------
+# Tests
+# ------------------------------------------------------------------------------
+
+# Generated by `./run-tests.php` upon failure
 **/tests/**/*.diff
 **/tests/**/*.out*
 **/tests/**/*.php
@@ -179,13 +230,59 @@ ext/sqlite3/tests/phpsql*
 **/tests/**/*.log
 **/tests/**/*.sh
 
-# Used by some test cases.
+# Generated by some test cases
 **/tests/**/*.db
-**/tests/**/*.txt
 **/tests/**/*.tmp
 
-# Special cases to invert previous ignore rules
-!ext/fileinfo/libmagic.patch
-!ext/fileinfo/magicdata.patch
-!ext/mbstring/oniguruma.patch
-!ext/pcre/pcre2lib/config.h
+# Microsoft Access database created for passing to tests
+/ext/pdo_odbc/tests/*.mdb
+
+# Files generated by `./run-tests.php -m` when checking for memory leaks
+**/tests/**/*.mem
+
+# Test results generated by `./run-tests.php`
+php_test_results_*.txt
+
+# Temporary POST data placeholder files generated by `./run-tests.php`
+phpt.*
+
+# Temporary PHP INI configuration file(s) for tests, generated by `make test`
+tmp-php.ini
+
+# ------------------------------------------------------------------------------
+# Generated by GCC's gcov and LCOV via Makefile.gcov and gcov.php.net
+# ------------------------------------------------------------------------------
+*.gcda
+*.gcno
+/lcov_data/
+/lcov_html/
+/php_lcov.info
+
+# ------------------------------------------------------------------------------
+# Archives generated during the PHP release process
+# ------------------------------------------------------------------------------
+/*.tar.gz
+/*.tar.bz2
+/*.tar.xz
+/*.tar.gz.asc
+/*.tar.bz2.asc
+/*.tar.xz.asc
+
+# ------------------------------------------------------------------------------
+# Generated by `./configure --enable-dtrace` for using DTrace framework
+# ------------------------------------------------------------------------------
+/ext/oci8/oci8_dtrace_gen.h
+/ext/oci8/oci8_dtrace_gen.h.bak
+/Zend/zend_dtrace_gen.h
+/Zend/zend_dtrace_gen.h.bak
+
+# ------------------------------------------------------------------------------
+# Special cases to invert previous ignore patterns
+# ------------------------------------------------------------------------------
+!/ext/bcmath/libbcmath/src/config.h
+!/ext/fileinfo/libmagic/config.h
+!/ext/fileinfo/libmagic.patch
+!/ext/fileinfo/magicdata.patch
+!/ext/mbstring/oniguruma.patch
+!/ext/pcre/pcre2lib/config.h
+!/win32/build/Makefile