Merge pull request #614 from paulandrieux/bugfix/613-detach-with-seo

don't use Gedmo Translatable anymore
Victoire · Sep 14, 2016 · 13d5d26 · 13d5d26
2 parents 8d71be5 + 9012ae7
commit 13d5d26
Showing 1 changed file with 0 additions and 26 deletions.
diff --git a/Bundle/SeoBundle/Entity/PageSeo.php b/Bundle/SeoBundle/Entity/PageSeo.php
@@ -3,7 +3,6 @@
 namespace Victoire\Bundle\SeoBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Gedmo\Mapping\Annotation as Gedmo;
 use Knp\DoctrineBehaviors\Model\Translatable\Translatable;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -34,7 +33,6 @@ class PageSeo
      *
      * @ORM\Column(name="meta_title", type="string", nullable=true)
      * @Assert\Length(max = 60)
-     * @Gedmo\Translatable
      */
     protected $metaTitle;
 
@@ -43,39 +41,34 @@ class PageSeo
      *
      * @ORM\Column(name="meta_description", type="string", length=255, nullable=true)
      * @Assert\Length(max = 155)
-     * @Gedmo\Translatable
      */
     protected $metaDescription;
 
     /**
      * @var string
      *
      * @ORM\Column(name="rel_author", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $relAuthor;
 
     /**
      * @var string
      *
      * @ORM\Column(name="rel_publisher", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $relPublisher;
 
     /**
      * @var string
      *
      * @ORM\Column(name="ogTitle", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $ogTitle;
 
     /**
      * @var string
      *
      * @ORM\Column(name="ogType", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $ogType;
 
@@ -91,39 +84,34 @@ class PageSeo
      * @var string
      *
      * @ORM\Column(name="ogUrl", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $ogUrl;
 
     /**
      * @var text
      *
      * @ORM\Column(name="ogDescription", type="text", nullable=true)
-     * @Gedmo\Translatable
      */
     protected $ogDescription;
 
     /**
      * @var string
      *
      * @ORM\Column(name="fbAdmins", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $fbAdmins;
 
     /**
      * @var string
      *
      * @ORM\Column(name="twitterCard", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $twitterCard = 'summary';
 
     /**
      * @var string
      *
      * @ORM\Column(name="twitterUrl", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      * @Assert\Length(max = 15)
      */
     protected $twitterUrl;
@@ -132,7 +120,6 @@ class PageSeo
      * @var string
      *
      * @ORM\Column(name="twitterCreator", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      * @Assert\Length(max = 15)
      */
     protected $twitterCreator;
@@ -141,7 +128,6 @@ class PageSeo
      * @var string
      *
      * @ORM\Column(name="twitterTitle", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      * @Assert\Length(max = 70)
      */
     protected $twitterTitle;
@@ -150,7 +136,6 @@ class PageSeo
      * @var string
      *
      * @ORM\Column(name="twitterDescription", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      * @Assert\Length(max = 200)
      */
     protected $twitterDescription;
@@ -167,23 +152,20 @@ class PageSeo
      * @var string
      *
      * @ORM\Column(name="schemaPageType", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $schemaPageType;
 
     /**
      * @var string
      *
      * @ORM\Column(name="schemaName", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $schemaName;
 
     /**
      * @var string
      *
      * @ORM\Column(name="schemaDescription", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $schemaDescription;
 
@@ -199,63 +181,55 @@ class PageSeo
      * @var string
      *
      * @ORM\Column(name="meta_robots_index", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $metaRobotsIndex;
 
     /**
      * @var string
      *
      * @ORM\Column(name="meta_robots_follow", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $metaRobotsFollow;
 
     /**
      * @var string
      *
      * @ORM\Column(name="meta_robots_advanced", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $metaRobotsAdvanced;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="sitemap_indexed", type="boolean", nullable=true, options={"default" = true})
-     * @Gedmo\Translatable
      */
     protected $sitemapIndexed = true;
 
     /**
      * @var float
      *
      * @ORM\Column(name="sitemap_priority", type="float", nullable=true, options={"default" = "0.8"})
-     * @Gedmo\Translatable
      */
     protected $sitemapPriority = 0.8;
 
     /**
      * @var string
      *
      * @ORM\Column(name="sitemap_changeFreq", type="string", length=20, nullable=true, options={"default" = "monthly"})
-     * @Gedmo\Translatable
      */
     protected $sitemapChangeFreq = 'monthly';
 
     /**
      * @var string
      *
      * @ORM\Column(name="rel_canonical", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $relCanonical;
 
     /**
      * @var string
      *
      * @ORM\Column(name="keyword", type="string", length=255, nullable=true)
-     * @Gedmo\Translatable
      */
     protected $keyword;