Skip to content

Commit 85fa4d7

Browse files
felipenspfelipensp
committed
- Removed PHP 6 checks
1 parent 60ad16e commit 85fa4d7

File tree

5 files changed

+9
-167
lines changed

5 files changed

+9
-167
lines changed

‎ext/phar/phar.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2653,11 +2653,8 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert,
26532653
len = -len;
26542654
}
26552655
user_stub = 0;
2656-
#if PHP_MAJOR_VERSION >= 6
2657-
if (!(len = php_stream_copy_to_mem(stubfile, (void **) &user_stub, len, 0)) || !user_stub) {
2658-
#else
2656+
26592657
if (!(len = php_stream_copy_to_mem(stubfile, &user_stub, len, 0)) || !user_stub) {
2660-
#endif
26612658
if (closeoldfile) {
26622659
php_stream_close(oldfile);
26632660
}

‎ext/phar/phar_object.c

Lines changed: 6 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ static int phar_file_type(HashTable *mimes, char *file, char **mime_type TSRMLS_
5858

5959
static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char *basename, int request_uri_len TSRMLS_DC) /* {{{ */
6060
{
61-
#if PHP_MAJOR_VERSION >= 6
62-
int is_unicode = 0;
63-
#endif
6461
HashTable *_SERVER;
6562
zval **stuff;
6663
char *path_info;
@@ -76,18 +73,7 @@ static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char
7673
_SERVER = Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]);
7774

7875
/* PATH_INFO and PATH_TRANSLATED should always be munged */
79-
#if PHP_MAJOR_VERSION >= 6
80-
if (phar_find_key(_SERVER, "PATH_INFO", sizeof("PATH_INFO"), (void **) &stuff TSRMLS_CC)) {
81-
if (Z_TYPE_PP(stuff) == IS_UNICODE) {
82-
is_unicode = 1;
83-
zval_unicode_to_string(*stuff TSRMLS_CC);
84-
} else {
85-
is_unicode = 0;
86-
}
87-
#else
8876
if (SUCCESS == zend_hash_find(_SERVER, "PATH_INFO", sizeof("PATH_INFO"), (void **) &stuff)) {
89-
#endif
90-
9177
path_info = Z_STRVAL_PP(stuff);
9278
code = Z_STRLEN_PP(stuff);
9379

@@ -96,38 +82,19 @@ static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char
9682

9783
MAKE_STD_ZVAL(temp);
9884
ZVAL_STRINGL(temp, path_info, code, 0);
99-
#if PHP_MAJOR_VERSION >= 6
100-
if (is_unicode) {
101-
zval_string_to_unicode(*stuff TSRMLS_CC);
102-
}
103-
#endif
85+
10486
zend_hash_update(_SERVER, "PHAR_PATH_INFO", sizeof("PHAR_PATH_INFO"), &temp, sizeof(zval **), NULL);
10587
}
10688
}
10789

108-
#if PHP_MAJOR_VERSION >= 6
109-
if (phar_find_key(_SERVER, "PATH_TRANSLATED", sizeof("PATH_TRANSLATED"), (void **) &stuff TSRMLS_CC)) {
110-
if (Z_TYPE_PP(stuff) == IS_UNICODE) {
111-
is_unicode = 1;
112-
zval_unicode_to_string(*stuff TSRMLS_CC);
113-
} else {
114-
is_unicode = 0;
115-
}
116-
#else
11790
if (SUCCESS == zend_hash_find(_SERVER, "PATH_TRANSLATED", sizeof("PATH_TRANSLATED"), (void **) &stuff)) {
118-
#endif
119-
12091
path_info = Z_STRVAL_PP(stuff);
12192
code = Z_STRLEN_PP(stuff);
12293
Z_STRLEN_PP(stuff) = spprintf(&(Z_STRVAL_PP(stuff)), 4096, "phar://%s%s", fname, entry);
12394

12495
MAKE_STD_ZVAL(temp);
12596
ZVAL_STRINGL(temp, path_info, code, 0);
126-
#if PHP_MAJOR_VERSION >= 6
127-
if (is_unicode) {
128-
zval_string_to_unicode(*stuff TSRMLS_CC);
129-
}
130-
#endif
97+
13198
zend_hash_update(_SERVER, "PHAR_PATH_TRANSLATED", sizeof("PHAR_PATH_TRANSLATED"), (void *) &temp, sizeof(zval **), NULL);
13299
}
133100

@@ -136,18 +103,7 @@ static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char
136103
}
137104

138105
if (PHAR_GLOBALS->phar_SERVER_mung_list & PHAR_MUNG_REQUEST_URI) {
139-
#if PHP_MAJOR_VERSION >= 6
140-
if (phar_find_key(_SERVER, "REQUEST_URI", sizeof("REQUEST_URI"), (void **) &stuff TSRMLS_CC)) {
141-
if (Z_TYPE_PP(stuff) == IS_UNICODE) {
142-
is_unicode = 1;
143-
zval_unicode_to_string(*stuff TSRMLS_CC);
144-
} else {
145-
is_unicode = 0;
146-
}
147-
#else
148106
if (SUCCESS == zend_hash_find(_SERVER, "REQUEST_URI", sizeof("REQUEST_URI"), (void **) &stuff)) {
149-
#endif
150-
151107
path_info = Z_STRVAL_PP(stuff);
152108
code = Z_STRLEN_PP(stuff);
153109

@@ -156,29 +112,14 @@ static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char
156112

157113
MAKE_STD_ZVAL(temp);
158114
ZVAL_STRINGL(temp, path_info, code, 0);
159-
#if PHP_MAJOR_VERSION >= 6
160-
if (is_unicode) {
161-
zval_string_to_unicode(*stuff TSRMLS_CC);
162-
}
163-
#endif
115+
164116
zend_hash_update(_SERVER, "PHAR_REQUEST_URI", sizeof("PHAR_REQUEST_URI"), (void *) &temp, sizeof(zval **), NULL);
165117
}
166118
}
167119
}
168120

169121
if (PHAR_GLOBALS->phar_SERVER_mung_list & PHAR_MUNG_PHP_SELF) {
170-
#if PHP_MAJOR_VERSION >= 6
171-
if (phar_find_key(_SERVER, "PHP_SELF", sizeof("PHP_SELF"), (void **) &stuff TSRMLS_CC)) {
172-
if (Z_TYPE_PP(stuff) == IS_UNICODE) {
173-
is_unicode = 1;
174-
zval_unicode_to_string(*stuff TSRMLS_CC);
175-
} else {
176-
is_unicode = 0;
177-
}
178-
#else
179122
if (SUCCESS == zend_hash_find(_SERVER, "PHP_SELF", sizeof("PHP_SELF"), (void **) &stuff)) {
180-
#endif
181-
182123
path_info = Z_STRVAL_PP(stuff);
183124
code = Z_STRLEN_PP(stuff);
184125

@@ -187,68 +128,34 @@ static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char
187128

188129
MAKE_STD_ZVAL(temp);
189130
ZVAL_STRINGL(temp, path_info, code, 0);
190-
#if PHP_MAJOR_VERSION >= 6
191-
if (is_unicode) {
192-
zval_string_to_unicode(*stuff TSRMLS_CC);
193-
}
194-
#endif
131+
195132
zend_hash_update(_SERVER, "PHAR_PHP_SELF", sizeof("PHAR_PHP_SELF"), (void *) &temp, sizeof(zval **), NULL);
196133
}
197134
}
198135
}
199136

200137
if (PHAR_GLOBALS->phar_SERVER_mung_list & PHAR_MUNG_SCRIPT_NAME) {
201-
#if PHP_MAJOR_VERSION >= 6
202-
if (phar_find_key(_SERVER, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &stuff TSRMLS_CC)) {
203-
if (Z_TYPE_PP(stuff) == IS_UNICODE) {
204-
is_unicode = 1;
205-
zval_unicode_to_string(*stuff TSRMLS_CC);
206-
} else {
207-
is_unicode = 0;
208-
}
209-
#else
210138
if (SUCCESS == zend_hash_find(_SERVER, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &stuff)) {
211-
#endif
212-
213139
path_info = Z_STRVAL_PP(stuff);
214140
code = Z_STRLEN_PP(stuff);
215141
ZVAL_STRINGL(*stuff, entry, entry_len, 1);
216142

217143
MAKE_STD_ZVAL(temp);
218144
ZVAL_STRINGL(temp, path_info, code, 0);
219-
#if PHP_MAJOR_VERSION >= 6
220-
if (is_unicode) {
221-
zval_string_to_unicode(*stuff TSRMLS_CC);
222-
}
223-
#endif
145+
224146
zend_hash_update(_SERVER, "PHAR_SCRIPT_NAME", sizeof("PHAR_SCRIPT_NAME"), (void *) &temp, sizeof(zval **), NULL);
225147
}
226148
}
227149

228150
if (PHAR_GLOBALS->phar_SERVER_mung_list & PHAR_MUNG_SCRIPT_FILENAME) {
229-
#if PHP_MAJOR_VERSION >= 6
230-
if (phar_find_key(_SERVER, "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME"), (void **) &stuff TSRMLS_CC)) {
231-
if (Z_TYPE_PP(stuff) == IS_UNICODE) {
232-
is_unicode = 1;
233-
zval_unicode_to_string(*stuff TSRMLS_CC);
234-
} else {
235-
is_unicode = 0;
236-
}
237-
#else
238151
if (SUCCESS == zend_hash_find(_SERVER, "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME"), (void **) &stuff)) {
239-
#endif
240-
241152
path_info = Z_STRVAL_PP(stuff);
242153
code = Z_STRLEN_PP(stuff);
243154
Z_STRLEN_PP(stuff) = spprintf(&(Z_STRVAL_PP(stuff)), 4096, "phar://%s%s", fname, entry);
244155

245156
MAKE_STD_ZVAL(temp);
246157
ZVAL_STRINGL(temp, path_info, code, 0);
247-
#if PHP_MAJOR_VERSION >= 6
248-
if (is_unicode) {
249-
zval_string_to_unicode(*stuff TSRMLS_CC);
250-
}
251-
#endif
158+
252159
zend_hash_update(_SERVER, "PHAR_SCRIPT_FILENAME", sizeof("PHAR_SCRIPT_FILENAME"), (void *) &temp, sizeof(zval **), NULL);
253160
}
254161
}
@@ -940,11 +847,7 @@ PHP_METHOD(Phar, webPhar)
940847
if (ext) {
941848
++ext;
942849

943-
#if PHP_MAJOR_VERSION >= 6
944-
if (phar_find_key(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val TSRMLS_CC)) {
945-
#else
946850
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) {
947-
#endif
948851
switch (Z_TYPE_PP(val)) {
949852
case IS_LONG:
950853
if (Z_LVAL_PP(val) == PHAR_MIME_PHP || Z_LVAL_PP(val) == PHAR_MIME_PHPS) {
@@ -958,11 +861,6 @@ PHP_METHOD(Phar, webPhar)
958861
RETURN_FALSE;
959862
}
960863
break;
961-
#if PHP_MAJOR_VERSION >= 6
962-
case IS_UNICODE:
963-
zval_unicode_to_string(*(val) TSRMLS_CC);
964-
/* break intentionally omitted */
965-
#endif
966864
case IS_STRING:
967865
mime_type = Z_STRVAL_PP(val);
968866
code = PHAR_MIME_OTHER;
@@ -1013,26 +911,12 @@ PHP_METHOD(Phar, mungServer)
1013911

1014912
for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(mungvalues)); SUCCESS == zend_hash_has_more_elements(Z_ARRVAL_P(mungvalues)); zend_hash_move_forward(Z_ARRVAL_P(mungvalues))) {
1015913
zval **data = NULL;
1016-
#if PHP_MAJOR_VERSION >= 6
1017-
zval *unicopy = NULL;
1018-
#endif
1019914

1020915
if (SUCCESS != zend_hash_get_current_data(Z_ARRVAL_P(mungvalues), (void **) &data)) {
1021916
zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "unable to retrieve array value in Phar::mungServer()");
1022917
return;
1023918
}
1024919

1025-
#if PHP_MAJOR_VERSION >= 6
1026-
if (Z_TYPE_PP(data) == IS_UNICODE) {
1027-
MAKE_STD_ZVAL(unicopy);
1028-
*unicopy = **data;
1029-
zval_copy_ctor(unicopy);
1030-
INIT_PZVAL(unicopy);
1031-
zval_unicode_to_string(unicopy TSRMLS_CC);
1032-
data = &unicopy;
1033-
}
1034-
#endif
1035-
1036920
if (Z_TYPE_PP(data) != IS_STRING) {
1037921
zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME");
1038922
return;
@@ -1054,11 +938,6 @@ PHP_METHOD(Phar, mungServer)
1054938
if (Z_STRLEN_PP(data) == sizeof("SCRIPT_FILENAME")-1 && !strncmp(Z_STRVAL_PP(data), "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME")-1)) {
1055939
PHAR_GLOBALS->phar_SERVER_mung_list |= PHAR_MUNG_SCRIPT_FILENAME;
1056940
}
1057-
#if PHP_MAJOR_VERSION >= 6
1058-
if (unicopy) {
1059-
zval_ptr_dtor(&unicopy);
1060-
}
1061-
#endif
1062941
}
1063942
}
1064943
/* }}} */
@@ -5033,11 +4912,7 @@ PHP_METHOD(PharFileInfo, getContent)
50334912

