Fix interface-change related tests

HolgerW1 · Dec 15, 2013 · eb868f8 · eb868f8
1 parent 72ccab5
commit eb868f8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 18 deletions.
diff --git a/library/Zend/I18n/Translator/Translator.php b/library/Zend/I18n/Translator/Translator.php
@@ -23,7 +23,7 @@
 /**
  * Translator.
  */
-class Translator
+class Translator implements TranslatorInterface
 {
     /**
      * Event fired when the translation for a message is missing.

diff --git a/library/Zend/I18n/Translator/TranslatorAwareInterface.php b/library/Zend/I18n/Translator/TranslatorAwareInterface.php
@@ -14,18 +14,18 @@ interface TranslatorAwareInterface
     /**
      * Sets translator to use in helper
      *
-     * @param  Translator $translator  [optional] translator.
-     *                                 Default is null, which sets no translator.
-     * @param  string     $textDomain  [optional] text domain
-     *                                 Default is null, which skips setTranslatorTextDomain
+     * @param  TranslatorInterface $translator  [optional] translator.
+     *                                           Default is null, which sets no translator.
+     * @param  string              $textDomain  [optional] text domain
+     *                                           Default is null, which skips setTranslatorTextDomain
      * @return TranslatorAwareInterface
      */
-    public function setTranslator(Translator $translator = null, $textDomain = null);
+    public function setTranslator(TranslatorInterface $translator = null, $textDomain = null);
 
     /**
      * Returns translator used in object
      *
-     * @return Translator|null
+     * @return TranslatorInterface|null
      */
     public function getTranslator();
 

diff --git a/library/Zend/I18n/Translator/TranslatorAwareTrait.php b/library/Zend/I18n/Translator/TranslatorAwareTrait.php
@@ -9,12 +9,10 @@
 
 namespace Zend\I18n\Translator;
 
-use Zend\I18n\Translator\Translator;
-
 trait TranslatorAwareTrait
 {
     /**
-     * @var Translator
+     * @var TranslatorInterface
      */
     protected $translator = null;
 
@@ -31,11 +29,11 @@ trait TranslatorAwareTrait
     /**
      * Sets translator to use in helper
      *
-     * @param Translator $translator
-     * @param string $textDomain
+     * @param TranslatorInterface $translator
+     * @param string              $textDomain
      * @return mixed
      */
-    public function setTranslator(Translator $translator = null, $textDomain = null)
+    public function setTranslator(TranslatorInterface $translator = null, $textDomain = null)
     {
         $this->translator = $translator;
 
@@ -49,7 +47,7 @@ public function setTranslator(Translator $translator = null, $textDomain = null)
     /**
      * Returns translator used in object
      *
-     * @return Translator
+     * @return TranslatorInterface
      */
     public function getTranslator()
     {

diff --git a/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php b/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
@@ -9,7 +9,7 @@
 
 namespace Zend\I18n\View\Helper;
 
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface as Translator;
 use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\View\Helper\AbstractHelper;
 

diff --git a/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php b/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
@@ -9,7 +9,7 @@
 
 namespace Zend\Mvc\Router\Http;
 
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface as Translator;
 use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\Stdlib\RequestInterface as Request;
 

diff --git a/library/Zend/View/Helper/HeadTitle.php b/library/Zend/View/Helper/HeadTitle.php
@@ -9,7 +9,7 @@
 
 namespace Zend\View\Helper;
 
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface as Translator;
 use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\View\Exception;
 

diff --git a/library/Zend/View/Helper/Navigation/AbstractHelper.php b/library/Zend/View/Helper/Navigation/AbstractHelper.php
@@ -13,7 +13,7 @@
 use Zend\EventManager\EventManager;
 use Zend\EventManager\EventManagerAwareInterface;
 use Zend\EventManager\EventManagerInterface;
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface as Translator;
 use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\Navigation;
 use Zend\Navigation\Page\AbstractPage;