com php-src: Fix class name prohibition to work for namespaced classes, too: Zend/zend_compile.c

From: Date: Tue, 10 Feb 2015 15:48:05 +0000
Subject: com php-src: Fix class name prohibition to work for namespaced classes, too: Zend/zend_compile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85732@lists.php.net to get a copy of this message
Commit: a03af7ff92f472bd157bbd7b16333c43b61dc418 Author: Andrea Faulds <ajf@ajf.me> Sun, 4 Jan 2015 02:42:54 +0000 Parents: a13d13429ade7a4eb8890c2f19c98abdaf1addbf Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a03af7ff92f472bd157bbd7b16333c43b61dc418 Log: Fix class name prohibition to work for namespaced classes, too Changed paths: M Zend/zend_compile.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 6d792d2..e617af9 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4608,6 +4608,15 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ import_name = zend_hash_find_ptr(CG(current_import), lcname); } + while (info->name) { + if (lcname->len == info->name_len && strcmp(lcname->val, info->name) == 0) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare class %s " + "because %s is a type name", name->val, info->name); + } + info++; + } + + if (CG(current_namespace)) { name = zend_prefix_with_ns(name); @@ -4622,14 +4631,6 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ "because the name is already in use", name->val); } - while (info->name) { - if (lcname->len == info->name_len && strcmp(lcname->val, info->name) == 0) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare class %s " - "because %s is a type name", name->val, info->name); - } - info++; - } - name = zend_new_interned_string(name); lcname = zend_new_interned_string(lcname);

« previous php.cvs (#85732) next »