50344913
phar_seek_efp(link, 0, SEEK_SET, 0, 0 TSRMLS_CC);
50354914
Z_TYPE_P(return_value) = IS_STRING;
5036-
#if PHP_MAJOR_VERSION >= 6
5037-
Z_STRLEN_P(return_value) = php_stream_copy_to_mem(fp, (void **) &(Z_STRVAL_P(return_value)), link->uncompressed_filesize, 0);
5038-
#else
50394915
Z_STRLEN_P(return_value) = php_stream_copy_to_mem(fp, &(Z_STRVAL_P(return_value)), link->uncompressed_filesize, 0);
5040-
#endif
50414916

50424917
if (!Z_STRVAL_P(return_value)) {
50434918
Z_STRVAL_P(return_value) = estrndup("", 0);

‎ext/phar/stream.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -207,30 +207,19 @@ static php_stream * phar_wrapper_open_url(php_stream_wrapper *wrapper, char *pat
207207
fpf = php_stream_alloc(&phar_ops, idata, NULL, mode);
208208
php_url_free(resource);
209209
efree(internal_file);
210-
#if PHP_MAJOR_VERSION >= 6
211-
if (context && context->options && phar_find_key(HASH_OF(context->options), "phar", sizeof("phar"), (void**)&pzoption TSRMLS_CC)) {
212-
#else
210+
213211
if (context && context->options && zend_hash_find(HASH_OF(context->options), "phar", sizeof("phar"), (void**)&pzoption) == SUCCESS) {
214-
#endif
215212
pharcontext = HASH_OF(*pzoption);
216213
if (idata->internal_file->uncompressed_filesize == 0
217214
&& idata->internal_file->compressed_filesize == 0
218-
#if PHP_MAJOR_VERSION >= 6
219-
&& phar_find_key(pharcontext, "compress", sizeof("compress"), (void**)&pzoption TSRMLS_CC)
220-
#else
221215
&& zend_hash_find(pharcontext, "compress", sizeof("compress"), (void**)&pzoption) == SUCCESS
222-
#endif
223216
&& Z_TYPE_PP(pzoption) == IS_LONG
224217
&& (Z_LVAL_PP(pzoption) & ~PHAR_ENT_COMPRESSION_MASK) == 0
225218
) {
226219
idata->internal_file->flags &= ~PHAR_ENT_COMPRESSION_MASK;
227220
idata->internal_file->flags |= Z_LVAL_PP(pzoption);
228221
}
229-
#if PHP_MAJOR_VERSION >= 6
230-
if (phar_find_key(pharcontext, "metadata", sizeof("metadata"), (void**)&pzoption TSRMLS_CC)) {
231-
#else
232222
if (zend_hash_find(pharcontext, "metadata", sizeof("metadata"), (void**)&pzoption) == SUCCESS) {
233-
#endif
234223
if (idata->internal_file->metadata) {
235224
zval_ptr_dtor(&idata->internal_file->metadata);
236225
idata->internal_file->metadata = NULL;

‎ext/phar/tar.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -986,11 +986,8 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
986986
len = -len;
987987
}
988988
user_stub = 0;
989-
#if PHP_MAJOR_VERSION >= 6
990-
if (!(len = php_stream_copy_to_mem(stubfile, (void **) &user_stub, len, 0)) || !user_stub) {
991-
#else
989+
992990
if (!(len = php_stream_copy_to_mem(stubfile, &user_stub, len, 0)) || !user_stub) {
993-
#endif
994991
if (error) {
995992
spprintf(error, 0, "unable to read resource to copy stub to new tar-based phar \"%s\"", phar->fname);
996993
}

‎ext/phar/zip.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -603,11 +603,7 @@ int phar_parse_zipfile(php_stream *fp, char *fname, int fname_len, char *alias,
603603

604604
php_stream_filter_append(&fp->readfilters, filter);
605605

606-
#if PHP_MAJOR_VERSION >= 6
607-
if (!(entry.uncompressed_filesize = php_stream_copy_to_mem(fp, (void **) &actual_alias, entry.uncompressed_filesize, 0)) || !actual_alias) {
608-
#else
609606
if (!(entry.uncompressed_filesize = php_stream_copy_to_mem(fp, &actual_alias, entry.uncompressed_filesize, 0)) || !actual_alias) {
610-
#endif
611607
pefree(entry.filename, entry.is_persistent);
612608
#if PHP_VERSION_ID < 50207
613609
PHAR_ZIP_FAIL("unable to read in alias, truncated (PHP 5.2.7 and newer has a potential fix for this problem)");
@@ -628,11 +624,7 @@ int phar_parse_zipfile(php_stream *fp, char *fname, int fname_len, char *alias,
628624

629625
php_stream_filter_append(&fp->readfilters, filter);
630626

631-
#if PHP_MAJOR_VERSION >= 6
632-
if (!(entry.uncompressed_filesize = php_stream_copy_to_mem(fp, (void **) &actual_alias, entry.uncompressed_filesize, 0)) || !actual_alias) {
633-
#else
634627
if (!(entry.uncompressed_filesize = php_stream_copy_to_mem(fp, &actual_alias, entry.uncompressed_filesize, 0)) || !actual_alias) {
635-
#endif
636628
pefree(entry.filename, entry.is_persistent);
637629
#if PHP_VERSION_ID < 50207
638630
PHAR_ZIP_FAIL("unable to read in alias, truncated (PHP 5.2.7 and newer has a potential fix for this problem)");
@@ -643,11 +635,7 @@ int phar_parse_zipfile(php_stream *fp, char *fname, int fname_len, char *alias,
643635
php_stream_filter_flush(filter, 1);
644636
php_stream_filter_remove(filter, 1 TSRMLS_CC);
645637
} else {
646-
#if PHP_MAJOR_VERSION >= 6
647-
if (!(entry.uncompressed_filesize = php_stream_copy_to_mem(fp, (void **) &actual_alias, entry.uncompressed_filesize, 0)) || !actual_alias) {
648-
#else
649638
if (!(entry.uncompressed_filesize = php_stream_copy_to_mem(fp, &actual_alias, entry.uncompressed_filesize, 0)) || !actual_alias) {
650-
#endif
651639
pefree(entry.filename, entry.is_persistent);
652640
PHAR_ZIP_FAIL("unable to read in alias, truncated");
653641
}
@@ -1252,11 +1240,7 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, long len, int defau
12521240

12531241
user_stub = 0;
12541242

1255-
#if PHP_MAJOR_VERSION >= 6
1256-
if (!(len = php_stream_copy_to_mem(stubfile, (void **) &user_stub, len, 0)) || !user_stub) {
1257-
#else
12581243
if (!(len = php_stream_copy_to_mem(stubfile, &user_stub, len, 0)) || !user_stub) {
1259-
#endif
12601244
if (error) {
12611245
spprintf(error, 0, "unable to read resource to copy stub to new zip-based phar \"%s\"", phar->fname);
12621246
}

0 commit comments

Comments
 (0)