review

Author: ndossche

Zend/tests/constexpr/constant_expressions_cast.phpt

@@ -14,11 +14,15 @@ const T5 = (float) 5;
 const T6 = (array) "";
 const T7 = (array) var_dump(...);
 const T8 = (array) new X;
+const T9 = (array) new DateTime;
+const T10 = (int) new DateTime;
 
-var_dump(T1, T2, T3, T4, T5, T6, T7, T8);
+var_dump(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10);
 ?>
 --EXPECTF--
 Warning: Array to string conversion in %s on line %d
+
+Warning: Object of class DateTime could not be converted to int in %s on line %d
 int(0)
 bool(true)
 string(5) "Array"
@@ -49,3 +53,12 @@ array(1) {
   ["foo"]=>
   int(3)
 }
+array(3) {
+  ["date"]=>
+  string(%d) "%s"
+  ["timezone_type"]=>
+  int(%d)
+  ["timezone"]=>
+  string(%d) "%s"
+}
+int(1)

Zend/tests/constexpr/constant_expressions_cast_object_property.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Constant expressions with object cast in property
+--FILE--
+<?php
+class X {
+    public $foo = (object) [];
+}
+?>
+--EXPECTF--
+Fatal error: Object casts are not supported in this context in %s on line %d

Zend/zend_ast.c

@@ -736,14 +736,21 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 							} else {
 								ZVAL_EMPTY_ARRAY(result);
 							}
-						} else {
-							/* Constant AST only allows building stdClass objects, closures, or user classes;
-							 * all of which should be compatible. */
-							ZEND_ASSERT(ZEND_STD_BUILD_OBJECT_PROPERTIES_ARRAY_COMPATIBLE(&op1));
-
-							/* Optimized version without rebuilding properties HashTable */
+						} else if (ZEND_STD_BUILD_OBJECT_PROPERTIES_ARRAY_COMPATIBLE(&op1)) {
 							ZVAL_ARR(result, zend_std_build_object_properties_array(Z_OBJ(op1)));
 							zval_ptr_dtor_nogc(&op1);
+						} else {
+							HashTable *obj_ht = zend_get_properties_for(&op1, ZEND_PROP_PURPOSE_ARRAY_CAST);
+							if (obj_ht) {
+								ZVAL_ARR(result, zend_proptable_to_symtable(obj_ht,
+									(Z_OBJCE(op1)->default_properties_count ||
+									 Z_OBJ(op1)->handlers != &std_object_handlers ||
+									 GC_IS_RECURSIVE(obj_ht))));
+								zend_release_properties(obj_ht);
+							} else {
+								ZVAL_EMPTY_ARRAY(result);
+							}
+							zval_ptr_dtor_nogc(&op1);
 						}
 						break;
 					case IS_OBJECT:

Zend/zend_compile.c

@@ -11431,6 +11431,12 @@ static void zend_compile_const_expr(zend_ast **ast_ptr, void *context) /* {{{ */
 		case ZEND_AST_MAGIC_CONST:
 			zend_compile_const_expr_magic_const(ast_ptr);
 			break;
+		case ZEND_AST_CAST:
+			if (ast->attr == IS_OBJECT && !ctx->allow_dynamic) {
+				zend_error_noreturn(E_COMPILE_ERROR,
+					"Object casts are not supported in this context");
+			}
+			break;
 		case ZEND_AST_NEW:
 			if (!ctx->allow_dynamic) {
 				zend_error_noreturn(E_COMPILE_ERROR,