diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-01-22 21:39:32 +0100 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-02-03 21:03:00 +0100 |
commit | 92ac598aabd336593a47ed3959f1031674b763e6 (patch) | |
tree | eef6b7c4fca17f69cdc9a612b67af4665abf98ed /sapi/cli | |
parent | 020ca5bf2b91f613f86df5e819a0419f8f3c8722 (diff) | |
download | php-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/cli')
-rw-r--r-- | sapi/cli/cli.h | 9 | ||||
-rwxr-xr-x | sapi/cli/generate_mime_type_map.php | 9 | ||||
-rw-r--r-- | sapi/cli/mime_type_map.h | 9 | ||||
-rw-r--r-- | sapi/cli/php_cli.c | 9 | ||||
-rw-r--r-- | sapi/cli/php_cli_process_title.c | 9 | ||||
-rw-r--r-- | sapi/cli/php_cli_process_title.h | 9 | ||||
-rw-r--r-- | sapi/cli/php_cli_server.c | 9 | ||||
-rw-r--r-- | sapi/cli/php_cli_server.h | 9 |
8 files changed, 0 insertions, 72 deletions
diff --git a/sapi/cli/cli.h b/sapi/cli/cli.h index 2126a77582..b4c2851791 100644 --- a/sapi/cli/cli.h +++ b/sapi/cli/cli.h @@ -39,12 +39,3 @@ typedef struct { extern PHP_CLI_API cli_shell_callbacks_t *php_cli_get_shell_callbacks(); #endif /* CLI_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/sapi/cli/generate_mime_type_map.php b/sapi/cli/generate_mime_type_map.php index a0318c364b..b0176bb524 100755 --- a/sapi/cli/generate_mime_type_map.php +++ b/sapi/cli/generate_mime_type_map.php @@ -78,12 +78,3 @@ static const php_cli_server_ext_mime_type_pair mime_type_map[] = { }; #endif /* PHP_CLI_SERVER_MIME_TYPE_MAP_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/sapi/cli/mime_type_map.h b/sapi/cli/mime_type_map.h index 356c148ca8..0c559d635f 100644 --- a/sapi/cli/mime_type_map.h +++ b/sapi/cli/mime_type_map.h @@ -1017,12 +1017,3 @@ static const php_cli_server_ext_mime_type_pair mime_type_map[] = { }; #endif /* PHP_CLI_SERVER_MIME_TYPE_MAP_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 5b4023ea70..608f1b0e25 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1422,12 +1422,3 @@ out: exit(exit_status); } /* }}} */ - -/* - * 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/cli/php_cli_process_title.c b/sapi/cli/php_cli_process_title.c index e7f3598cb9..1b82104ca6 100644 --- a/sapi/cli/php_cli_process_title.c +++ b/sapi/cli/php_cli_process_title.c @@ -67,12 +67,3 @@ PHP_FUNCTION(cli_get_process_title) RETURN_STRINGL(title, length); } /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/sapi/cli/php_cli_process_title.h b/sapi/cli/php_cli_process_title.h index 4660157467..c2fed7b817 100644 --- a/sapi/cli/php_cli_process_title.h +++ b/sapi/cli/php_cli_process_title.h @@ -30,12 +30,3 @@ PHP_FUNCTION(cli_set_process_title); PHP_FUNCTION(cli_get_process_title); #endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 54f4f0101a..e09aca4ed8 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2609,12 +2609,3 @@ int do_cli_server(int argc, char **argv) /* {{{ */ php_cli_server_dtor(&server); return 0; } /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/sapi/cli/php_cli_server.h b/sapi/cli/php_cli_server.h index 350053a5fd..4d57f1b922 100644 --- a/sapi/cli/php_cli_server.h +++ b/sapi/cli/php_cli_server.h @@ -37,12 +37,3 @@ ZEND_TSRMLS_CACHE_EXTERN() #endif #endif /* PHP_CLI_SERVER_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ |