forked from doctrine/annotations
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix for issue doctrine#81 Traits Composed from Traits
Use statements are now also imported for properties and methods from traits in traits. Conflict resolution and aliases are respected. For backwards compatibility reasons the use statements from the declaring class are still merged. PHP itself does not show this behaviour regarding to imported types in traits.
- Loading branch information
Hidde Boomsma
committed
Oct 27, 2016
1 parent
e1dd28b
commit 2dc9b9b
Showing
8 changed files
with
163 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
tests/Doctrine/Tests/Common/Annotations/Fixtures/Traits/ConflictTraitA.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<?php | ||
|
||
namespace Doctrine\Tests\Common\Annotations\Fixtures\Traits; | ||
|
||
use Doctrine\Tests\Common\Annotations\Fixtures\Annotation\Template; | ||
|
||
trait ConflictTraitA | ||
{ | ||
/** | ||
* @Template | ||
*/ | ||
public function conflict(){} | ||
} |
13 changes: 13 additions & 0 deletions
13
tests/Doctrine/Tests/Common/Annotations/Fixtures/Traits/ConflictTraitB.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<?php | ||
|
||
namespace Doctrine\Tests\Common\Annotations\Fixtures\Traits; | ||
|
||
use Doctrine\Tests\Common\Annotations\Fixtures\Annotation\Route; | ||
|
||
trait ConflictTraitB | ||
{ | ||
/** | ||
* @Route | ||
*/ | ||
public function conflict(){} | ||
} |
13 changes: 13 additions & 0 deletions
13
tests/Doctrine/Tests/Common/Annotations/Fixtures/Traits/ConflictTraitC.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<?php | ||
|
||
namespace Doctrine\Tests\Common\Annotations\Fixtures\Traits; | ||
|
||
use Doctrine\Tests\Common\Annotations\Fixtures\Annotation\Autoload; | ||
|
||
trait ConflictTraitC | ||
{ | ||
/** | ||
* @Autoload | ||
*/ | ||
public function conflict(){} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters