Merge 3b3101c into 297a4c0

detailnet · Sep 29, 2015 · 740f846 · 740f846
2 parents 297a4c0 + 3b3101c
commit 740f846
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/src/Detail/Persistence/Model/Behavior/Translatable/KnpTranslatableTrait.php b/src/Detail/Persistence/Model/Behavior/Translatable/KnpTranslatableTrait.php
@@ -4,6 +4,8 @@
 
 use Knp\DoctrineBehaviors\Model as ORMBehaviors;
 
+use Detail\Persistence\Model\TranslationInterface;
+
 trait KnpTranslatableTrait
 {
     /**

diff --git a/src/Detail/Persistence/Model/Behavior/Translatable/TranslatableTrait.php b/src/Detail/Persistence/Model/Behavior/Translatable/TranslatableTrait.php
@@ -4,6 +4,8 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 
+use Detail\Persistence\Model\TranslationInterface;
+
 trait TranslatableTrait
 {
     /**

diff --git a/src/Detail/Persistence/Model/Behavior/Translatable/TranslationInterface.php b/src/Detail/Persistence/Model/Behavior/Translatable/TranslationInterface.php
@@ -2,13 +2,13 @@
 
 namespace Detail\Persistence\Model\Behavior\Translatable;
 
-interface TranslationInterface
-{
-    /**
-     * @return string
-     */
-    public function getLocale();
+use Detail\Persistence\Model\TranslationInterface as ModelTranslationInterface;
 
+/**
+ * @deprecated Use Detail\Persistence\Model\TranslationInterface instead
+ */
+interface TranslationInterface extends ModelTranslationInterface
+{
 //    /**
 //     * @param TranslatableInterface $translatable
 //     * @return void

diff --git a/src/Detail/Persistence/Model/TranslationInterface.php b/src/Detail/Persistence/Model/TranslationInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Detail\Persistence\Model;
+
+interface TranslationInterface
+{
+    /**
+     * @return string
+     */
+    public function getLocale();
+}
diff --git a/src/Detail/Persistence/Model/TranslationTextInterface.php b/src/Detail/Persistence/Model/TranslationTextInterface.php
@@ -2,13 +2,8 @@
 
 namespace Detail\Persistence\Model;
 
-interface TranslationTextInterface
+interface TranslationTextInterface extends TranslationInterface
 {
-    /**
-     * @return string
-     */
-    public function getLocale();
-
     /**
      * @return string
      */