Skip to content

Remove various deprecated functionality #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

Remove various deprecated functionality #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bdb1929
Remove assignment of new by reference
nikic Sep 10, 2014
375435f
Remove # comments in ini files
nikic Sep 10, 2014
10dd0fe
Remove static calls from incompatible $this context
nikic Sep 10, 2014
07a5615
Remove deprecated mcrypt functions
nikic Sep 10, 2014
3a04b22
Remove unsafe curl file uploads
nikic Sep 10, 2014
f71aaa8
Remove preg_replace /e modifier
nikic Sep 10, 2014
449786c
Remove set_magic_quotes_runtime
nikic Sep 10, 2014
04da716
Remove set_socket_blocking
nikic Sep 10, 2014
9b250ab
Remove string category support in setlocale()
nikic Sep 10, 2014
0e04e04
Remove xsl.security_prefs ini option
nikic Sep 10, 2014
a1acbb8
Remove mktime() and gmmktime() $is_dst parameter
nikic Sep 10, 2014
21c5af7
Remove dl() on fpm-fcgi
nikic Sep 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ UPGRADING.INTERNALS merge=NEWS
/ext/spl/tests/SplArray_fromArray.phpt -crlf
/ext/standard/tests/dir/scandir_variation3.phpt -crlf
/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt -crlf
/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt -crlf
/ext/standard/tests/strings/bug26817.phpt -crlf
/ext/standard/tests/strings/bug26973.phpt -crlf
/ext/standard/tests/strings/bug27457.phpt -crlf
Expand Down
29 changes: 0 additions & 29 deletions Zend/tests/bug45178.phpt
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions Zend/tests/incompat_ctx_user.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ $b->bar();

?>
--EXPECTF--
Deprecated: Non-static method A::foo() should not be called statically, assuming $this from incompatible context in %s on line %d
string(1) "B"
Fatal error: Non-static method A::foo() cannot be called statically, assuming $this from incompatible context in %s on line %d
10 changes: 2 additions & 8 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3936,9 +3936,6 @@ void zend_compile_assign_ref(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ */

if (zend_is_call(source_ast)) {
opline->extended_value = ZEND_RETURNS_FUNCTION;
} else if (source_ast->kind == ZEND_AST_NEW) {
zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated");
opline->extended_value = ZEND_RETURNS_NEW;
}
}
/* }}} */
Expand Down Expand Up @@ -7857,11 +7854,8 @@ void zend_compile_var(znode *result, zend_ast *ast, uint32_t type TSRMLS_DC) /*
if (type == BP_VAR_W || type == BP_VAR_REF
|| type == BP_VAR_RW || type == BP_VAR_UNSET
) {
/* For BC reasons =& new Foo is allowed */
if (type != BP_VAR_REF || ast->kind != ZEND_AST_NEW) {
zend_error_noreturn(E_COMPILE_ERROR,
"Cannot use temporary expression in write context");
}
zend_error_noreturn(E_COMPILE_ERROR,
"Cannot use temporary expression in write context");
}

zend_compile_expr(result, ast TSRMLS_CC);
Expand Down
3 changes: 1 addition & 2 deletions Zend/zend_compile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,8 +671,7 @@ int zend_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC);


#define ZEND_RETURNS_FUNCTION 1<<0
#define ZEND_RETURNS_NEW 1<<1
#define ZEND_RETURNS_VALUE 1<<2
#define ZEND_RETURNS_VALUE 1<<1

#define ZEND_FAST_RET_TO_CATCH 1
#define ZEND_FAST_RET_TO_FINALLY 2
Expand Down
Loading