Skip to content

Commit 2062a30

Browse files
jmikolajmikola
committed
Merge pull request #342 
2 parents ea21ea0 + 8530915 commit 2062a30

File tree

4 files changed

+297
-491
lines changed

4 files changed

+297
-491
lines changed

‎php_phongo_classes.h

Lines changed: 70 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,76 @@
1919
#ifndef PHONGO_CLASSES_H
2020
#define PHONGO_CLASSES_H
2121

22+
#include "php_phongo_structs.h"
23+
2224
#if PHP_VERSION_ID >= 70000
23-
# include "php_phongo_structs-7.h"
25+
26+
static inline php_phongo_bulkwrite_t* php_bulkwrite_fetch_object(zend_object *obj) {
27+
return (php_phongo_bulkwrite_t *)((char *)obj - XtOffsetOf(php_phongo_bulkwrite_t, std));
28+
}
29+
static inline php_phongo_command_t* php_command_fetch_object(zend_object *obj) {
30+
return (php_phongo_command_t *)((char *)obj - XtOffsetOf(php_phongo_command_t, std));
31+
}
32+
static inline php_phongo_cursor_t* php_cursor_fetch_object(zend_object *obj) {
33+
return (php_phongo_cursor_t *)((char *)obj - XtOffsetOf(php_phongo_cursor_t, std));
34+
}
35+
static inline php_phongo_cursorid_t* php_cursorid_fetch_object(zend_object *obj) {
36+
return (php_phongo_cursorid_t *)((char *)obj - XtOffsetOf(php_phongo_cursorid_t, std));
37+
}
38+
static inline php_phongo_manager_t* php_manager_fetch_object(zend_object *obj) {
39+
return (php_phongo_manager_t *)((char *)obj - XtOffsetOf(php_phongo_manager_t, std));
40+
}
41+
static inline php_phongo_query_t* php_query_fetch_object(zend_object *obj) {
42+
return (php_phongo_query_t *)((char *)obj - XtOffsetOf(php_phongo_query_t, std));
43+
}
44+
static inline php_phongo_readconcern_t* php_readconcern_fetch_object(zend_object *obj) {
45+
return (php_phongo_readconcern_t *)((char *)obj - XtOffsetOf(php_phongo_readconcern_t, std));
46+
}
47+
static inline php_phongo_readpreference_t* php_readpreference_fetch_object(zend_object *obj) {
48+
return (php_phongo_readpreference_t *)((char *)obj - XtOffsetOf(php_phongo_readpreference_t, std));
49+
}
50+
static inline php_phongo_server_t* php_server_fetch_object(zend_object *obj) {
51+
return (php_phongo_server_t *)((char *)obj - XtOffsetOf(php_phongo_server_t, std));
52+
}
53+
static inline php_phongo_writeconcern_t* php_writeconcern_fetch_object(zend_object *obj) {
54+
return (php_phongo_writeconcern_t *)((char *)obj - XtOffsetOf(php_phongo_writeconcern_t, std));
55+
}
56+
static inline php_phongo_writeconcernerror_t* php_writeconcernerror_fetch_object(zend_object *obj) {
57+
return (php_phongo_writeconcernerror_t *)((char *)obj - XtOffsetOf(php_phongo_writeconcernerror_t, std));
58+
}
59+
static inline php_phongo_writeerror_t* php_writeerror_fetch_object(zend_object *obj) {
60+
return (php_phongo_writeerror_t *)((char *)obj - XtOffsetOf(php_phongo_writeerror_t, std));
61+
}
62+
static inline php_phongo_writeresult_t* php_writeresult_fetch_object(zend_object *obj) {
63+
return (php_phongo_writeresult_t *)((char *)obj - XtOffsetOf(php_phongo_writeresult_t, std));
64+
}
65+
static inline php_phongo_binary_t* php_binary_fetch_object(zend_object *obj) {
66+
return (php_phongo_binary_t *)((char *)obj - XtOffsetOf(php_phongo_binary_t, std));
67+
}
68+
static inline php_phongo_decimal128_t* php_decimal128_fetch_object(zend_object *obj) {
69+
return (php_phongo_decimal128_t *)((char *)obj - XtOffsetOf(php_phongo_decimal128_t, std));
70+
}
71+
static inline php_phongo_javascript_t* php_javascript_fetch_object(zend_object *obj) {
72+
return (php_phongo_javascript_t *)((char *)obj - XtOffsetOf(php_phongo_javascript_t, std));
73+
}
74+
static inline php_phongo_maxkey_t* php_maxkey_fetch_object(zend_object *obj) {
75+
return (php_phongo_maxkey_t *)((char *)obj - XtOffsetOf(php_phongo_maxkey_t, std));
76+
}
77+
static inline php_phongo_minkey_t* php_minkey_fetch_object(zend_object *obj) {
78+
return (php_phongo_minkey_t *)((char *)obj - XtOffsetOf(php_phongo_minkey_t, std));
79+
}
80+
static inline php_phongo_objectid_t* php_objectid_fetch_object(zend_object *obj) {
81+
return (php_phongo_objectid_t *)((char *)obj - XtOffsetOf(php_phongo_objectid_t, std));
82+
}
83+
static inline php_phongo_regex_t* php_regex_fetch_object(zend_object *obj) {
84+
return (php_phongo_regex_t *)((char *)obj - XtOffsetOf(php_phongo_regex_t, std));
85+
}
86+
static inline php_phongo_timestamp_t* php_timestamp_fetch_object(zend_object *obj) {
87+
return (php_phongo_timestamp_t *)((char *)obj - XtOffsetOf(php_phongo_timestamp_t, std));
88+
}
89+
static inline php_phongo_utcdatetime_t* php_utcdatetime_fetch_object(zend_object *obj) {
90+
return (php_phongo_utcdatetime_t *)((char *)obj - XtOffsetOf(php_phongo_utcdatetime_t, std));
91+
}
2492

2593
# define Z_COMMAND_OBJ_P(zv) (php_command_fetch_object(Z_OBJ_P(zv)))
2694
# define Z_CURSOR_OBJ_P(zv) (php_cursor_fetch_object(Z_OBJ_P(zv)))
@@ -37,10 +105,7 @@
37105
# define Z_WRITERESULT_OBJ_P(zv) (php_writeresult_fetch_object(Z_OBJ_P(zv)))
38106
# define Z_BINARY_OBJ_P(zv) (php_binary_fetch_object(Z_OBJ_P(zv)))
39107
# define Z_DECIMAL128_OBJ_P(zv) (php_decimal128_fetch_object(Z_OBJ_P(zv)))
40-
# define Z_INT32_OBJ_P(zv) (php_int32_fetch_object(Z_OBJ_P(zv)))
41-
# define Z_INT64_OBJ_P(zv) (php_int64_fetch_object(Z_OBJ_P(zv)))
42108
# define Z_JAVASCRIPT_OBJ_P(zv) (php_javascript_fetch_object(Z_OBJ_P(zv)))
43-
# define Z_LOG_OBJ_P(zv) (php_log_fetch_object(Z_OBJ_P(zv)))
44109
# define Z_MAXKEY_OBJ_P(zv) (php_maxkey_fetch_object(Z_OBJ_P(zv)))
45110
# define Z_MINKEY_OBJ_P(zv) (php_minkey_fetch_object(Z_OBJ_P(zv)))
46111
# define Z_OBJECTID_OBJ_P(zv) (php_objectid_fetch_object(Z_OBJ_P(zv)))
@@ -63,10 +128,7 @@
63128
# define Z_OBJ_WRITERESULT(zo) (php_writeresult_fetch_object(zo))
64129
# define Z_OBJ_BINARY(zo) (php_binary_fetch_object(zo))
65130
# define Z_OBJ_DECIMAL128(zo) (php_decimal128_fetch_object(zo))
66-
# define Z_OBJ_INT32(zo) (php_int32_fetch_object(zo))
67-
# define Z_OBJ_INT64(zo) (php_int64_fetch_object(zo))
68131
# define Z_OBJ_JAVASCRIPT(zo) (php_javascript_fetch_object(zo))
69-
# define Z_OBJ_LOG(zo) (php_log_fetch_object(zo))
70132
# define Z_OBJ_MAXKEY(zo) (php_maxkey_fetch_object(zo))
71133
# define Z_OBJ_MINKEY(zo) (php_minkey_fetch_object(zo))
72134
# define Z_OBJ_OBJECTID(zo) (php_objectid_fetch_object(zo))
@@ -76,8 +138,6 @@
76138

77139
#else
78140

79-
# include "php_phongo_structs-5.h"
80-
81141
# define Z_COMMAND_OBJ_P(zv) ((php_phongo_command_t *)zend_object_store_get_object(zv TSRMLS_CC))
82142
# define Z_CURSOR_OBJ_P(zv) ((php_phongo_cursor_t *)zend_object_store_get_object(zv TSRMLS_CC))
83143
# define Z_CURSORID_OBJ_P(zv) ((php_phongo_cursorid_t *)zend_object_store_get_object(zv TSRMLS_CC))
@@ -93,10 +153,7 @@
93153
# define Z_WRITERESULT_OBJ_P(zv) ((php_phongo_writeresult_t *)zend_object_store_get_object(zv TSRMLS_CC))
94154
# define Z_BINARY_OBJ_P(zv) ((php_phongo_binary_t *)zend_object_store_get_object(zv TSRMLS_CC))
95155
# define Z_DECIMAL128_OBJ_P(zv) ((php_phongo_decimal128_t *)zend_object_store_get_object(zv TSRMLS_CC))
96-
# define Z_INT32_OBJ_P(zv) ((php_phongo_int32_t *)zend_object_store_get_object(zv TSRMLS_CC))
97-
# define Z_INT64_OBJ_P(zv) ((php_phongo_int64_t *)zend_object_store_get_object(zv TSRMLS_CC))
98156
# define Z_JAVASCRIPT_OBJ_P(zv) ((php_phongo_javascript_t *)zend_object_store_get_object(zv TSRMLS_CC))
99-
# define Z_LOG_OBJ_P(zv) ((php_phongo_log_t *)zend_object_store_get_object(zv TSRMLS_CC))
100157
# define Z_MAXKEY_OBJ_P(zv) ((php_phongo_maxkey_t *)zend_object_store_get_object(zv TSRMLS_CC))
101158
# define Z_MINKEY_OBJ_P(zv) ((php_phongo_minkey_t *)zend_object_store_get_object(zv TSRMLS_CC))
102159
# define Z_OBJECTID_OBJ_P(zv) ((php_phongo_objectid_t *)zend_object_store_get_object(zv TSRMLS_CC))
@@ -119,16 +176,14 @@
119176
# define Z_OBJ_WRITERESULT(zo) ((php_phongo_writeresult_t *)zo)
120177
# define Z_OBJ_BINARY(zo) ((php_phongo_binary_t *)zo)
121178
# define Z_OBJ_DECIMAL128(zo) ((php_phongo_decimal128_t *)zo)
122-
# define Z_OBJ_INT32(zo) ((php_phongo_int32_t *)zo)
123-
# define Z_OBJ_INT64(zo) ((php_phongo_int64_t *)zo)
124179
# define Z_OBJ_JAVASCRIPT(zo) ((php_phongo_javascript_t *)zo)
125-
# define Z_OBJ_LOG(zo) ((php_phongo_log_t *)zo)
126180
# define Z_OBJ_MAXKEY(zo) ((php_phongo_maxkey_t *)zo)
127181
# define Z_OBJ_MINKEY(zo) ((php_phongo_minkey_t *)zo)
128182
# define Z_OBJ_OBJECTID(zo) ((php_phongo_objectid_t *)zo)
129183
# define Z_OBJ_REGEX(zo) ((php_phongo_regex_t *)zo)
130184
# define Z_OBJ_TIMESTAMP(zo) ((php_phongo_timestamp_t *)zo)
131185
# define Z_OBJ_UTCDATETIME(zo) ((php_phongo_utcdatetime_t *)zo)
186+
132187
#endif
133188

134189
typedef struct {
@@ -171,10 +226,7 @@ extern PHONGO_API zend_class_entry *php_phongo_unserializable_ce;
171226
extern PHONGO_API zend_class_entry *php_phongo_serializable_ce;
172227
extern PHONGO_API zend_class_entry *php_phongo_binary_ce;
173228
extern PHONGO_API zend_class_entry *php_phongo_decimal128_ce;
174-
extern PHONGO_API zend_class_entry *php_phongo_int32_ce;
175-
extern PHONGO_API zend_class_entry *php_phongo_int64_ce;
176229
extern PHONGO_API zend_class_entry *php_phongo_javascript_ce;
177-
extern PHONGO_API zend_class_entry *php_phongo_log_ce;
178230
extern PHONGO_API zend_class_entry *php_phongo_maxkey_ce;
179231
extern PHONGO_API zend_class_entry *php_phongo_minkey_ce;
180232
extern PHONGO_API zend_class_entry *php_phongo_objectid_ce;

‎php_phongo_structs-5.h

Lines changed: 0 additions & 198 deletions
This file was deleted.

0 commit comments

Comments
 (0)