Merge branch

src/Exception/UnexpectedValueException.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\View\Exception;
+
+/**
+ * Unexpected value exception
+ */
+class UnexpectedValueException extends \UnexpectedValueException implements
+    ExceptionInterface
+{
+}

src/Helper/FlashMessenger.php

@@ -107,8 +107,11 @@ public function render($namespace = PluginFlashMessenger::NAMESPACE_DEFAULT, arr
 
         // Prepare classes for opening tag
         if (empty($classes)) {
-            $classes = isset($this->classMessages[$namespace]) ?
-                $this->classMessages[$namespace] : $this->classMessages[PluginFlashMessenger::NAMESPACE_DEFAULT];
+            if (isset($this->classMessages[$namespace])) {
+                $classes = $this->classMessages[$namespace];
+            } else {
+                $classes = $this->classMessages[PluginFlashMessenger::NAMESPACE_DEFAULT];
+            }
             $classes = array($classes);
         }
 
@@ -119,10 +122,11 @@ public function render($namespace = PluginFlashMessenger::NAMESPACE_DEFAULT, arr
         $translator = $this->getTranslator();
         $translatorTextDomain = $this->getTranslatorTextDomain();
 
-        array_walk_recursive($messages, function($item) use (&$messagesToPrint, $escapeHtml, $translator, $translatorTextDomain) {
+        array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml, $translator, $translatorTextDomain) {
             if ($translator !== null) {
                 $item = $translator->translate(
-                        $item, $translatorTextDomain
+                    $item,
+                    $translatorTextDomain
                 );
             }
             $messagesToPrint[] = $escapeHtml($item);

src/Helper/Gravatar.php

@@ -239,7 +239,7 @@ public function getDefaultImg()
     public function setEmail($email)
     {
         $this->emailIsHashed = (bool) preg_match('/^[A-Za-z0-9]{32}$/', $email);
-        $this->email = $email;
+        $this->email = strtolower(trim($email));
         return $this;
     }
 

src/Helper/HeadTitle.php

@@ -9,7 +9,7 @@
 
 namespace Zend\View\Helper;
 
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface;
 use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\View\Exception;
 
@@ -36,7 +36,7 @@ class HeadTitle extends Placeholder\Container\AbstractStandalone implements
     /**
      * Translator (optional)
      *
-     * @var Translator
+     * @var TranslatorInterface
      */
     protected $translator;
 
@@ -179,13 +179,13 @@ public function getDefaultAttachOrder()
     /**
      * 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 HeadTitle
      */
-    public function setTranslator(Translator $translator = null, $textDomain = null)
+    public function setTranslator(TranslatorInterface $translator = null, $textDomain = null)
     {
         $this->translator = $translator;
         if (null !== $textDomain) {
@@ -197,7 +197,7 @@ public function setTranslator(Translator $translator = null, $textDomain = null)
     /**
      * Returns translator used in helper
      *
-     * @return Translator|null
+     * @return TranslatorInterface|null
      */
     public function getTranslator()
     {

src/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;
 use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\Navigation;
 use Zend\Navigation\Page\AbstractPage;
@@ -101,7 +101,7 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
     /**
      * Translator (optional)
      *
-     * @var Translator
+     * @var TranslatorInterface
      */
     protected $translator;
 
@@ -204,8 +204,12 @@ public function findActive($container, $minDepth = null, $maxDepth = -1)
 
         $found  = null;
         $foundDepth = -1;
-        $iterator = new RecursiveIteratorIterator($container, RecursiveIteratorIterator::CHILD_FIRST);
+        $iterator = new RecursiveIteratorIterator(
+            $container,
+            RecursiveIteratorIterator::CHILD_FIRST
+        );
 
+        /** @var \Zend\Navigation\Page\AbstractPage $page */
         foreach ($iterator as $page) {
             $currDepth = $iterator->getDepth();
             if ($currDepth < $minDepth || !$this->accept($page)) {
@@ -388,23 +392,12 @@ protected function htmlAttribs($attribs)
      * Returns an HTML string containing an 'a' element for the given page
      *
      * @param  AbstractPage $page  page to generate HTML for
-     * @return string
+     * @return string              HTML string (<a href="…">Label</a>)
      */
     public function htmlify(AbstractPage $page)
     {
-        // get label and title for translating
-        $label = $page->getLabel();
-        $title = $page->getTitle();
-
-        if (null !== ($translator = $this->getTranslator())) {
-            $textDomain = $this->getTranslatorTextDomain();
-            if (is_string($label) && !empty($label)) {
-                $label = $translator->translate($label, $textDomain);
-            }
-            if (is_string($title) && !empty($title)) {
-                $title = $translator->translate($title, $textDomain);
-            }
-        }
+        $label = $this->translate($page->getLabel(), $page->getTextDomain());
+        $title = $this->translate($page->getTitle(), $page->getTextDomain());
 
         // get attribs for anchor element
         $attribs = array(
@@ -415,9 +408,33 @@ public function htmlify(AbstractPage $page)
             'target' => $page->getTarget()
         );
 
+        /** @var \Zend\View\Helper\EscapeHtml $escaper */
         $escaper = $this->view->plugin('escapeHtml');
+        $label   = $escaper($label);
+
+        return '<a' . $this->htmlAttribs($attribs) . '>' . $label . '</a>';
+    }
+
+    /**
+     * Translate a message (for label, title, …)
+     *
+     * @param  string $message    ID of the message to translate
+     * @param  string $textDomain Text domain (category name for the translations)
+     * @return string             Translated message
+     */
+    protected function translate($message, $textDomain = null)
+    {
+        if (is_string($message) && !empty($message)) {
+            if (null !== ($translator = $this->getTranslator())) {
+                if (null === $textDomain) {
+                    $textDomain = $this->getTranslatorTextDomain();
+                }
+
+                return $translator->translate($message, $textDomain);
+            }
+        }
 
-        return '<a' . $this->htmlAttribs($attribs) . '>' . $escaper($label) . '</a>';
+        return $message;
     }
 
     /**
@@ -761,13 +778,13 @@ public function getServiceLocator()
     /**
      * 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 AbstractHelper
      */
-    public function setTranslator(Translator $translator = null, $textDomain = null)
+    public function setTranslator(TranslatorInterface $translator = null, $textDomain = null)
     {
         $this->translator = $translator;
         if (null !== $textDomain) {
@@ -780,7 +797,7 @@ public function setTranslator(Translator $translator = null, $textDomain = null)
     /**
      * Returns translator used in helper
      *
-     * @return Translator|null
+     * @return TranslatorInterface|null
      */
     public function getTranslator()
     {

src/Helper/Navigation/Breadcrumbs.php

@@ -107,12 +107,11 @@ public function renderStraight($container = null)
         if ($this->getLinkLast()) {
             $html = $this->htmlify($active);
         } else {
-            $html = $active->getLabel();
-            if (null !== ($translator = $this->getTranslator())) {
-                $html = $translator->translate($html, $this->getTranslatorTextDomain());
-            }
+            /** @var \Zend\View\Helper\EscapeHtml $escaper */
             $escaper = $this->view->plugin('escapeHtml');
-            $html    = $escaper($html);
+            $html    = $escaper(
+                $this->translate($active->getLabel(), $active->getTextDomain())
+            );
         }
 
         // walk back to root
@@ -172,7 +171,10 @@ public function renderPartial($container = null, $partial = null)
         }
 
         // put breadcrumb pages in model
-        $model  = array('pages' => array());
+        $model = array(
+            'pages' => array(),
+            'separator' => $this->getSeparator()
+        );
         $active = $this->findActive($container);
         if ($active) {
             $active = $active['page'];
@@ -194,6 +196,9 @@ public function renderPartial($container = null, $partial = null)
             $model['pages'] = array_reverse($model['pages']);
         }
 
+        /** @var \Zend\View\Helper\Partial $partialHelper */
+        $partialHelper = $this->view->plugin('partial');
+
         if (is_array($partial)) {
             if (count($partial) != 2) {
                 throw new Exception\InvalidArgumentException(
@@ -203,11 +208,9 @@ public function renderPartial($container = null, $partial = null)
                 );
             }
 
-            $partialHelper = $this->view->plugin('partial');
-            return $partialHelper($partial[0], /*$partial[1], */$model);
+            return $partialHelper($partial[0], $model);
         }
 
-        $partialHelper = $this->view->plugin('partial');
         return $partialHelper($partial, $model);
     }