From: Christoph M. Becker <cmb@php.net>
Date: Tue, 5 Jul 2016 14:43:39 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha3~2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0150950425710bc84249c38fb09a9031f19fba0;p=php

Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
#	ext/spl/spl_directory.c
---

c0150950425710bc84249c38fb09a9031f19fba0
diff --cc ext/spl/spl_directory.c
index 412fc54324,8613c9302c..6a49d973e3
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@@ -653,19 -662,17 +653,19 @@@ static HashTable *spl_filesystem_object
  }
  /* }}} */
  
 -zend_function *spl_filesystem_object_get_method_check(zval **object_ptr, char *method, int method_len, const struct _zend_literal *key TSRMLS_DC) /* {{{ */
 +zend_function *spl_filesystem_object_get_method_check(zend_object **object, zend_string *method, const zval *key) /* {{{ */
  {
 -	spl_filesystem_object *fsobj = zend_object_store_get_object(*object_ptr TSRMLS_CC);
 +	spl_filesystem_object *fsobj = spl_filesystem_from_obj(*object);
  
- 	if (fsobj->u.dir.entry.d_name[0] == '\0' && fsobj->orig_path == NULL) {
+ 	if (fsobj->u.dir.dirp == NULL && fsobj->orig_path == NULL) {
 -		method = "_bad_state_ex";
 -		method_len = sizeof("_bad_state_ex") - 1;
 -		key = NULL;
 +		zend_function *func;
 +		zend_string *tmp = zend_string_init("_bad_state_ex", sizeof("_bad_state_ex") - 1, 0);
 +		func = zend_get_std_object_handlers()->get_method(object, tmp, NULL);
 +		zend_string_release(tmp);
 +		return func;
  	}
  
 -	return zend_get_std_object_handlers()->get_method(object_ptr, method, method_len, key TSRMLS_CC);
 +	return zend_get_std_object_handlers()->get_method(object, method, key);
  }
  /* }}} */