Add test for typed properties on internal class

Zend/tests/type_declarations/typed_properties_095.phpt

@@ -0,0 +1,84 @@
+--TEST--
+Typed properties in internal classes
+--SKIPIF--
+<?php if (!extension_loaded('zend-test')) die('skip requires zend-test'); ?>
+--FILE--
+<?php
+
+// Internal typed properties
+
+$obj = new _ZendTestClass;
+var_dump($obj->intProp);
+try {
+    $obj->intProp = "foobar";
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+$obj->intProp = 456;
+
+try {
+    $obj->classProp = $obj;
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+$obj->classProp = new stdClass;
+var_dump($obj);
+
+// Inherit from internal class
+
+class Test extends _ZendTestClass {
+}
+
+$obj = new Test;
+var_dump($obj->intProp);
+try {
+    $obj->intProp = "foobar";
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+$obj->intProp = 456;
+
+try {
+    $obj->classProp = $obj;
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+$obj->classProp = new stdClass;
+var_dump($obj);
+
+// Static internal typed properties
+
+var_dump(_ZendTestClass::$staticIntProp);
+try {
+    _ZendTestClass::$staticIntProp = "foobar";
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+_ZendTestClass::$staticIntProp = 456;
+var_dump(_ZendTestClass::$staticIntProp);
+
+?>
+--EXPECT--
+int(123)
+Typed property _ZendTestClass::$intProp must be int, string used
+Typed property _ZendTestClass::$classProp must be an instance of stdClass or null, _ZendTestClass used
+object(_ZendTestClass)#1 (2) {
+  ["intProp"]=>
+  int(456)
+  ["classProp"]=>
+  object(stdClass)#2 (0) {
+  }
+}
+int(123)
+Typed property _ZendTestClass::$intProp must be int, string used
+Typed property _ZendTestClass::$classProp must be an instance of stdClass or null, Test used
+object(Test)#4 (2) {
+  ["intProp"]=>
+  int(456)
+  ["classProp"]=>
+  object(stdClass)#1 (0) {
+  }
+}
+int(123)
+Typed property _ZendTestClass::$staticIntProp must be int, string used
+int(456)

Zend/zend.c

@@ -1022,7 +1022,6 @@ int zend_post_startup(void) /* {{{ */
 	global_persistent_list = &EG(persistent_list);
 	zend_copy_ini_directives();
 #else
-	zend_resolve_property_types();
 	global_map_ptr_last = CG(map_ptr_last);
 #endif
 

ext/zend_test/test.c

@@ -137,6 +137,7 @@ ZEND_FUNCTION(zend_leak_variable)
 
 static zend_object *zend_test_class_new(zend_class_entry *class_type) /* {{{ */ {
 	zend_object *obj = zend_objects_new(class_type);
+	object_properties_init(obj, class_type);
 	obj->handlers = &zend_test_class_handlers;
 	return obj;
 }
@@ -203,6 +204,36 @@ PHP_MINIT_FUNCTION(zend_test)
 
 	zend_declare_property_null(zend_test_class, "_StaticProp", sizeof("_StaticProp") - 1, ZEND_ACC_STATIC);
 
+	{
+		zend_string *name = zend_string_init("intProp", sizeof("intProp") - 1, 1);
+		zval val;
+		ZVAL_LONG(&val, 123);
+		zend_declare_typed_property(
+			zend_test_class, name, &val, ZEND_ACC_PUBLIC, NULL, ZEND_TYPE_ENCODE(IS_LONG, 0));
+		zend_string_release(name);
+	}
+
+	{
+		zend_string *name = zend_string_init("classProp", sizeof("classProp") - 1, 1);
+		zend_string *class_name = zend_string_init("stdClass", sizeof("stdClass") - 1, 1);
+		zval val;
+		ZVAL_NULL(&val);
+		zend_declare_typed_property(
+			zend_test_class, name, &val, ZEND_ACC_PUBLIC, NULL,
+			ZEND_TYPE_ENCODE_CLASS(class_name, 1));
+		zend_string_release(name);
+	}
+
+	{
+		zend_string *name = zend_string_init("staticIntProp", sizeof("staticIntProp") - 1, 1);
+		zval val;
+		ZVAL_LONG(&val, 123);
+		zend_declare_typed_property(
+			zend_test_class, name, &val, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC, NULL,
+			ZEND_TYPE_ENCODE(IS_LONG, 0));
+		zend_string_release(name);
+	}
+
 	INIT_CLASS_ENTRY(class_entry, "_ZendTestChildClass", NULL);
 	zend_test_child_class = zend_register_internal_class_ex(&class_entry, zend_test_class);