From ff30b934441a4cd9a5ddb3de3c32fbd6eeb588bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sat, 15 Nov 2014 20:19:46 +0100 Subject: [PATCH] Fix traits use statements. --- doc/blameable.md | 5 ----- doc/ip_traceable.md | 5 ----- doc/timestampable.md | 5 ----- lib/Gedmo/Blameable/Traits/BlameableDocument.php | 1 + lib/Gedmo/Blameable/Traits/BlameableEntity.php | 1 + lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php | 1 + lib/Gedmo/IpTraceable/Traits/IpTraceableEntity.php | 1 + lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php | 2 ++ lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php | 2 ++ lib/Gedmo/Timestampable/Traits/TimestampableDocument.php | 1 + lib/Gedmo/Timestampable/Traits/TimestampableEntity.php | 1 + lib/Gedmo/Tree/Traits/NestedSetEntity.php | 1 + 12 files changed, 11 insertions(+), 15 deletions(-) diff --git a/doc/blameable.md b/doc/blameable.md index 6197e8e452..aa0854c57b 100644 --- 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 index 2079a531ca..a0b1f9431e 100644 --- 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 index 59bcc69c61..21e2840179 100644 --- 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 index 738318c7fa..4daa0bcf6d 100644 --- 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 index 3ac9794bbc..f0489a0c8d 100644 --- 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 index 9e1cec5068..ca34c5f386 100644 --- 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 index db27a1d182..ce03f40502 100644 --- 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 index 8492b98675..c283a6819c 100644 --- 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 index 77ffb85f79..d82fcf4471 100644 --- 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 index 2a91fdc028..48dd92e0b6 100644 --- 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 index d8833d3f95..9f638c9ac7 100644 --- 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 index a61564abef..df94cd0519 100644 --- 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; /**