Merge pull request doctrine-extensions#1189 from dunglas/traits

Fix traits use statements
mmetayer · Jan 29, 2015 · acbf585 · acbf585
2 parents 5e19886 + ff30b93
commit acbf585
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 15 deletions.
diff --git a/doc/blameable.md b/doc/blameable.md
@@ -612,7 +612,6 @@ to use the Traits provided by extensions.
 namespace Blameable\Fixture;
 
 use Gedmo\Blameable\Traits\BlameableEntity;
-use Gedmo\Mapping\Annotation as Gedmo;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -640,10 +639,6 @@ class UsingTrait
 }
 ```
 
-**Note:** you must import **Gedmo\Mapping\Annotation as Gedmo** and **Doctrine\ORM\Mapping as ORM**
-annotations. If you use mongodb ODM import **Doctrine\ODM\MongoDB\Mapping\Annotations as ODM** and
-**BlameableDocument** instead.
-
 The Traits are very simplistic - if you use different field names it is recommended to simply create your
 own Traits specific to your project. The ones provided by this bundle can be used as example.
 
diff --git a/doc/ip_traceable.md b/doc/ip_traceable.md
@@ -521,7 +521,6 @@ to use the Traits provided by extensions.
 namespace IpTraceable\Fixture;
 
 use Gedmo\IpTraceable\Traits\IpTraceableEntity;
-use Gedmo\Mapping\Annotation as Gedmo;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -549,10 +548,6 @@ class UsingTrait
 }
 ```
 
-**Note:** you must import **Gedmo\Mapping\Annotation as Gedmo** and **Doctrine\ORM\Mapping as ORM**
-annotations. If you use mongodb ODM import **Doctrine\ODM\MongoDB\Mapping\Annotations as ODM** and
-**IpTraceableDocument** instead.
-
 The Traits are very simplistic - if you use different field names it is recommended to simply create your
 own Traits specific to your project. The ones provided by this bundle can be used as example.
 

diff --git a/doc/timestampable.md b/doc/timestampable.md
@@ -648,7 +648,6 @@ to use the Traits provided by extensions.
 namespace Timestampable\Fixture;
 
 use Gedmo\Timestampable\Traits\TimestampableEntity;
-use Gedmo\Mapping\Annotation as Gedmo;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -676,10 +675,6 @@ class UsingTrait
 }
 ```
 
-**Note:** you must import **Gedmo\Mapping\Annotation as Gedmo** and **Doctrine\ORM\Mapping as ORM**
-annotations. If you use mongodb ODM import **Doctrine\ODM\MongoDB\Mapping\Annotations as ODM** and
-**TimestampableDocument** instead.
-
 Traits are very simple and if you use different field names I recommend to simply create your
 own ones based per project. These ones are standing as an example.
 
diff --git a/lib/Gedmo/Blameable/Traits/BlameableDocument.php b/lib/Gedmo/Blameable/Traits/BlameableDocument.php
@@ -2,6 +2,7 @@
 
 namespace Gedmo\Blameable\Traits;
 
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**

diff --git a/lib/Gedmo/Blameable/Traits/BlameableEntity.php b/lib/Gedmo/Blameable/Traits/BlameableEntity.php
@@ -2,6 +2,7 @@
 
 namespace Gedmo\Blameable\Traits;
 
+use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**

diff --git a/lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php b/lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php
@@ -2,6 +2,7 @@
 
 namespace Gedmo\IpTraceable\Traits;
 
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**

diff --git a/lib/Gedmo/IpTraceable/Traits/IpTraceableEntity.php b/lib/Gedmo/IpTraceable/Traits/IpTraceableEntity.php
@@ -2,6 +2,7 @@
 
 namespace Gedmo\IpTraceable\Traits;
 
+use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**

diff --git a/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php b/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php
@@ -2,6 +2,8 @@
 
 namespace Gedmo\SoftDeleteable\Traits;
 
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+
 /**
  * SoftDeletable Trait, usable with PHP >= 5.4
  *

diff --git a/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php b/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php
@@ -2,6 +2,8 @@
 
 namespace Gedmo\SoftDeleteable\Traits;
 
+use Doctrine\ORM\Mapping as ORM;
+
 /**
  * SoftDeletable Trait, usable with PHP >= 5.4
  *

diff --git a/lib/Gedmo/Timestampable/Traits/TimestampableDocument.php b/lib/Gedmo/Timestampable/Traits/TimestampableDocument.php
@@ -2,6 +2,7 @@
 
 namespace Gedmo\Timestampable\Traits;
 
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**

diff --git a/lib/Gedmo/Timestampable/Traits/TimestampableEntity.php b/lib/Gedmo/Timestampable/Traits/TimestampableEntity.php
@@ -2,6 +2,7 @@
 
 namespace Gedmo\Timestampable\Traits;
 
+use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**

diff --git a/lib/Gedmo/Tree/Traits/NestedSetEntity.php b/lib/Gedmo/Tree/Traits/NestedSetEntity.php
@@ -2,6 +2,7 @@
 
 namespace Gedmo\Tree\Traits;
 
+use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     namespace Gedmo\Blameable\Traits;
+    use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
     use Gedmo\Mapping\Annotation as Gedmo;
     /**
@@ Expand Down @@