Skip to content

Commit ee9ca14

Browse files
GirgiasGirgias
committed
Some cleanup in OCI8 extension for PHP 8
1 parent 25aa125 commit ee9ca14

File tree

8 files changed

+9
-88
lines changed

8 files changed

+9
-88
lines changed

‎ext/oci8/oci8.c

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,7 @@
3333
#include "php_ini.h"
3434
#include "zend_smart_str.h"
3535

36-
#if HAVE_OCI8
37-
38-
/* PHP 5.2 is the minimum supported version for OCI8 2.0 */
39-
#if PHP_MAJOR_VERSION < 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION <= 1)
40-
#error Use PHP OCI8 1.4 for your version of PHP
41-
#elif PHP_MAJOR_VERSION < 7
42-
/* PHP 7 is the minimum supported version for OCI8 2.1 */
43-
#error Use PHP OCI8 2.0 for your version of PHP
44-
#endif
36+
#ifdef HAVE_OCI8
4537

4638
#include "php_oci8.h"
4739
#include "php_oci8_int.h"
@@ -2045,10 +2037,6 @@ php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char
20452037

20462038
/* add to the appropriate hash */
20472039
if (connection->is_persistent) {
2048-
#if PHP_VERSION_ID < 70300
2049-
new_le.ptr = connection;
2050-
new_le.type = le_pconnection;
2051-
#endif
20522040
connection->used_this_request = 1;
20532041
PHP_OCI_REGISTER_RESOURCE(connection, le_pconnection);
20542042

@@ -2059,11 +2047,7 @@ php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char
20592047
if (OCI_G(old_oci_close_semantics)) {
20602048
GC_ADDREF(connection->id);
20612049
}
2062-
#if PHP_VERSION_ID < 70300
2063-
zend_hash_update_mem(&EG(persistent_list), connection->hash_key, (void *)&new_le, sizeof(zend_resource));
2064-
#else
20652050
zend_register_persistent_resource_ex(connection->hash_key, connection, le_pconnection);
2066-
#endif
20672051
OCI_G(num_persistent)++;
20682052
OCI_G(num_links)++;
20692053
} else if (!exclusive) {
@@ -2891,9 +2875,6 @@ static php_oci_spool *php_oci_get_spool(char *username, int username_len, char *
28912875
{
28922876
smart_str spool_hashed_details = {0};
28932877
php_oci_spool *session_pool = NULL;
2894-
#if PHP_VERSION_ID < 70300
2895-
zend_resource spool_le = {{0}};
2896-
#endif
28972878
zend_resource *spool_out_le = NULL;
28982879
zend_bool iserror = 0;
28992880
zval *spool_out_zv = NULL;
@@ -2940,14 +2921,7 @@ static php_oci_spool *php_oci_get_spool(char *username, int username_len, char *
29402921
iserror = 1;
29412922
goto exit_get_spool;
29422923
}
2943-
#if PHP_VERSION_ID < 70300
2944-
spool_le.ptr = session_pool;
2945-
spool_le.type = le_psessionpool;
2946-
PHP_OCI_REGISTER_RESOURCE(session_pool, le_psessionpool);
2947-
zend_hash_update_mem(&EG(persistent_list), session_pool->spool_hash_key, (void *)&spool_le, sizeof(zend_resource));
2948-
#else
29492924
zend_register_persistent_resource_ex(session_pool->spool_hash_key, session_pool, le_psessionpool);
2950-
#endif
29512925
} else if (spool_out_le->type == le_psessionpool &&
29522926
ZSTR_LEN(((php_oci_spool *)(spool_out_le->ptr))->spool_hash_key) == ZSTR_LEN(spool_hashed_details.s) &&
29532927
memcmp(ZSTR_VAL(((php_oci_spool *)(spool_out_le->ptr))->spool_hash_key), ZSTR_VAL(spool_hashed_details.s), ZSTR_LEN(spool_hashed_details.s)) == 0) {

‎ext/oci8/oci8_collection.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "ext/standard/info.h"
3232
#include "php_ini.h"
3333

34-
#if HAVE_OCI8
34+
#ifdef HAVE_OCI8
3535

3636
#include "php_oci8.h"
3737
#include "php_oci8_int.h"
@@ -50,11 +50,7 @@ php_oci_collection *php_oci_collection_create(php_oci_connection *connection, ch
5050

5151
collection->connection = connection;
5252
collection->collection = NULL;
53-
#if PHP_VERSION_ID < 70300
54-
++GC_REFCOUNT(collection->connection->id);
55-
#else
5653
GC_ADDREF(collection->connection->id);
57-
#endif
5854

5955
/* get type handle by name */
6056
PHP_OCI_CALL_RETURN(errstatus, OCITypeByName,

‎ext/oci8/oci8_failover.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "ext/standard/info.h"
3434
#include "php_ini.h"
3535

36-
#if HAVE_OCI8
36+
#ifdef HAVE_OCI8
3737

3838
#include "php_oci8.h"
3939
#include "php_oci8_int.h"

‎ext/oci8/oci8_interface.c

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "ext/standard/info.h"
3232
#include "php_ini.h"
3333

34-
#if HAVE_OCI8
34+
#ifdef HAVE_OCI8
3535

3636
#include "php_oci8.h"
3737
#include "php_oci8_int.h"
@@ -49,38 +49,18 @@ PHP_FUNCTION(oci_register_taf_callback)
4949
zval *callback;
5050
zend_string *callback_name;
5151

52+
/* TODO Use ZPP callable */
5253
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|z!", &z_connection, &callback) == FAILURE) {
5354
RETURN_THROWS();
5455
}
5556

5657
if (callback) {
57-
#if PHP_MAJOR_VERSION > 7 || (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION >= 2)
5858
if (!zend_is_callable(callback, 0, 0)) {
5959
callback_name = zend_get_callable_name(callback);
6060
php_error_docref(NULL, E_WARNING, "Function '%s' is not callable", ZSTR_VAL(callback_name));
61-
#if PHP_VERSION_ID < 70300
6261
zend_string_release(callback_name);
63-
#else
64-
zend_string_release_ex(callback_name, 0);
65-
#endif
66-
RETURN_FALSE;
67-
}
68-
#else
69-
if (!zend_is_callable(callback, 0, &callback_name)) {
70-
php_error_docref(NULL, E_WARNING, "Function '%s' is not callable", ZSTR_VAL(callback_name));
71-
#if PHP_VERSION_ID < 70300
72-
zend_string_release(callback_name);
73-
#else
74-
zend_string_release_ex(callback_name, 0);
75-
#endif
7662
RETURN_FALSE;
7763
}
78-
#if PHP_VERSION_ID < 70300
79-
zend_string_release(callback_name);
80-
#else
81-
zend_string_release_ex(callback_name, 0);
82-
#endif
83-
#endif
8464
}
8565

8666
PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
@@ -155,18 +135,10 @@ PHP_FUNCTION(oci_define_by_name)
155135
/* if (zend_hash_add(statement->defines, name, name_len, define, sizeof(php_oci_define), (void **)&tmp_define) == SUCCESS) { */
156136
zvtmp = zend_string_init(name, name_len, 0);
157137
if ((define = zend_hash_add_new_ptr(statement->defines, zvtmp, define)) != NULL) {
158-
#if PHP_VERSION_ID < 70300
159138
zend_string_release(zvtmp);
160-
#else
161-
zend_string_release_ex(zvtmp, 0);
162-
#endif
163139
} else {
164140
efree(define);
165-
#if PHP_VERSION_ID < 70300
166141
zend_string_release(zvtmp);
167-
#else
168-
zend_string_release_ex(zvtmp, 0);
169-
#endif
170142
RETURN_FALSE;
171143
}
172144

@@ -1513,11 +1485,7 @@ PHP_FUNCTION(oci_fetch_all)
15131485
zend_string *zvtmp;
15141486
zvtmp = zend_string_init(columns[ i ]->name, columns[ i ]->name_len, 0);
15151487
zend_symtable_update(Z_ARRVAL(row), zvtmp, &element);
1516-
#if PHP_VERSION_ID < 70300
15171488
zend_string_release(zvtmp);
1518-
#else
1519-
zend_string_release_ex(zvtmp, 0);
1520-
#endif
15211489
}
15221490
}
15231491

@@ -1556,11 +1524,7 @@ PHP_FUNCTION(oci_fetch_all)
15561524
array_init(&tmp);
15571525
zvtmp = zend_string_init(columns[ i ]->name, columns[ i ]->name_len, 0);
15581526
outarrs[ i ] = zend_symtable_update(Z_ARRVAL_P(array), zvtmp, &tmp);
1559-
#if PHP_VERSION_ID < 70300
15601527
zend_string_release(zvtmp);
1561-
#else
1562-
zend_string_release_ex(zvtmp, 0);
1563-
#endif
15641528
}
15651529
}
15661530

‎ext/oci8/oci8_lob.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "ext/standard/info.h"
3232
#include "php_ini.h"
3333

34-
#if HAVE_OCI8
34+
#ifdef HAVE_OCI8
3535

3636
#include "php_oci8.h"
3737
#include "php_oci8_int.h"

‎ext/oci8/oci8_statement.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "ext/standard/info.h"
3232
#include "php_ini.h"
3333

34-
#if HAVE_OCI8
34+
#ifdef HAVE_OCI8
3535

3636
#include "php_oci8.h"
3737
#include "php_oci8_int.h"
@@ -995,12 +995,7 @@ int php_oci_bind_post_exec(zval *data)
995995
* binds, php_oci_bind_out_callback() should have allocated a
996996
* new string that we can modify here.
997997
*/
998-
#if PHP_VERSION_ID < 70300
999-
SEPARATE_STRING(zv);
1000-
Z_STR_P(zv) = zend_string_extend(Z_STR_P(zv), Z_STRLEN_P(zv)+1, 0);
1001-
#else
1002998
ZVAL_NEW_STR(zv, zend_string_extend(Z_STR_P(zv), Z_STRLEN_P(zv)+1, 0));
1003-
#endif
1004999
Z_STRVAL_P(zv)[ Z_STRLEN_P(zv) ] = '\0';
10051000
} else if (Z_TYPE_P(zv) == IS_ARRAY) {
10061001
int i;
@@ -1265,11 +1260,7 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
12651260
zvtmp = zend_string_init(name, name_len, 0);
12661261
bindp = (php_oci_bind *) ecalloc(1, sizeof(php_oci_bind));
12671262
bindp = zend_hash_update_ptr(statement->binds, zvtmp, bindp);
1268-
#if PHP_VERSION_ID < 70300
12691263
zend_string_release(zvtmp);
1270-
#else
1271-
zend_string_release_ex(zvtmp, 0);
1272-
#endif
12731264
}
12741265

