summaryrefslogtreecommitdiff
path: root/ext/pdo_odbc
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 /ext/pdo_odbc
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 'ext/pdo_odbc')
-rw-r--r--ext/pdo_odbc/config.m41
-rw-r--r--ext/pdo_odbc/odbc_driver.c9
-rw-r--r--ext/pdo_odbc/odbc_stmt.c9
-rw-r--r--ext/pdo_odbc/pdo_odbc.c9
-rw-r--r--ext/pdo_odbc/php_pdo_odbc.h10
-rw-r--r--ext/pdo_odbc/php_pdo_odbc_int.h9
-rw-r--r--ext/pdo_odbc/tests/common.phpt2
-rw-r--r--ext/pdo_odbc/tests/long_columns.phpt2
-rw-r--r--ext/pdo_odbc/tests/max_columns.phpt2
9 files changed, 3 insertions, 50 deletions
diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
index 73b7e1cf93..2f875d43de 100644
--- a/ext/pdo_odbc/config.m4
+++ b/ext/pdo_odbc/config.m4
@@ -1,5 +1,4 @@
dnl config.m4 for extension pdo_odbc
-dnl vim:et:sw=2:ts=2:
define([PDO_ODBC_HELP_TEXT],[[
include and lib dirs are looked for under 'dir'.
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
index 94878124d8..9e10c4c446 100644
--- a/ext/pdo_odbc/odbc_driver.c
+++ b/ext/pdo_odbc/odbc_driver.c
@@ -480,12 +480,3 @@ const pdo_driver_t pdo_odbc_driver = {
PDO_DRIVER_HEADER(odbc),
pdo_odbc_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_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
index 211978abbd..e67acbc6e8 100644
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
@@ -866,12 +866,3 @@ const struct pdo_stmt_methods odbc_stmt_methods = {
NULL, /* get column meta */
odbc_stmt_next_rowset
};
-
-/*
- * 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_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c
index 7f02601fc1..5f0eb26df3 100644
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
@@ -172,12 +172,3 @@ PHP_MINFO_FUNCTION(pdo_odbc)
#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/ext/pdo_odbc/php_pdo_odbc.h b/ext/pdo_odbc/php_pdo_odbc.h
index 6efb1a28de..10a11d56a4 100644
--- a/ext/pdo_odbc/php_pdo_odbc.h
+++ b/ext/pdo_odbc/php_pdo_odbc.h
@@ -52,13 +52,3 @@ ZEND_END_MODULE_GLOBALS(pdo_odbc)
#endif
#endif /* PHP_PDO_ODBC_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/ext/pdo_odbc/php_pdo_odbc_int.h b/ext/pdo_odbc/php_pdo_odbc_int.h
index 7f72e7620a..e6098f4951 100644
--- a/ext/pdo_odbc/php_pdo_odbc_int.h
+++ b/ext/pdo_odbc/php_pdo_odbc_int.h
@@ -182,12 +182,3 @@ enum {
PDO_ODBC_ATTR_USE_CURSOR_LIBRARY = PDO_ATTR_DRIVER_SPECIFIC,
PDO_ODBC_ATTR_ASSUME_UTF8 /* assume that input strings are UTF-8 when feeding data to unicode columns */
};
-
-/*
- * 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_odbc/tests/common.phpt b/ext/pdo_odbc/tests/common.phpt
index e8c4d07c70..5b1cf83194 100644
--- a/ext/pdo_odbc/tests/common.phpt
+++ b/ext/pdo_odbc/tests/common.phpt
@@ -1,7 +1,7 @@
--TEST--
ODBC
--SKIPIF--
-<?php # vim:ft=php
+<?php
if (!extension_loaded('pdo_odbc')) print 'skip';
if (substr(PHP_OS, 0, 3) == 'WIN' &&
false === getenv('PDOTEST_DSN') &&
diff --git a/ext/pdo_odbc/tests/long_columns.phpt b/ext/pdo_odbc/tests/long_columns.phpt
index 3f72b354c1..b54421151b 100644
--- a/ext/pdo_odbc/tests/long_columns.phpt
+++ b/ext/pdo_odbc/tests/long_columns.phpt
@@ -1,7 +1,7 @@
--TEST--
PDO ODBC "long" columns
--SKIPIF--
-<?php # vim:ft=php
+<?php
if (!extension_loaded('pdo_odbc')) print 'skip not loaded';
// make sure there is an ODBC driver and a DSN, or the test will fail
include 'ext/pdo/tests/pdo_test.inc';
diff --git a/ext/pdo_odbc/tests/max_columns.phpt b/ext/pdo_odbc/tests/max_columns.phpt
index 6fb8984005..ae68a09e91 100644
--- a/ext/pdo_odbc/tests/max_columns.phpt
+++ b/ext/pdo_odbc/tests/max_columns.phpt
@@ -1,7 +1,7 @@
--TEST--
PDO ODBC varying character with max/no length
--SKIPIF--
-<?php # vim:ft=php
+<?php
if (!extension_loaded('pdo_odbc')) print 'skip not loaded';
?>
--FILE--