Implementation of static isset/unset code, added numerous tests.

ADDED: zend_compile_string_inline() - Compiles code straight into current op_array.
ADDED: Automatic setting of function purpose for internal functions to ZEND_FNP_UNDEFINED
ADDED: Handling of static self::$a accessor handling.
CHANGE: Changed the way that automated implementations are coded. All automatic implementations are now embeded/built PHP strings run through zend_compile_string_inline(). Performance testing shows excellent performance and the code is 10x simpler.
ADDED: Automatic implementation of isset/unset in the case of no declaration at all, when appropriate.
ADDED: Implementation of static isset/unset code.
CHANGE: pass_two() was modified to catch static gets where there is no getter. Static setters work by converting any class::$a into the getter, then the followup zend_do_assign() backpatches the getter into a setter call. When no zend_do_assign() is made and there is no getter, this is caught in pass_two()
- pass_two() also allows for more accurate error file/line reporting now as well.

Author: cpriest

Zend/zend.c

@@ -691,6 +691,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions TS
 zend_execute_internal=NULL;
 #endif/* HAVE_SYS_SDT_H */
 zend_compile_string=compile_string;
+zend_compile_string_inline=compile_string_inline;
 zend_throw_exception_hook=NULL;
 
 zend_init_opcodes_handlers();

Zend/zend_API.c

@@ -1968,6 +1968,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
 internal_function->function_name= (char*)ptr->fname;
 internal_function->scope=scope;
 internal_function->prototype=NULL;