12751266
/* Make sure the minimum of value_sz is 1 to avoid ORA-3149
@@ -1716,11 +1707,7 @@ int php_oci_bind_array_by_name(php_oci_statement *statement, char *name, size_t
17161707

17171708
zvtmp = zend_string_init(name, name_len, 0);
17181709
zend_hash_update_ptr(statement->binds, zvtmp, bind);
1719-
#if PHP_VERSION_ID < 70300
17201710
zend_string_release(zvtmp);
1721-
#else
1722-
zend_string_release_ex(zvtmp, 0);
1723-
#endif
17241711

17251712
statement->errcode = 0; /* retain backwards compat with OCI8 1.4 */
17261713
return 0;

‎ext/oci8/php_oci8.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
+----------------------------------------------------------------------+
2424
*/
2525

26-
#if HAVE_OCI8
26+
#ifdef HAVE_OCI8
2727
# ifndef PHP_OCI8_H
2828
# define PHP_OCI8_H
2929

‎ext/oci8/php_oci8_int.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
+----------------------------------------------------------------------+
2424
*/
2525

26-
#if HAVE_OCI8
26+
#ifdef HAVE_OCI8
2727
# ifndef PHP_OCI8_INT_H
2828
# define PHP_OCI8_INT_H
2929

0 commit comments

Comments
 (0)