Clean-up some more headers (#14416)

Girgias · web-flow · commit fd2d86964250 · 2024-06-08T17:15:36.000+01:00
Remove unused headers (such as php_ini.h for extensions that don't define INI settings)
Use more specific headers when possible
diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c
@@ -19,10 +19,8 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
 #include "php_ctype.h"
 #include "ctype_arginfo.h"
-#include "SAPI.h"
 #include "ext/standard/info.h"
 
 #include <ctype.h>
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -15,13 +15,10 @@
  */
 
 #include "php.h"
-#include "php_streams.h"
 #include "php_main.h"
-#include "php_globals.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_versioning.h"
-#include "ext/standard/php_math.h"
 #include "php_date.h"
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
@@ -43,7 +43,7 @@
 #include "exif_arginfo.h"
 #include <math.h>
 #include "php_ini.h"
-#include "ext/standard/php_string.h"
+#include "ext/standard/php_string.h" /* for php_basename() */
 #include "ext/standard/php_image.h"
 #include "ext/standard/info.h"
 
diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h
@@ -18,10 +18,8 @@
 #ifndef PHP_FILTER_H
 #define PHP_FILTER_H
 
-#include "SAPI.h"
 #include "zend_API.h"
 #include "php.h"
-#include "php_ini.h"
 
 extern zend_module_entry filter_module_entry;
 #define phpext_filter_ptr &filter_module_entry
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
@@ -19,7 +19,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
 #include "php_gmp.h"
 #include "php_gmp_int.h"
 #include "ext/standard/info.h"
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
@@ -21,7 +21,6 @@
 #endif
 
 #include "php.h"
-#include "php_globals.h"
 #include "ext/standard/info.h"
 #include "main/php_output.h"
 #include "SAPI.h"
diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c
@@ -24,11 +24,9 @@
 
 #include <unicode/uidna.h>
 #include <unicode/ustring.h>
-#include "ext/standard/php_string.h"
 
 #include "idn.h"
 #include "intl_error.h"
-#include "intl_convert.h"
 /* }}} */
 
 enum {
diff --git a/ext/json/json.c b/ext/json/json.c
@@ -20,9 +20,7 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
 #include "ext/standard/info.h"
-#include "ext/standard/html.h"
 #include "zend_smart_str.h"
 #include "php_json.h"
 #include "php_json_encoder.h"
diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c
@@ -20,12 +20,11 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "ext/standard/html.h"
 #include "zend_smart_str.h"
 #include "php_json.h"
 #include "php_json_encoder.h"
+#include "zend_portability.h"
 #include <zend_exceptions.h>
 #include "zend_enum.h"
 
diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c
@@ -17,14 +17,12 @@
 
 /* {{{ includes */
 #include "php.h"
-#include "php_ini.h"
 #include "php_variables.h"
 #include "libmbfl/mbfl/mbfilter_pass.h"
 #include "mbstring.h"
 #include "ext/standard/url.h"
 
 #include "php_globals.h"
-#include "SAPI.h"
 #include "TSRM.h"
 
 #include "mb_gpc.h"
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
@@ -23,9 +23,6 @@
 #include <signal.h>
 
 #include "php.h"
-#include "php_ini.h"
-#include "php_globals.h"
-#include "ext/standard/info.h"
 #include "zend_smart_str.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c
@@ -21,8 +21,6 @@
 #include <signal.h>
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "php_mysqli_structs.h"
 #include "zend_exceptions.h"
 
diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c
@@ -21,8 +21,6 @@
 #include <signal.h>
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
 #include "zend_exceptions.h"
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
@@ -23,8 +23,6 @@
 #include <signal.h>
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "zend_smart_str.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
@@ -22,8 +22,6 @@
 #include <signal.h>
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
 
diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c
@@ -19,8 +19,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "php_mysqli_structs.h"
 
 extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, ...);
diff --git a/ext/mysqli/mysqli_result_iterator.c b/ext/mysqli/mysqli_result_iterator.c
@@ -23,7 +23,6 @@
 #include <signal.h>
 
 #include "php.h"
-#include "php_ini.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
 #include "zend_interfaces.h"
diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c
@@ -21,8 +21,6 @@
 #include <signal.h>
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
 
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -27,7 +27,6 @@
 #include "zend_attributes.h"
 
 #include "ext/standard/info.h"
-#include "ext/standard/php_standard.h"
 #include "Zend/zend_interfaces.h"
 #include "zend_smart_str.h"
 
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -34,7 +34,7 @@
 #include "ext/standard/file.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_fopen_wrappers.h"
-#include "ext/standard/md5.h"
+#include "ext/standard/md5.h" /* For make_digest_ex() */
 #include "ext/standard/base64.h"
 #ifdef PHP_WIN32
 # include "win32/winutil.h"
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
@@ -28,7 +28,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
 #include "ext/standard/info.h"
 #include "php_pcntl.h"
 #include "php_signal.h"
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -30,7 +30,7 @@
 
 #include "php.h"
 #include "php_ini.h"
-#include "ext/standard/php_standard.h"
+#include "ext/standard/info.h"
 #include "zend_smart_str.h"
 #include "ext/pcre/php_pcre.h"
 #ifdef PHP_WIN32
diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c
@@ -25,20 +25,13 @@
 #define rl_completion_matches completion_matches
 #endif
 
-#include "php_globals.h"
-#include "php_variables.h"
 #include "zend_hash.h"
-#include "zend_modules.h"
 
 #include "SAPI.h"
 #include <locale.h>
 #include "zend.h"
-#include "zend_extensions.h"
 #include "php_ini.h"
-#include "php_globals.h"
-#include "php_main.h"
-#include "fopen_wrappers.h"
-#include "ext/standard/php_standard.h"
+#include "ext/standard/info.h"
 #include "zend_smart_str.h"
 
 #ifdef __riscos__
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -32,7 +32,6 @@
 #include <fcntl.h>
 
 #include "php_ini.h"
-#include "SAPI.h"
 #include "rfc1867.h"
 #include "php_variables.h"
 #include "php_session.h"
diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
@@ -22,7 +22,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
 #include "php_shmop.h"
 #include "shmop_arginfo.h"
 
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
@@ -23,9 +23,8 @@
 #include "php.h"
 #if defined(HAVE_LIBXML) && defined(HAVE_SIMPLEXML)
 
-#include "php_ini.h"
 #include "ext/standard/info.h"
-#include "ext/standard/php_string.h"
+#include "ext/standard/php_string.h" /* For php_trim() */
 #include "php_simplexml.h"
 #include "php_simplexml_exports.h"
 #include "simplexml_arginfo.h"
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
@@ -17,10 +17,7 @@
 */
 
 #include "php_soap.h"
-#include "ext/standard/base64.h"
-#include "ext/standard/md5.h"
-#include "ext/random/php_random_csprng.h"
-#include "ext/hash/php_hash.h"
+#include "ext/hash/php_hash.h" /* For php_hash_bin2hex() */
 
 static char *get_http_header_value_nodup(char *headers, char *type, size_t *len);
 static char *get_http_header_value(char *headers, char *type);
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
@@ -20,7 +20,6 @@
 #include "ext/libxml/php_libxml.h"
 #include "libxml/uri.h"
 
-#include "ext/standard/md5.h"
 #include "zend_virtual_cwd.h"
 #include "main/php_open_temporary_file.h"
 
diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h
@@ -20,8 +20,6 @@
 #define PHP_SOAP_H
 
 #include "php.h"
-#include "php_globals.h"
-#include "ext/standard/info.h"
 #include "ext/standard/php_standard.h"
 #if defined(HAVE_PHP_SESSION) && !defined(COMPILE_DL_SESSION)
 #include "ext/session/php_session.h"
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
@@ -19,7 +19,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
 #include "ext/standard/info.h"
 #include "php_libsodium.h"
 #include "zend_attributes.h"
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
@@ -19,7 +19,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
 #include "php_main.h"
 #include "ext/standard/info.h"
 #include "php_spl.h"
diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h
@@ -18,7 +18,6 @@
 #define PHP_SPL_H
 
 #include "php.h"
-#include <stdarg.h>
 
 #define PHP_SPL_VERSION PHP_VERSION
 
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
@@ -19,8 +19,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "ext/standard/php_var.h"
 #include "zend_smart_str.h"
 #include "zend_interfaces.h"
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
@@ -19,7 +19,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
 #include "ext/standard/file.h"
 #include "ext/standard/php_filestat.h"
 #include "ext/standard/flock_compat.h"
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
@@ -23,7 +23,6 @@
 #include "zend_hash.h"
 
 #include "php_spl.h"
-#include "ext/standard/info.h"
 #include "ext/standard/php_var.h"
 #include "zend_smart_str.h"
 #include "spl_functions.h"
diff --git a/ext/spl/spl_exceptions.c b/ext/spl/spl_exceptions.c
@@ -19,15 +19,11 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 #include "spl_exceptions_arginfo.h"
 
 #include "php_spl.h"
-#include "spl_functions.h"
-#include "spl_engine.h"
 #include "spl_exceptions.h"
 
 PHPAPI zend_class_entry *spl_ce_LogicException;
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
@@ -20,8 +20,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "zend_exceptions.h"
 
 #include "php_spl.h"
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
@@ -19,8 +19,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "zend_exceptions.h"
 #include "zend_interfaces.h"
 #include "ext/pcre/php_pcre.h"
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
@@ -20,8 +20,6 @@
 #endif
 
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 #include "ext/standard/php_array.h"
 #include "ext/standard/php_var.h"
 #include "zend_smart_str.h"
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c
diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c
diff --git a/ext/tokenizer/tokenizer_data_gen.php b/ext/tokenizer/tokenizer_data_gen.php
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
