Allow same original method names if possible to disambiguate with alias

Author: pmmaga

Zend/tests/traits/bug74872a.phpt

@@ -0,0 +1,52 @@
+--TEST--
+Bug #74872 (First Trait wins on importing same methods with diff alias)
+--FILE--
+<?php
+
+trait Trait1 
+{
+    public function init()
+    {
+        echo("Trait1 - init\n");
+    }
+}
+
+trait Trait2 
+{
+    public function init()
+    {
+        echo("Trait2 - init\n");
+    }
+}
+
+class Test 
+{
+    use Trait1 {
+        init as public method1trait1;
+    }
+
+    use Trait2 {
+        init as public method1trait2;
+    }
+
+    final public function __construct()
+    {
+        $this->method1trait1();
+        $this->method1trait2();
+    }
+}
+
+$test = new Test();
+
+$reflection = new ReflectionClass( $test ); 
+
+foreach($reflection->getTraitAliases() as $k => $v)
+{
+    echo $k.' => '.$v."\n";
+}
+?>
+--EXPECT--
+Trait1 - init
+Trait2 - init
+method1trait1 => Trait1::init
+method1trait2 => Trait2::init

Zend/tests/traits/bug74872b.phpt

@@ -0,0 +1,49 @@
+--TEST--
+Bug #74872 (First Trait wins on importing same methods with diff alias)
+--FILE--
+<?php
+
+trait Trait1 
+{
+    public function init()
+    {
+        echo("Trait1 - init\n");
+    }
+}
+
+trait Trait2 
+{
+    public function init()
+    {
+        echo("Trait2 - init\n");
+    }
+}
+
+class Test 
+{
+    use Trait1;
+
+    use Trait2 {
+        init as public method1trait2;
+    }
+
+    final public function __construct()
+    {
+        $this->init();
+        $this->method1trait2();
+    }
+}
+
+$test = new Test();
+
+$reflection = new ReflectionClass( $test ); 
+
+foreach($reflection->getTraitAliases() as $k => $v)
+{
+    echo $k.' => '.$v."\n";
+}
+?>
+--EXPECT--
+Trait1 - init
+Trait2 - init
+method1trait2 => Trait2::init

Zend/tests/traits/error_015.phpt

@@ -14,7 +14,7 @@ trait baz {
 
 class bar {
 	use foo, baz {
-		baz::test as zzz;
+		test as zzz;
 	}
 }
 

Zend/zend_inheritance.c

@@ -1139,7 +1139,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, zend_string* mname, zen
 }
 /* }}} */
 
-static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_string *key, zend_function *fn, HashTable **overriden) /* {{{ */
+static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_string *key, zend_function *fn, uint32_t is_aliased, HashTable **overriden) /* {{{ */
 {
 	zend_function *existing_fn = NULL;
 	zend_function *new_fn;
@@ -1191,7 +1191,10 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
 			}
 			return;
 		} else if (UNEXPECTED(existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT)) {
-			/* two traits can't define the same non-abstract method */
+			/* two traits can't define the same non-abstract method unless they are aliased */
+			if (is_aliased) {
+				return;
+			}
 #if 1
 			zend_error_noreturn(E_COMPILE_ERROR, "Trait method %s has not been applied, because there are collisions with other trait methods on %s",
 				name, ZSTR_VAL(ce->name));
@@ -1239,6 +1242,7 @@ static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, ze
 	zend_trait_alias  *alias, **alias_ptr;
 	zend_string       *lcname;
 	zend_function      fn_copy;
+	uint32_t is_aliased = 0;
 
 	/* aliases which are qualified with a class name won't have any ambiguity. method names try to match with alias->trait_names */
 	if (ce->trait_aliases) {
@@ -1275,8 +1279,9 @@ static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, ze
 					}
 
 					lcname = zend_string_tolower(alias->alias);
-					zend_add_trait_method(ce, ZSTR_VAL(alias->alias), lcname, &fn_copy, overriden);
+					zend_add_trait_method(ce, ZSTR_VAL(alias->alias), lcname, &fn_copy, 0, overriden);
 					zend_string_release(lcname);
+					is_aliased = 1;
 
 					/* Record the trait from which this alias was resolved. */
 					if (!alias->trait_method->ce) {
@@ -1334,7 +1339,7 @@ static int zend_traits_copy_functions(zend_string *fnname, zend_function *fn, ze
 			}
 		}
 
-		zend_add_trait_method(ce, ZSTR_VAL(fn->common.function_name), fnname, &fn_copy, overriden);
+		zend_add_trait_method(ce, ZSTR_VAL(fn->common.function_name), fnname, &fn_copy, is_aliased, overriden);
 	}
 
 	return ZEND_HASH_APPLY_KEEP;