Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  remove TSRMLS_*

diff --cc ext/gd/gd.c
Simple merge

diff --cc ext/intl/locale/locale_methods.c
Simple merge

diff --cc ext/json/json.c
Simple merge

diff --cc ext/mbstring/mbstring.c
Simple merge

diff --cc ext/mcrypt/mcrypt.c
Simple merge

diff --cc ext/opcache/ZendAccelerator.c
index 0a2304bbc9ec9d6cfb06e76b89b43407c7c36ef5,8844da6d591d3e13bf5ce01ef710a919d5628a10..8f936bb5e0f8068164a74978a3fd622fdafc3f70
--- 1/ext/opcache/ZendAccelerator.c
--- 2/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -1775,12 -1767,12 +1775,12 @@@ zend_op_array *persistent_compile_file(
        if (EXPECTED(persistent_script != NULL) &&
            UNEXPECTED(ZCG(accel_directives).validate_permission) &&
            file_handle->type == ZEND_HANDLE_FILENAME &&
 -          UNEXPECTED(access(ZSTR_VAL(persistent_script->full_path), R_OK) != 0)) {
 +          UNEXPECTED(access(ZSTR_VAL(persistent_script->script.filename), R_OK) != 0)) {
                if (type == ZEND_REQUIRE) {
-                       zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename TSRMLS_CC);
+                       zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename);
                        zend_bailout();
                } else {
-                       zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename TSRMLS_CC);
+                       zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename);
                }
                return NULL;
        }

diff --cc ext/pdo/pdo_stmt.c
Simple merge

diff --cc ext/session/mod_files.c
Simple merge

diff --cc ext/snmp/snmp.c
Simple merge

diff --cc ext/sockets/sockets.c
Simple merge

diff --cc ext/xml/xml.c
Simple merge