Merge branch 'PHP-5.6'

Conflicts:
	ext/spl/spl_array.c

diff --cc ext/spl/spl_array.c
index 3e97e9448dfa1c7f772f27c0271b546ac4064f7a,6ee67bfe94f1c7bbf82f5c984303dff1fbf09252..1fe795ce2e4e80e7d18cae2b4452c95dbf3d20f0
--- 1/ext/spl/spl_array.c
--- 2/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@@ -601,9 -601,9 +601,9 @@@ static int spl_array_has_dimension_ex(i
                zend_call_method_with_1_params(&object, Z_OBJCE_P(object), &intern->fptr_offset_has, "offsetExists", &rv, offset_tmp);
                zval_ptr_dtor(&offset_tmp);
  
 -              if (rv && zend_is_true(rv)) {
 +              if (rv && zend_is_true(rv TSRMLS_CC)) {
                        zval_ptr_dtor(&rv);
-                       if (check_empty == 2) {
+                       if (check_empty != 1) {
                                return 1;
                        } else if (intern->fptr_offset_get) {
                                value = spl_array_read_dimension_ex(1, object, offset, BP_VAR_R TSRMLS_CC);
@@@ -658,16 -660,7 +660,7 @@@
                }
        }
  
-       switch (check_empty) {
-               case 0:
-                       return Z_TYPE_P(value) != IS_NULL;
-               case 2:
-                       return 1;
-               case 1:
-                       return zend_is_true(value TSRMLS_CC);
-       }
- 
-       return 0;
 -      return check_empty ? zend_is_true(value) : Z_TYPE_P(value) != IS_NULL;
++      return check_empty ? zend_is_true(value TSRMLS_CC) : Z_TYPE_P(value) != IS_NULL;
  } /* }}} */
  
  static int spl_array_has_dimension(zval *object, zval *offset, int check_empty TSRMLS_DC) /* {{{ */