Merge pull request #1684 from spiroski/v2.4.x

Fix PHP7 error "Cannot use 'String' as a class name".
doctrine-extensions · Oct 11, 2016 · a7f7243 · a7f7243
2 parents 2664e22 + c3976d4
commit a7f7243
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/Gedmo/Translatable/Document/MappedSuperclass/AbstractPersonalTranslation.php b/lib/Gedmo/Translatable/Document/MappedSuperclass/AbstractPersonalTranslation.php
@@ -21,7 +21,7 @@ abstract class AbstractPersonalTranslation
     /**
      * @var string $locale
      *
-     * @MongoODM\String
+     * @MongoODM\Field(type="string")
      */
     protected $locale;
 
@@ -34,14 +34,14 @@ abstract class AbstractPersonalTranslation
     /**
      * @var string $field
      *
-     * @MongoODM\String
+     * @MongoODM\Field(type="string")
      */
     protected $field;
 
     /**
      * @var string $content
      *
-     * @MongoODM\String
+     * @MongoODM\Field(type="string")
      */
     protected $content;
 

diff --git a/lib/Gedmo/Translatable/Document/MappedSuperclass/AbstractTranslation.php b/lib/Gedmo/Translatable/Document/MappedSuperclass/AbstractTranslation.php
@@ -21,35 +21,35 @@ abstract class AbstractTranslation
     /**
      * @var string $locale
      *
-     * @MongoODM\String
+     * @MongoODM\Field(type="string")
      */
     protected $locale;
 
     /**
      * @var string $objectClass
      *
-     * @MongoODM\String
+     * @MongoODM\Field(type="string")
      */
     protected $objectClass;
 
     /**
      * @var string $field
      *
-     * @MongoODM\String
+     * @MongoODM\Field(type="string")
      */
     protected $field;
 
     /**
      * @var string $foreignKey
      *
-     * @MongoODM\String(name="foreign_key")
+     * @MongoODM\Field(type="string", name="foreign_key")
      */
     protected $foreignKey;
 
     /**
      * @var string $content
      *
-     * @MongoODM\String
+     * @MongoODM\Field(type="string")
      */
     protected $content;