com php-src: fixed white-spaces: Zend/tests/type_declarations /typed_properties_042.phpt Zend/tests/type_decl arations/typed_properties_043.phpt
Zend/tests/typ e_declarations/typed_properties_051.phpt Zend/t ests/type_declarations/typed_properties_052.phpt
Zend/tests/type_declarations/typed_properties_05 4.phpt Zend/tests/type_declarations/typed_properties _056.phpt Zend/tests/type_declarations/types_in
_ast.phpt Zend/zend_execute.c Zend/zend_vm_def .h Z

From: Date: Thu, 26 May 2016 12:24:03 +0000
Subject: com php-src: fixed white-spaces: Zend/tests/type_declarations /typed_properties_042.phpt Zend/tests/type_decl arations/typed_properties_043.phpt
Zend/tests/typ e_declarations/typed_properties_051.phpt Zend/t ests/type_declarations/typed_properties_052.phpt
Zend/tests/type_declarations/typed_properties_05 4.phpt Zend/tests/type_declarations/typed_properties _056.phpt Zend/tests/type_declarations/types_in
_ast.phpt Zend/zend_execute.c Zend/zend_vm_def .h Z
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95502@lists.php.net to get a copy of this message
Commit: fc41cdca81c15a8a7cc048c4178fe03011b95de9 Author: Dmitry Stogov <dmitry@zend.com> Thu, 26 May 2016 15:24:03 +0300 Parents: bf875fb2266037107da421510f4c293a71004ae7 Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fc41cdca81c15a8a7cc048c4178fe03011b95de9 Log: fixed white-spaces Changed paths: M Zend/tests/type_declarations/typed_properties_042.phpt M Zend/tests/type_declarations/typed_properties_043.phpt M Zend/tests/type_declarations/typed_properties_051.phpt M Zend/tests/type_declarations/typed_properties_052.phpt M Zend/tests/type_declarations/typed_properties_054.phpt M Zend/tests/type_declarations/typed_properties_056.phpt M Zend/tests/type_declarations/types_in_ast.phpt M Zend/zend_execute.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h

