Promote warning to Error in ODBC extension #6123
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 tasks
|
To fix the compile error on Windows: ext/odbc/php_odbc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index f3f7b19109..2d30ae4816 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1248,7 +1248,7 @@ PHP_FUNCTION(odbc_data_source)
if (!(fetch_type == SQL_FETCH_FIRST || fetch_type == SQL_FETCH_NEXT)) {
zend_argument_value_error(2, "must be SQL_FETCH_FIRST or SQL_FETCH_NEXT");
- RETURN_THROWS()
+ RETURN_THROWS();
}
if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(zv_conn), "ODBC-Link", le_conn, le_pconn))) { |
Girgias
force-pushed
the
odbc-warning-to-error
branch
from
91168d7 to
66232da
Compare
nikic
reviewed
Sep 14, 2020
ext/odbc/php_odbc.c
Outdated
| @@ -787,6 +787,11 @@ void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type) | |||
| RETURN_THROWS(); | |||
| } | |||
|
|
|||
| if (pv_num < 1) { | |||
| zend_argument_value_error(2, "must be greater than or equal to 1"); | |||
There was a problem hiding this comment.
Suggested change
| zend_argument_value_error(2, "must be greater than or equal to 1"); | |
| zend_argument_value_error(2, "must be greater than 0"); |
Girgias
force-pushed
the
odbc-warning-to-error
branch
from
66232da to
2e5bc1e
Compare
nikic
approved these changes
Sep 15, 2020
| @@ -1246,8 +1247,8 @@ PHP_FUNCTION(odbc_data_source) | |||
| fetch_type = (SQLSMALLINT) zv_fetch_type; | |||
|
|
|||
| if (!(fetch_type == SQL_FETCH_FIRST || fetch_type == SQL_FETCH_NEXT)) { | |||
| php_error_docref(NULL, E_WARNING, "Invalid fetch type (%d)", fetch_type); | |||
| RETURN_FALSE; | |||
| zend_argument_value_error(2, "must either be SQL_FETCH_FIRST or SQL_FETCH_NEXT"); | |||
There was a problem hiding this comment.
Suggested change
| zend_argument_value_error(2, "must either be SQL_FETCH_FIRST or SQL_FETCH_NEXT"); | |
| zend_argument_value_error(2, "must be either SQL_FETCH_FIRST or SQL_FETCH_NEXT"); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ODBC really ought to have more tests