Преглед изворни кода

Moved [get|set]TranslationDomain to interface

dantleech пре 12 година
родитељ
комит
60f92bcdf0
3 измењених фајлова са 19 додато и 11 уклоњено
  1. 2 8
      Admin/Admin.php
  2. 16 0
      Admin/AdminInterface.php
  3. 1 3
      Tests/Admin/BaseFieldDescriptionTest.php

+ 2 - 8
Admin/Admin.php

@@ -2091,11 +2091,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
     }
     }
 
 
     /**
     /**
-     * set the translation domain
-     *
-     * @param string $translationDomain the translation domain
-     *
-     * @return void
+     * {@inheritdoc}
      */
      */
     public function setTranslationDomain($translationDomain)
     public function setTranslationDomain($translationDomain)
     {
     {
@@ -2103,9 +2099,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
     }
     }
 
 
     /**
     /**
-     * Returns the translation domain
-     *
-     * @return string the translation domain
+     * {@inheritdoc}
      */
      */
     public function getTranslationDomain()
     public function getTranslationDomain()
     {
     {

+ 16 - 0
Admin/AdminInterface.php

@@ -555,4 +555,20 @@ interface AdminInterface
      * @return null|string
      * @return null|string
      */
      */
     public function getTemplate($name);
     public function getTemplate($name);
+
+    /**
+     * Set the translation domain
+     *
+     * @param string $translationDomain the translation domain
+     *
+     * @return void
+     */
+    public function setTranslationDomain($translationDomain);
+
+    /**
+     * Returns the translation domain
+     *
+     * @return string the translation domain
+     */
+    public function getTranslationDomain();
 }
 }

+ 1 - 3
Tests/Admin/BaseFieldDescriptionTest.php

@@ -120,9 +120,7 @@ class BaseFieldDescriptionTest extends \PHPUnit_Framework_TestCase
     {
     {
         $description = new FieldDescription();
         $description = new FieldDescription();
 
 
-        $admin = $this->getMockBuilder('Sonata\AdminBundle\Admin\Admin')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $admin = $this->getMock('Sonata\AdminBundle\Admin\AdminInterface');
         $description->setAdmin($admin);
         $description->setAdmin($admin);
 
 
         $admin->expects($this->once())
         $admin->expects($this->once())