summaryrefslogtreecommitdiff
path: root/sapi/apache2handler
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-01-22 21:39:32 +0100
committerPeter Kokot <peterkokot@gmail.com>2019-02-03 21:03:00 +0100
commit92ac598aabd336593a47ed3959f1031674b763e6 (patch)
treeeef6b7c4fca17f69cdc9a612b67af4665abf98ed /sapi/apache2handler
parent020ca5bf2b91f613f86df5e819a0419f8f3c8722 (diff)
downloadphp-git-92ac598aabd336593a47ed3959f1031674b763e6.tar.gz
Remove local variables
This patch removes the so called local variables defined per file basis for certain editors to properly show tab width, and similar settings. These are mainly used by Vim and Emacs editors yet with recent changes the once working definitions don't work anymore in Vim without custom plugins or additional configuration. Neither are these settings synced across the PHP code base. A simpler and better approach is EditorConfig and fixing code using some code style fixing tools in the future instead. This patch also removes the so called modelines for Vim. Modelines allow Vim editor specifically to set some editor configuration such as syntax highlighting, indentation style and tab width to be set in the first line or the last 5 lines per file basis. Since the php test files have syntax highlighting already set in most editors properly and EditorConfig takes care of the indentation settings, this patch removes these as well for the Vim 6.0 and newer versions. With the removal of local variables for certain editors such as Emacs and Vim, the footer is also probably not needed anymore when creating extensions using ext_skel.php script. Additionally, Vim modelines for setting php syntax and some editor settings has been removed from some *.phpt files. All these are mostly not relevant for phpt files neither work properly in the middle of the file.
Diffstat (limited to 'sapi/apache2handler')
-rw-r--r--sapi/apache2handler/apache_config.c9
-rw-r--r--sapi/apache2handler/config.m44
-rw-r--r--sapi/apache2handler/mod_php7.c9
-rw-r--r--sapi/apache2handler/php_functions.c9
-rw-r--r--sapi/apache2handler/sapi_apache2.c9
5 files changed, 0 insertions, 40 deletions
diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c
index a6831d2ca0..d0913c250e 100644
--- a/sapi/apache2handler/apache_config.c
+++ b/sapi/apache2handler/apache_config.c
@@ -233,12 +233,3 @@ void *create_php_config(apr_pool_t *p, char *dummy)
apr_pool_cleanup_register(p, newx, destroy_php_config, apr_pool_cleanup_null);
return (void *) newx;
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 44dee3fad5..1e6916f602 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -123,7 +123,3 @@ if test "$PHP_APXS2" != "no"; then
else
AC_MSG_RESULT(no)
fi
-
-dnl ## Local Variables:
-dnl ## tab-width: 4
-dnl ## End:
diff --git a/sapi/apache2handler/mod_php7.c b/sapi/apache2handler/mod_php7.c
index 1ad5934c34..6c44dbaa2c 100644
--- a/sapi/apache2handler/mod_php7.c
+++ b/sapi/apache2handler/mod_php7.c
@@ -32,12 +32,3 @@ AP_MODULE_DECLARE_DATA module php7_module = {
php_dir_cmds, /* command apr_table_t */
php_ap2_register_hook /* register hooks */
};
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 7ac9c4a2a2..84e49abf24 100644
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -562,12 +562,3 @@ zend_module_entry php_apache_module = {
NULL,
STANDARD_MODULE_PROPERTIES
};
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 3f62ef9c32..1aeccb17c9 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -753,12 +753,3 @@ void php_ap2_register_hook(apr_pool_t *p)
#endif
ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE);
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */