Commit graph

36 commits

Author SHA1 Message Date
Christoph M. Becker
99b3631e9a Merge branch 'PHP-7.4' into master
* PHP-7.4:
  Fix #67465: NULL Pointer dereference in odbc_handle_preparer
2020-09-28 22:59:51 +02:00
Christoph M. Becker
f1d8395c77 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix #67465: NULL Pointer dereference in odbc_handle_preparer
2020-09-28 22:58:16 +02:00
Christoph M. Becker
6acfb79276 Fix #67465: NULL Pointer dereference in odbc_handle_preparer
We have to initialize `stmt->driver_data` before we use it.

Closes GH-6225.
2020-09-28 22:57:01 +02:00
Nikita Popov
c5401854fc Run tidy
This should fix most of the remaining issues with tabs and spaces
being mixed in tests.
2020-09-18 14:28:32 +02:00
Máté Kocsis
7aacc705d0
Add many missing closing PHP tags to tests
Closes GH-5958
2020-08-09 22:03:36 +02:00
Nikita Popov
f8d795820e Reindent phpt files 2020-02-03 22:52:20 +01:00
Christoph M. Becker
2244a7d9af Prevent further potential test conflicts 2019-05-14 13:19:58 +02:00
Fabien Villepinte
26dfce7f36 Replace dirname(__FILE__) by __DIR__ in tests 2019-03-15 22:55:30 +01:00
Rodrigo Prado
dc1937e386 updated typo in test
User Group: PHPSP #phptestfestbrasil
2019-02-09 00:07:20 +01:00
Peter Kokot
92ac598aab 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.
2019-02-03 21:03:00 +01:00
Peter Kokot
d679f02295 Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
2018-10-15 04:33:09 +02:00
Peter Kokot
b746e69887 Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
2018-10-15 04:32:30 +02:00
Peter Kokot
d7a3edd45d Trim trailing whitespace in *.phpt 2018-10-14 19:46:15 +02:00
Peter Kokot
782352c54a Trim trailing whitespace in *.phpt 2018-10-14 19:45:12 +02:00
Gabriel Caruso
9c144e0d82
Trim trailing whitespace in tests 2018-10-14 12:07:20 -03:00
Anatol Belski
cc5a0da006 Ensure expected items delivered in same order 2017-12-21 18:37:23 +01:00
Elizabeth Marie Smith
4df5f79ab5 Fix ODBC bug for varchars returning with length zero 2016-04-01 17:11:58 +02:00
Matt Ficken
10251b20c3 Fixed bug #62379 failing ODBC long column functionality 2012-07-13 15:34:00 +02:00
Wez Furlong
3028f7465d Fix for PECL #7755; use the displayable column width as the basis for our
buffer size, as the raw column size can be too small when requesting
a string representation.

Also fix up bogus error output when fetching, and another one of the test
cases to make it run against SQL Server 2005.
2006-10-11 03:07:29 +00:00
Wez Furlong
08a6122f54 MFH: use PDO:: class constants 2005-09-20 00:46:02 +00:00
Wez Furlong
d4348d11dd try to make the test a bit more portable 2005-07-19 16:55:48 +00:00
Wez Furlong
43c1a1b73c Closes #33533 by implementing proper dynamic fetching of long text columns. 2005-07-19 15:26:16 +00:00
Wez Furlong
fff515bc46 more paranoia about the attribute param here too 2005-07-07 13:56:39 +00:00
Wez Furlong
e39f37d36b replace pdo_odbc tests with new redirection thingy 2005-07-06 06:10:52 +00:00
Wez Furlong
372c38a53a build related adjustments.
These need to be included in beta 2
2005-06-22 08:45:22 +00:00
Dan Scott
4187a6e3c7 Bring PDO_ODBC tests in sync with PDO base tests. 2005-06-15 00:17:18 +00:00
Dan Scott
b21bf3d357 PDO_ODBC returns strings for all data types. Bring expected output in line. 2005-06-11 14:01:46 +00:00
Dan Scott
e90582a990 Add test for PDOStatement::getColumnMeta().
Note that PDO_ODBC test fails as it is currently unimplemented.
2005-03-09 00:20:07 +00:00
Dan Scott
83dfcbf3f6 Add simple tests for insert through PDO::prepare/PDOStatement::execute.
Tests both question mark placeholders and named parameters.
2005-03-08 18:12:22 +00:00
Dan Scott
570976d236 Add a test for PDOStatement::columnCount(). 2005-03-08 17:39:41 +00:00
Dan Scott
48a6151051 Test PDO::beginTransaction and PDO::rollBack. 2005-03-05 21:03:12 +00:00
Dan Scott
fc825e2071 Missed this one... 2005-03-05 15:48:54 +00:00
Dan Scott
5ce920f189 One more PDO_ODBC test (tested with DB2 V8.2). 2005-03-03 20:30:38 +00:00
Dan Scott
dc4501cf99 Next three tests for PDO_ODBC (tested with DB2 V8.2). 2005-03-03 20:23:29 +00:00
Dan Scott
12f1993f8e Next batch of tests for PDO_ODBC (tested against DB2 V8.2). 2005-03-03 13:53:55 +00:00
Dan Scott
49d1349b9a Begin porting standard PDO tests to PDO_ODBC, testing against DB2. 2005-03-03 11:49:35 +00:00