change odm string annotation to field with type string

doctrine-extensions · Jul 30, 2016 · 24cd861 · 24cd861
1 parent a5a5ee1
commit 24cd861
Show file tree

Hide file tree

Showing 54 changed files with 99 additions and 99 deletions.
diff --git a/doc/blameable.md b/doc/blameable.md
@@ -280,22 +280,22 @@ class Article
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 
     /**
      * @var string $createdBy
      *
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\Blameable(on="create")
      */
     private $createdBy;
 
     /**
      * @var string $updatedBy
      *
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\Blameable
      */
     private $updatedBy;

diff --git a/doc/ip_traceable.md b/doc/ip_traceable.md
@@ -179,22 +179,22 @@ class Article
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 
     /**
      * @var string $createdFromIp
      *
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\IpTraceable(on="create")
      */
     private $createdFromIp;
 
     /**
      * @var string $updatedFromIp
      *
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\IpTraceable
      */
     private $updatedFromIp;

diff --git a/doc/loggable.md b/doc/loggable.md
@@ -129,7 +129,7 @@ class Article
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\Versioned
      */
     private $title;

diff --git a/doc/reference_integrity.md b/doc/reference_integrity.md
@@ -62,7 +62,7 @@ class Type
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 

diff --git a/doc/references.md b/doc/references.md
@@ -67,7 +67,7 @@ class Product
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $name;
 

diff --git a/doc/sluggable.md b/doc/sluggable.md
@@ -198,18 +198,18 @@ class Article
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $code;
 
     /**
      * @Gedmo\Slug(fields={"title", "code"})
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $slug;
 

diff --git a/doc/timestampable.md b/doc/timestampable.md
@@ -185,12 +185,12 @@ class Article
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $body;
 

diff --git a/doc/translatable.md b/doc/translatable.md
@@ -191,13 +191,13 @@ class Article implements Translatable
 
     /**
      * @Gedmo\Translatable
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 
     /**
      * @Gedmo\Translatable
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $content;
 

diff --git a/lib/Gedmo/Blameable/Traits/BlameableDocument.php b/lib/Gedmo/Blameable/Traits/BlameableDocument.php
@@ -16,14 +16,14 @@ trait BlameableDocument
     /**
      * @var string
      * @Gedmo\Blameable(on="create")
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     protected $createdBy;
 
     /**
      * @var string
      * @Gedmo\Blameable(on="update")
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     protected $updatedBy;
 

diff --git a/lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php b/lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php
@@ -16,14 +16,14 @@ trait IpTraceableDocument
     /**
      * @var string
      * @Gedmo\IpTraceable(on="create")
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     protected $createdFromIp;
 
     /**
      * @var string
      * @Gedmo\IpTraceable(on="update")
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     protected $updatedFromIp;
 

diff --git a/lib/Gedmo/Translator/Document/Translation.php b/lib/Gedmo/Translator/Document/Translation.php
@@ -5,7 +5,7 @@
 use Gedmo\Translator\Translation as BaseTranslation;
 use Doctrine\ODM\MongoDB\Mapping\Annotations\MappedSuperclass;
 use Doctrine\ODM\MongoDB\Mapping\Annotations\Id;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\String as MongoString;
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 
 /**
  * Document translation class.
@@ -25,21 +25,21 @@ abstract class Translation extends BaseTranslation
     /**
      * @var string $locale
      *
-     * @MongoString
+     * @ODM\Field(type="string")
      */
     protected $locale;
 
     /**
      * @var string $property
      *
-     * @MongoString
+     * @ODM\Field(type="string")
      */
     protected $property;
 
     /**
      * @var string $value
      *
-     * @MongoString
+     * @ODM\Field(type="string")
      */
     protected $value;
 

diff --git a/tests/Gedmo/Blameable/Fixture/Document/Article.php b/tests/Gedmo/Blameable/Fixture/Document/Article.php
@@ -14,7 +14,7 @@ class Article
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 
@@ -26,15 +26,15 @@ class Article
     /**
      * @var string $created
      *
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\Blameable(on="create")
      */
     private $created;
 
     /**
      * @var string $updated
      *
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\Blameable
      */
     private $updated;
@@ -48,7 +48,7 @@ class Article
     /**
      * @var string $published
      *
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\Blameable(on="change", field="type.title", value="Published")
      */
     private $published;

diff --git a/tests/Gedmo/Blameable/Fixture/Document/Type.php b/tests/Gedmo/Blameable/Fixture/Document/Type.php
@@ -13,12 +13,12 @@ class Type
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $identifier;
 

diff --git a/tests/Gedmo/Blameable/Fixture/Document/User.php b/tests/Gedmo/Blameable/Fixture/Document/User.php
@@ -13,7 +13,7 @@ class User
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $username;
 

diff --git a/tests/Gedmo/IpTraceable/Fixture/Document/Article.php b/tests/Gedmo/IpTraceable/Fixture/Document/Article.php
@@ -14,7 +14,7 @@ class Article
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 
@@ -26,30 +26,30 @@ class Article
     /**
      * @var string $created
      *
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\IpTraceable(on="create")
      */
     private $created;
 
     /**
      * @var string $updated
      *
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\IpTraceable
      */
     private $updated;
 
     /**
      * @var string $published
      *
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\IpTraceable(on="change", field="type.title", value="Published")
      */
     private $published;
 
     /**
      * @var string
-     * @ODM\String
+     * @ODM\Field(type="string")
      * @Gedmo\IpTraceable(on="change", field="isReady", value=true)
      */
     private $ready;

diff --git a/tests/Gedmo/IpTraceable/Fixture/Document/Type.php b/tests/Gedmo/IpTraceable/Fixture/Document/Type.php
@@ -13,12 +13,12 @@ class Type
     private $id;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 
     /**
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $identifier;
 

diff --git a/tests/Gedmo/Loggable/Fixture/Document/Article.php b/tests/Gedmo/Loggable/Fixture/Document/Article.php
@@ -16,7 +16,7 @@ class Article
 
     /**
      * @Gedmo\Versioned
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 

diff --git a/tests/Gedmo/Loggable/Fixture/Document/Author.php b/tests/Gedmo/Loggable/Fixture/Document/Author.php
@@ -13,13 +13,13 @@ class Author
 {
     /**
      * @Gedmo\Versioned
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $name;
 
     /**
      * @Gedmo\Versioned
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $email;
 

diff --git a/tests/Gedmo/Loggable/Fixture/Document/Comment.php b/tests/Gedmo/Loggable/Fixture/Document/Comment.php
@@ -18,13 +18,13 @@ class Comment
 
     /**
      * @Gedmo\Versioned
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $subject;
 
     /**
      * @Gedmo\Versioned
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $message;
 

diff --git a/tests/Gedmo/Loggable/Fixture/Document/RelatedArticle.php b/tests/Gedmo/Loggable/Fixture/Document/RelatedArticle.php
@@ -18,13 +18,13 @@ class RelatedArticle
 
     /**
      * @Gedmo\Versioned
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $title;
 
     /**
      * @Gedmo\Versioned
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $content;
 

diff --git a/tests/Gedmo/Mapping/Fixture/Document/User.php b/tests/Gedmo/Mapping/Fixture/Document/User.php
@@ -17,13 +17,13 @@ class User
 
     /**
      * @Ext\Encode(type="sha1", secret="xxx")
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $name;
 
     /**
      * @Ext\Encode(type="md5")
-     * @ODM\String
+     * @ODM\Field(type="string")
      */
     private $password;