From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 20 Jun 2008 17:17:05 +0000 (+0000)
Subject: Allowed to override internal classaes with "use"
X-Git-Tag: php-5.3.0alpha1~694
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=298087c74b9ed8b1962586cc7f3ab3c093878056;p=php

Allowed to override internal classaes with "use"
---

diff --git a/Zend/tests/ns_066.phpt b/Zend/tests/ns_066.phpt
new file mode 100644
index 0000000000..3a7d9a521f
--- /dev/null
+++ b/Zend/tests/ns_066.phpt
@@ -0,0 +1,10 @@
+--TEST--
+066: Name ambiguity (import name & internal class name)
+--FILE--
+<?php
+include __DIR__ . '/ns_027.inc';
+use Foo::Bar::Foo as stdClass;
+
+new stdClass();
+--EXPECT--
+Foo::Bar::Foo
diff --git a/Zend/tests/ns_067.inc b/Zend/tests/ns_067.inc
new file mode 100644
index 0000000000..09327b276d
--- /dev/null
+++ b/Zend/tests/ns_067.inc
@@ -0,0 +1,3 @@
+<?php
+use Foo::Bar::Foo as Test;
+new Test();
diff --git a/Zend/tests/ns_067.phpt b/Zend/tests/ns_067.phpt
new file mode 100644
index 0000000000..c5096278db
--- /dev/null
+++ b/Zend/tests/ns_067.phpt
@@ -0,0 +1,9 @@
+--TEST--
+067: Name ambiguity (import name & internal class name)
+--FILE--
+<?php
+include __DIR__ . '/ns_022.inc';
+include __DIR__ . '/ns_027.inc';
+include __DIR__ . '/ns_067.inc';
+--EXPECT--
+Foo::Bar::Foo
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 8580e35bef..00f8c11d7c 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4959,6 +4959,7 @@ void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{
 	char *lcname;
 	zval *name, *ns, tmp;
 	zend_bool warn = 0;
+	zend_class_entry **pce;
 
 	if (!CG(current_import)) {
 		CG(current_import) = emalloc(sizeof(HashTable));
@@ -5012,7 +5013,9 @@ void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{
 			efree(tmp);
 		}
 		efree(ns_name);
-	} else if (zend_hash_exists(CG(class_table), lcname, Z_STRLEN_P(name)+1)) {
+	} else if (zend_hash_find(CG(class_table), lcname, Z_STRLEN_P(name)+1, (void**)&pce) == SUCCESS &&
+	           (*pce)->type == ZEND_USER_CLASS &&
+	           (*pce)->filename == CG(compiled_filename)) {
 		char *tmp = zend_str_tolower_dup(Z_STRVAL_P(ns), Z_STRLEN_P(ns));
 
 		if (Z_STRLEN_P(ns) != Z_STRLEN_P(name) ||