+internal_function->purpose=ZEND_FNP_UNDEFINED;
 if (ptr->flags) {
 if (!(ptr->flags&ZEND_ACC_PPP_MASK)) {
 if (ptr->flags!=ZEND_ACC_DEPRECATED||scope) {

Zend/zend_compile.c

@@ -36,19 +36,22 @@
 
 #defineIS_ACCESSOR(purpose) ( purpose >= ZEND_FNP_PROP_GETTER && purpose <= ZEND_FNP_PROP_UNSETTER )
 
-#defineMAKE_ZNODE(zn, str)	 \
+#defineINIT_ZNODE(zn) \
 	{ \
  zn.op_type = IS_CONST; \
  INIT_PZVAL(&zn.u.constant); \
- ZVAL_STRINGL(&zn.u.constant, str, strlen(str), 1); \
  zn.EA = 0; \
 	}
+
+#defineMAKE_ZNODE(zn, str) \
+	{ \
+ INIT_ZNODE(zn); \
+ ZVAL_STRINGL(&zn.u.constant, str, strlen(str), 1); \
+	}
 #defineMAKE_ZNODEL(zn, str, l) \
 	{ \
- zn.op_type = IS_CONST; \
- INIT_PZVAL(&zn.u.constant); \
+ INIT_ZNODE(zn); \
  ZVAL_STRINGL(&zn.u.constant, str, l, 1); \
- zn.EA = 0; \
 	}
 
 #defineSET_UNUSED(op) op ## _type = IS_UNUSED
@@ -378,7 +381,8 @@ typedef union _zend_function {
 zend_internal_functioninternal_function;
 } zend_function;
 
-#defineZEND_ACC_NAME(func) &func->common.function_name[5]
+#defineZEND_ACC_NAME(func) zend_get_accessor_name_from_function(func TSRMLS_CC)
+#defineZEND_ACC_NAME_AI(ai) zend_get_accessor_name_from_accessor_info(ai TSRMLS_CC)
 
 typedefstruct_zend_accessor_info {
 zend_uintflags;
@@ -455,6 +459,7 @@ void zend_init_compiler_context(TSRMLS_D);
 
 externZEND_APIzend_op_array*(*zend_compile_file)(zend_file_handle*file_handle, inttypeTSRMLS_DC);
 externZEND_APIzend_op_array*(*zend_compile_string)(zval*source_string, char*filenameTSRMLS_DC);
+externZEND_APIvoid (*zend_compile_string_inline)(zval*source_string, char*filenameTSRMLS_DC);
 
 ZEND_APIintlex_scan(zval*zendlvalTSRMLS_DC);
 voidstartup_scanner(TSRMLS_D);
@@ -545,6 +550,7 @@ void zend_do_handle_exception(TSRMLS_D);
 voidzend_declare_accessor(znode*var_nameTSRMLS_DC);
 voidzend_do_begin_accessor_declaration(znode*function_token, znode*var_name, znode*modifiers, intreturn_referenceTSRMLS_DC);
 voidzend_do_end_accessor_declaration(znode*function_token, znode*var_name, znode*modifiers, constznode*bodyTSRMLS_DC);
+voidzend_finalize_accessor(znode*var_nameTSRMLS_DC);
 
 voidzend_do_begin_lambda_function_declaration(znode*result, znode*function_token, intreturn_reference, intis_staticTSRMLS_DC);
 voidzend_do_fetch_lexical_variable(znode*varname, zend_boolis_refTSRMLS_DC);
@@ -679,6 +685,12 @@ void zend_do_goto(const znode *label TSRMLS_DC);
 voidzend_resolve_goto_label(zend_op_array*op_array, zend_op*opline, intpass2TSRMLS_DC);
 voidzend_release_labels(TSRMLS_D);
 
+constchar*zend_get_accessor_name_from_function(zend_function*funcTSRMLS_DC);
+constchar*zend_get_accessor_name_from_accessor_info(zend_accessor_info*aiTSRMLS_DC);
+zend_accessor_info*zend_get_accessor_info_from_function(zend_function*funcTSRMLS_DC);
+zend_accessor_info*zend_get_accessor_from_init_static_method_call(zend_op_array*op_array, zend_op*opline, constchar**context_name_outTSRMLS_DC);
+
+
 ZEND_APIvoidfunction_add_ref(zend_function*function);
 
 #defineINITIAL_OP_ARRAY_SIZE 64
@@ -688,6 +700,7 @@ ZEND_API void function_add_ref(zend_function *function);
 /* helper functions in zend_language_scanner.l */
 ZEND_APIzend_op_array*compile_file(zend_file_handle*file_handle, inttypeTSRMLS_DC);
 ZEND_APIzend_op_array*compile_string(zval*source_string, char*filenameTSRMLS_DC);
+ZEND_APIvoidcompile_string_inline(zval*source_string, char*filenameTSRMLS_DC);
 ZEND_APIzend_op_array*compile_filename(inttype, zval*filenameTSRMLS_DC);
 ZEND_APIintzend_execute_scripts(inttypeTSRMLS_DC, zval**retval, intfile_count, ...);
 ZEND_APIintopen_file_for_scanning(zend_file_handle*file_handleTSRMLS_DC);

Zend/zend_compile.h

@@ -756,7 +756,7 @@ class_variable_accessor_declarations:
 T_VARIABLE'{'
  { zend_declare_accessor(&$1TSRMLS_CC); CG(accessor_node) = &$1; }
 accessors
- { efree($1.u.constant.value.str.val); }
+ { zend_finalize_accessor(&$1TSRMLS_CC); efree($1.u.constant.value.str.val); }
 '}'
 |class_variable_declaration';'
 ;

Zend/zend_language_parser.y

@@ -779,6 +779,49 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC)
 }
 
 
+voidcompile_string_inline(zval *source_string, char *filename TSRMLS_DC)
+{
+	zend_lex_state original_lex_state;
+	zval tmp;
+int compiler_result;
+	zend_bool original_in_compilation = CG(in_compilation);
+
+if (Z_STRLEN_P(source_string) == 0) {
+return;
+	}
+
+CG(in_compilation) = 1;
+
+	tmp = *source_string;
+zval_copy_ctor(&tmp);
+convert_to_string(&tmp);
+	source_string = &tmp;
+
+zend_save_lexical_state(&original_lex_state TSRMLS_CC);
+if (zend_prepare_string_for_scanning(source_string, filename TSRMLS_CC)==SUCCESS) {
+CG(zend_lineno) = original_lex_state.lineno;
+ zend_bool orig_interactive = CG(interactive);
+
+CG(interactive) = 0;
+CG(interactive) = orig_interactive;
+BEGIN(ST_IN_SCRIPTING);
+ compiler_result = zendparse(TSRMLS_C);
+
+if (SCNG(script_filtered)) {
+efree(SCNG(script_filtered));
+SCNG(script_filtered) = NULL;
+ }
+
+if (compiler_result==1) {
+CG(unclean_shutdown)=1;
+ }
+	}
+zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
+zval_dtor(&tmp);
+CG(in_compilation) = original_in_compilation;
+}
+
+
 BEGIN_EXTERN_C()
 inthighlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC)
 {

Zend/zend_language_scanner.l

@@ -530,8 +530,14 @@ static void zend_check_finally_breakout(zend_op_array *op_array, zend_op *opline
 ZEND_APIintpass_two(zend_op_array*op_arrayTSRMLS_DC)
 {
 zend_op*opline, *end;
+zend_booloriginal_in_compilation=CG(in_compilation);
+char*original_compiled_filename=CG(compiled_filename);
+intoriginal_zend_lineno=CG(zend_lineno);
 
-if (op_array->type!=ZEND_USER_FUNCTION&&op_array->type!=ZEND_EVAL_CODE) {
+if( (op_array->fn_flags&ZEND_ACC_DONE_PASS_TWO) ) {
+return0;
+	}
+if (op_array->type!=ZEND_USER_FUNCTION&&op_array->type!=ZEND_EVAL_CODE) {
 return0;
 	}
 if (CG(compiler_options) &ZEND_COMPILE_EXTENDED_INFO) {
@@ -554,9 +560,13 @@ ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC)
 CG(context).literals_size=op_array->last_literal;
 	}
 
+CG(in_compilation) =1;
+CG(compiled_filename) = (char*)op_array->filename;
+
 opline=op_array->opcodes;
 end=opline+op_array->last;
 while (opline<end) {
+CG(zend_lineno) =opline->lineno;
 if (opline->op1_type==IS_CONST) {
 opline->op1.zv=&op_array->literals[opline->op1.constant].constant;
  }
@@ -613,15 +623,39 @@ ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC)
 opline->opcode=ZEND_GENERATOR_RETURN;
  }
 break;
+caseZEND_INIT_STATIC_METHOD_CALL: {
+/** Is this a call to a static getter, static setters are dependent on static getters (which get backpatched to setter calls), so during compilation
+ * a static getter call may be in the op_array and if no zend_do_assign() has been called to backpatch it, then it's an illegal getter call, this
+ * checks to see that by this point any getter that has not been backpatched, actually exists as a getter, or errors. */
+constchar*context_name;	/* Does not need to be free'd */
+
+zend_accessor_info*ai=zend_get_accessor_from_init_static_method_call(op_array, opline, &context_nameTSRMLS_CC);
+if(ai) {
+if(Z_STRVAL_P(opline->op2.zv)[2] =='g') {
+if(!ai->getter) {
+zend_error_noreturn(E_ERROR, "Cannot get property %s::$%s, no getter defined.", context_name, Z_STRVAL_P(opline->op2.zv)+5);
+ }
+ } elseif (Z_STRVAL_P(opline->op2.zv)[2] =='s') {
+if(!ai->setter) {
+zend_error_noreturn(E_ERROR, "Cannot set property %s::$%s, no setter defined.", context_name, Z_STRVAL_P(opline->op2.zv)+5);
+ }
+ }
+ }
+ }
+break;
  }
 ZEND_VM_SET_OPCODE_HANDLER(opline);
 opline++;
 	}
 
 op_array->fn_flags |= ZEND_ACC_DONE_PASS_TWO;
+CG(in_compilation) =original_in_compilation;
+CG(compiled_filename) =original_compiled_filename;
+CG(zend_lineno) =original_zend_lineno;
 return0;
 }
 
+
 intprint_class(zend_class_entry*class_entryTSRMLS_DC)
 {
 printf("Class %s:\n", class_entry->name);

Zend/zend_opcode.c

@@ -16,4 +16,4 @@ class TimePeriod implements Hours {
 
 ?>
 --EXPECTF--
-Fatal error: Class TimePeriod contains 2 abstract accessors and must be declared abstract or implement the remaining accessors (get Hours::$Hours, set Hours::$Hours) in %s on line %d
+Fatal error: Class TimePeriod contains 4 abstract accessors and must be declared abstract or implement the remaining accessors (get Hours::$Hours, set Hours::$Hours, isset Hours::$Hours, ...) in %s on line %d

tests/classes/accessor_interface_error.phpt

@@ -0,0 +1,19 @@
+--TEST--
+ZE2 Tests that a read-only defined getter produces an error if unset() is attempted
+--FILE--
+<?php
+
+class AccessorTest {
+publicread-only $b {
+ get {
+echo"get AccessorTest::\$b Called.\n";
+return5;
+ }
+	}
+}
+
+$o = newAccessorTest();
+unset($o->b);
+?>
+--EXPECTF--
+Fatal error: Cannot unset read-only property AccessorTest::$b. in %s on line %d

tests/classes/accessors/accessor_object_get_readonly_unset_called_error.phpt

@@ -0,0 +1,17 @@
+--TEST--
+ZE2 Tests that a undefined getter produces an error upon isset()
+--FILE--
+<?php
+
+class AccessorTest {
+public$b {
+ set;
+	}
+}
+
+$o = newAccessorTest();
+
+echo"isset(\$o->b) = ".(int)isset($o->b)."\n";
+?>
+--EXPECTF--
+Fatal error: Cannot get property AccessorTest::$b, no getter defined. in %s on line %d