diff --git a/Zend/tests/type_declarations/typed_properties_042.phpt b/Zend/tests/type_declarations/typed_properties_042.phpt index fdaeab6..0d1f459 100644 --- a/Zend/tests/type_declarations/typed_properties_042.phpt +++ b/Zend/tests/type_declarations/typed_properties_042.phpt @@ -22,4 +22,4 @@ int(5) int(5) int(5) int(5) -int(5) \ No newline at end of file +int(5) diff --git a/Zend/tests/type_declarations/typed_properties_043.phpt b/Zend/tests/type_declarations/typed_properties_043.phpt index ef07d1a..cd4e680 100644 --- a/Zend/tests/type_declarations/typed_properties_043.phpt +++ b/Zend/tests/type_declarations/typed_properties_043.phpt @@ -21,4 +21,4 @@ int(5) int(5) int(5) int(5) -int(5) \ No newline at end of file +int(5) diff --git a/Zend/tests/type_declarations/typed_properties_051.phpt b/Zend/tests/type_declarations/typed_properties_051.phpt index 1556eab..1c8673d 100644 --- a/Zend/tests/type_declarations/typed_properties_051.phpt +++ b/Zend/tests/type_declarations/typed_properties_051.phpt @@ -3,7 +3,7 @@ Weak casts must not leak --FILE-- <?php -class A { +class A { public string $a; } class B { diff --git a/Zend/tests/type_declarations/typed_properties_052.phpt b/Zend/tests/type_declarations/typed_properties_052.phpt index 418db0e..83c1428 100644 --- a/Zend/tests/type_declarations/typed_properties_052.phpt +++ b/Zend/tests/type_declarations/typed_properties_052.phpt @@ -4,7 +4,7 @@ Class properties declared in eval() must not leak <?php eval(<<<'EOF' -class A { +class A { public A $a1; public \B $b1; public Foo\C $c1; diff --git a/Zend/tests/type_declarations/typed_properties_054.phpt b/Zend/tests/type_declarations/typed_properties_054.phpt index 9155bcc..eaef421 100644 --- a/Zend/tests/type_declarations/typed_properties_054.phpt +++ b/Zend/tests/type_declarations/typed_properties_054.phpt @@ -9,4 +9,4 @@ $obj = new A; var_dump($obj); ?> --EXPECTF-- -Fatal error: Default value for properties with callable type can only be a string or an array in %styped_properties_054.php on line 3 \ No newline at end of file +Fatal error: Default value for properties with callable type can only be a string or an array in %styped_properties_054.php on line 3 diff --git a/Zend/tests/type_declarations/typed_properties_056.phpt b/Zend/tests/type_declarations/typed_properties_056.phpt index e6d6e63..4fc7b01 100644 --- a/Zend/tests/type_declarations/typed_properties_056.phpt +++ b/Zend/tests/type_declarations/typed_properties_056.phpt @@ -20,4 +20,4 @@ unset($o); ?> --EXPECT-- Typed property A::$foo must be string, integer used -string(3) "100" \ No newline at end of file +string(3) "100" diff --git a/Zend/tests/type_declarations/types_in_ast.phpt b/Zend/tests/type_declarations/types_in_ast.phpt index 8958735..61268fd 100644 --- a/Zend/tests/type_declarations/types_in_ast.phpt +++ b/Zend/tests/type_declarations/types_in_ast.phpt @@ -1,23 +1,23 @@ ---TEST-- -AST pretty-peinter ---INI-- -zend.assertions=1 -assert.exception=0 ---FILE-- -<?php -assert(0 && ($a = function (int $a, ?int $b, int $c = null): ?int { - $x = new class { - public $a; - public int $b; - public ?int $c; - }; -})); -?> ---EXPECTF-- -Warning: assert(): assert(0 && ($a = function (int $a, ?int $b, int $c = null): ?int { - $x = new class { - public $a; - public int $b; - public ?int $c; - }; -})) failed in %stypes_in_ast.php on line 2 +--TEST-- +AST pretty-peinter +--INI-- +zend.assertions=1 +assert.exception=0 +--FILE-- +<?php +assert(0 && ($a = function (int $a, ?int $b, int $c = null): ?int { + $x = new class { + public $a; + public int $b; + public ?int $c; + }; +})); +?> +--EXPECTF-- +Warning: assert(): assert(0 && ($a = function (int $a, ?int $b, int $c = null): ?int { + $x = new class { + public $a; + public int $b; + public ?int $c; + }; +})) failed in %stypes_in_ast.php on line 2 diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index a4a800a..8dc573a 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1536,13 +1536,13 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object, } ZVAL_COPY_VALUE(z, value); } - + if (EXPECTED(cache_slot)) { prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); } else { prop_info = zend_get_property_info(Z_OBJCE(obj), Z_STR_P(property), 1); } - + if (EXPECTED(prop_info) && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) && UNEXPECTED(prop_info->type)) { @@ -1561,7 +1561,7 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object, Z_OBJ_HT(obj)->write_property(&obj, property, &z_copy, cache_slot); OBJ_RELEASE(Z_OBJ(obj)); zval_ptr_dtor(&z_copy); - return; + return; } ZVAL_DEREF(z); @@ -1615,7 +1615,7 @@ static zend_never_inline void zend_assign_op_overloaded_property(zval *object, z } else { prop_info = zend_get_property_info(Z_OBJCE(obj), Z_STR_P(property), 1); } - + if (EXPECTED(prop_info) && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) && UNEXPECTED(prop_info->type)) { @@ -1630,7 +1630,7 @@ static zend_never_inline void zend_assign_op_overloaded_property(zval *object, z } zval_ptr_dtor(&z_copy); OBJ_RELEASE(Z_OBJ(obj)); - return; + return; } zptr = z; diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index d7fc6f6..8c78af0 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1222,7 +1222,7 @@ ZEND_VM_HELPER(zend_pre_incdec_property_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) && UNEXPECTED(prop_info->type)) { zval tmp, *val; - + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); @@ -1231,12 +1231,12 @@ ZEND_VM_HELPER(zend_pre_incdec_property_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { ZVAL_DEREF(zptr); - + if (OP2_TYPE == IS_CONST) { prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); } else { @@ -1350,7 +1350,7 @@ ZEND_VM_HELPER(zend_post_incdec_property_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) && UNEXPECTED(prop_info->type)) { zval tmp, *val; - + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); if (UNEXPECTED(!val)) { zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); @@ -1359,7 +1359,7 @@ ZEND_VM_HELPER(zend_post_incdec_property_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index e7b5177..baf6b35 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -17963,7 +17963,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -18090,7 +18090,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -23187,7 +23187,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -23314,7 +23314,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -26512,7 +26512,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -26640,7 +26640,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -29494,7 +29494,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -29621,7 +29621,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -33359,7 +33359,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -33486,7 +33486,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -36108,7 +36108,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -36236,7 +36236,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -41386,7 +41386,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -41513,7 +41513,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -48796,7 +48796,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -48923,7 +48923,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -53194,7 +53194,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else { @@ -53322,7 +53322,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { ZVAL_LONG(zptr, ZEND_LONG_MIN); } - } + } } } } else {
« previous php.cvs (#95502) next »