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 /ext/pdo_sqlite | |
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 'ext/pdo_sqlite')
-rw-r--r-- | ext/pdo_sqlite/config.m4 | 1 | ||||
-rw-r--r-- | ext/pdo_sqlite/pdo_sqlite.c | 9 | ||||
-rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 9 | ||||
-rw-r--r-- | ext/pdo_sqlite/sqlite_statement.c | 9 | ||||
-rw-r--r-- | ext/pdo_sqlite/tests/bug33841.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_sqlite/tests/bug35336.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_sqlite/tests/bug46542.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_sqlite/tests/bug52487.phpt | 2 | ||||
-rw-r--r-- | ext/pdo_sqlite/tests/common.phpt | 2 |
9 files changed, 5 insertions, 33 deletions
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index 201f9f24bf..202cfeb4ae 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -1,5 +1,4 @@ dnl config.m4 for extension pdo_sqlite -dnl vim:et:sw=2:ts=2: PHP_ARG_WITH(pdo-sqlite, for sqlite 3 support for PDO, [ --without-pdo-sqlite[=DIR] diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c index d4f2c0791c..82e2d79b06 100644 --- a/ext/pdo_sqlite/pdo_sqlite.c +++ b/ext/pdo_sqlite/pdo_sqlite.c @@ -99,12 +99,3 @@ PHP_MINFO_FUNCTION(pdo_sqlite) php_info_print_table_end(); } /* }}} */ - -/* - * 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/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index 1e32296981..02342e9fe4 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -843,12 +843,3 @@ const pdo_driver_t pdo_sqlite_driver = { PDO_DRIVER_HEADER(sqlite), pdo_sqlite_handle_factory }; - -/* - * 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/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 37f380bdfa..186bf182b1 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -385,12 +385,3 @@ const struct pdo_stmt_methods sqlite_stmt_methods = { NULL, /* next_rowset */ pdo_sqlite_stmt_cursor_closer }; - -/* - * 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/ext/pdo_sqlite/tests/bug33841.phpt b/ext/pdo_sqlite/tests/bug33841.phpt index 97a28ec5d3..b053b6ee3a 100644 --- a/ext/pdo_sqlite/tests/bug33841.phpt +++ b/ext/pdo_sqlite/tests/bug33841.phpt @@ -1,7 +1,7 @@ --TEST-- PDO SQLite Bug #33841 (rowCount() does not work on prepared statements) --SKIPIF-- -<?php # vim:ft=php +<?php if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?> --FILE-- diff --git a/ext/pdo_sqlite/tests/bug35336.phpt b/ext/pdo_sqlite/tests/bug35336.phpt index 1f9fda12b6..201429bc4e 100644 --- a/ext/pdo_sqlite/tests/bug35336.phpt +++ b/ext/pdo_sqlite/tests/bug35336.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #35336 (crash on PDO::FETCH_CLASS + __set()) --SKIPIF-- -<?php # vim:ft=php +<?php if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?> --FILE-- diff --git a/ext/pdo_sqlite/tests/bug46542.phpt b/ext/pdo_sqlite/tests/bug46542.phpt index 2de0c05191..d324270f2a 100644 --- a/ext/pdo_sqlite/tests/bug46542.phpt +++ b/ext/pdo_sqlite/tests/bug46542.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #46542 Extending PDO class with a __call() function --SKIPIF-- -<?php # vim:ft=php +<?php if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?> --FILE-- diff --git a/ext/pdo_sqlite/tests/bug52487.phpt b/ext/pdo_sqlite/tests/bug52487.phpt index fc65bd3b60..4861f6204f 100644 --- a/ext/pdo_sqlite/tests/bug52487.phpt +++ b/ext/pdo_sqlite/tests/bug52487.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #52487 (PDO::FETCH_INTO leaks memory) --SKIPIF-- -<?php # vim:ft=php +<?php if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?> --FILE-- diff --git a/ext/pdo_sqlite/tests/common.phpt b/ext/pdo_sqlite/tests/common.phpt index da28d91950..9c07a5dc38 100644 --- a/ext/pdo_sqlite/tests/common.phpt +++ b/ext/pdo_sqlite/tests/common.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite --SKIPIF-- -<?php # vim:ft=php +<?php if (!extension_loaded('pdo_sqlite')) print 'skip'; ?> --REDIRECTTEST-- return array( |