Merge branch 'master' into ValidatorMessages

zendframework · Nov 4, 2013 · 132380c · 132380c
commit 132380c
Show file tree

Hide file tree

Showing 86 changed files with 154 additions and 361 deletions.
diff --git a/src/Helper/FlashMessenger.php b/src/Helper/FlashMessenger.php
@@ -106,8 +106,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);
         }
 
@@ -118,10 +121,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);

diff --git a/src/Helper/Gravatar.php b/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;
     }
 

diff --git a/src/Helper/HeadLink.php b/src/Helper/HeadLink.php
@@ -17,6 +17,16 @@
  * Zend_Layout_View_Helper_HeadLink
  *
  * @see http://www.w3.org/TR/xhtml1/dtds.html
+ *
+ * Creates the following virtual methods:
+ * @method HeadLink appendStylesheet($href, $media, $conditionalStylesheet, $extras)
+ * @method HeadLink offsetSetStylesheet($index, $href, $media, $conditionalStylesheet, $extras)
+ * @method HeadLink prependStylesheet($href, $media, $conditionalStylesheet, $extras)
+ * @method HeadLink setStylesheet($href, $media, $conditionalStylesheet, $extras)
+ * @method HeadLink appendAlternate($href, $type, $title, $extras)
+ * @method HeadLink offsetSetAlternate($index, $href, $type, $title, $extras)
+ * @method HeadLink prependAlternate($href, $type, $title, $extras)
+ * @method HeadLink setAlternate($href, $type, $title, $extras)
  */
 class HeadLink extends Placeholder\Container\AbstractStandalone
 {
@@ -46,6 +56,21 @@ public function __construct()
         $this->setSeparator(PHP_EOL);
     }
 
+    /**
+     * Proxy to __invoke()
+     *
+     * Allows calling $helper->headLink(), but, more importantly, chaining calls
+     * like ->appendStylesheet()->headLink().
+     *
+     * @param  array  $attributes
+     * @param  string $placement
+     * @return HeadLink
+     */
+    public function headLink(array $attributes = null, $placement = Placeholder\Container\AbstractContainer::APPEND)
+    {
+        return call_user_func_array(array($this, '__invoke'), func_get_args());
+    }
+
     /**
      * headLink() - View Helper Method
      *
@@ -80,16 +105,6 @@ public function __invoke(array $attributes = null, $placement = Placeholder\Cont
     /**
      * Overload method access
      *
-     * Creates the following virtual methods:
-     * - appendStylesheet($href, $media, $conditionalStylesheet, $extras)
-     * - offsetSetStylesheet($index, $href, $media, $conditionalStylesheet, $extras)
-     * - prependStylesheet($href, $media, $conditionalStylesheet, $extras)
-     * - setStylesheet($href, $media, $conditionalStylesheet, $extras)
-     * - appendAlternate($href, $type, $title, $extras)
-     * - offsetSetAlternate($index, $href, $type, $title, $extras)
-     * - prependAlternate($href, $type, $title, $extras)
-     * - setAlternate($href, $type, $title, $extras)
-     *
      * Items that may be added in the future:
      * - Navigation?  need to find docs on this
      *   - public function appendStart()

diff --git a/src/Helper/HeadMeta.php b/src/Helper/HeadMeta.php
@@ -17,6 +17,20 @@
  * Zend\View\Helper\HeadMeta
  *
  * @see http://www.w3.org/TR/xhtml1/dtds.html
+ *
+ * Allows the following 'virtual' methods:
+ * @method HeadMeta appendName($keyValue, $content, $modifiers = array())
+ * @method HeadMeta offsetGetName($index, $keyValue, $content, $modifiers = array())
+ * @method HeadMeta prependName($keyValue, $content, $modifiers = array())
+ * @method HeadMeta setName($keyValue, $content, $modifiers = array())
+ * @method HeadMeta appendHttpEquiv($keyValue, $content, $modifiers = array())
+ * @method HeadMeta offsetGetHttpEquiv($index, $keyValue, $content, $modifiers = array())
+ * @method HeadMeta prependHttpEquiv($keyValue, $content, $modifiers = array())
+ * @method HeadMeta setHttpEquiv($keyValue, $content, $modifiers = array())
+ * @method HeadMeta appendProperty($keyValue, $content, $modifiers = array())
+ * @method HeadMeta offsetGetProperty($index, $keyValue, $content, $modifiers = array())
+ * @method HeadMeta prependProperty($keyValue, $content, $modifiers = array())
+ * @method HeadMeta setProperty($keyValue, $content, $modifiers = array())
  */
 class HeadMeta extends Placeholder\Container\AbstractStandalone
 {
@@ -94,20 +108,6 @@ public function __invoke($content = null, $keyValue = null, $keyType = 'name', $
     /**
      * Overload method access
      *
-     * Allows the following 'virtual' methods:
-     * - appendName($keyValue, $content, $modifiers = array())
-     * - offsetGetName($index, $keyValue, $content, $modifiers = array())
-     * - prependName($keyValue, $content, $modifiers = array())
-     * - setName($keyValue, $content, $modifiers = array())
-     * - appendHttpEquiv($keyValue, $content, $modifiers = array())
-     * - offsetGetHttpEquiv($index, $keyValue, $content, $modifiers = array())
-     * - prependHttpEquiv($keyValue, $content, $modifiers = array())
-     * - setHttpEquiv($keyValue, $content, $modifiers = array())
-     * - appendProperty($keyValue, $content, $modifiers = array())
-     * - offsetGetProperty($index, $keyValue, $content, $modifiers = array())
-     * - prependProperty($keyValue, $content, $modifiers = array())
-     * - setProperty($keyValue, $content, $modifiers = array())
-     *
      * @param  string $method
      * @param  array  $args
      * @throws Exception\BadMethodCallException

diff --git a/src/Helper/HeadScript.php b/src/Helper/HeadScript.php
@@ -15,6 +15,16 @@
 
 /**
  * Helper for setting and retrieving script elements for HTML head section
+ *
+ * Allows the following method calls:
+ * @method HeadScript appendFile($src, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript offsetSetFile($index, $src, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript prependFile($src, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript setFile($src, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript appendScript($script, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript offsetSetScript($index, $src, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript prependScript($script, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript setScript($script, $type = 'text/javascript', $attrs = array())
  */
 class HeadScript extends Placeholder\Container\AbstractStandalone
 {
@@ -115,7 +125,7 @@ public function __construct()
      * @param  string $type      Script type and/or array of script attributes
      * @return HeadScript
      */
-    public function __invoke($mode = HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
+    public function __invoke($mode = self::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
     {
         if ((null !== $spec) && is_string($spec)) {
             $action    = ucfirst(strtolower($mode));
@@ -139,16 +149,6 @@ public function __invoke($mode = HeadScript::FILE, $spec = null, $placement = 'A
     /**
      * Overload method access
      *
-     * Allows the following method calls:
-     * - appendFile($src, $type = 'text/javascript', $attrs = array())
-     * - offsetSetFile($index, $src, $type = 'text/javascript', $attrs = array())
-     * - prependFile($src, $type = 'text/javascript', $attrs = array())
-     * - setFile($src, $type = 'text/javascript', $attrs = array())
-     * - appendScript($script, $type = 'text/javascript', $attrs = array())
-     * - offsetSetScript($index, $src, $type = 'text/javascript', $attrs = array())
-     * - prependScript($script, $type = 'text/javascript', $attrs = array())
-     * - setScript($script, $type = 'text/javascript', $attrs = array())
-     *
      * @param  string $method Method to call
      * @param  array  $args   Arguments of method
      * @throws Exception\BadMethodCallException if too few arguments or invalid method

diff --git a/src/Helper/HeadStyle.php b/src/Helper/HeadStyle.php
@@ -15,6 +15,12 @@
 
 /**
  * Helper for setting and retrieving stylesheets
+ *
+ * Allows the following method calls:
+ * @method HeadStyle appendStyle($content, $attributes = array())
+ * @method HeadStyle offsetSetStyle($index, $content, $attributes = array())
+ * @method HeadStyle prependStyle($content, $attributes = array())
+ * @method HeadStyle setStyle($content, $attributes = array())
  */
 class HeadStyle extends Placeholder\Container\AbstractStandalone
 {
@@ -109,12 +115,6 @@ public function __invoke($content = null, $placement = 'APPEND', $attributes = a
     /**
      * Overload method calls
      *
-     * Allows the following method calls:
-     * - appendStyle($content, $attributes = array())
-     * - offsetSetStyle($index, $content, $attributes = array())
-     * - prependStyle($content, $attributes = array())
-     * - setStyle($content, $attributes = array())
-     *
      * @param  string $method
      * @param  array  $args
      * @throws Exception\BadMethodCallException When no $content provided or invalid method

diff --git a/src/Helper/InlineScript.php b/src/Helper/InlineScript.php
@@ -35,7 +35,7 @@ class InlineScript extends HeadScript
      * @param  string $type      Script type and/or array of script attributes
      * @return InlineScript
      */
-    public function __invoke($mode = HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
+    public function __invoke($mode = self::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
     {
         return parent::__invoke($mode, $spec, $placement, $attrs, $type);
     }

diff --git a/src/Helper/Placeholder/Container/AbstractContainer.php b/src/Helper/Placeholder/Container/AbstractContainer.php
@@ -260,7 +260,7 @@ public function set($value)
      * Prepend a value to the top of the container
      *
      * @param  mixed $value
-     * @return void
+     * @return self
      */
     public function prepend($value)
     {
@@ -271,6 +271,18 @@ public function prepend($value)
         return $this;
     }
 
+    /**
+     * Append a value to the end of the container
+     *
+     * @param  mixed $value
+     * @return self
+     */
+    public function append($value)
+    {
+        parent::append($value);
+        return $this;
+    }
+
     /**
      * Next Index as defined by the PHP manual
      *
@@ -291,7 +303,7 @@ public function nextIndex()
      * optionally, if a number is passed, it will be the number of spaces
      *
      * @param  string|int $indent
-     * @return AbstractContainer
+     * @return self
      */
     public function setIndent($indent)
     {
@@ -313,7 +325,7 @@ public function getIndent()
      * Set postfix for __toString() serialization
      *
      * @param  string $postfix
-     * @return AbstractContainer
+     * @return self
      */
     public function setPostfix($postfix)
     {
@@ -335,7 +347,7 @@ public function getPostfix()
      * Set prefix for __toString() serialization
      *
      * @param  string $prefix
-     * @return AbstractContainer
+     * @return self
      */
     public function setPrefix($prefix)
     {
@@ -359,7 +371,7 @@ public function getPrefix()
      * Used to implode elements in container
      *
      * @param  string $separator
-     * @return AbstractContainer
+     * @return self
      */
     public function setSeparator($separator)
     {

diff --git a/src/HelperPluginManager.php b/src/HelperPluginManager.php
@@ -42,11 +42,10 @@ class HelperPluginManager extends AbstractPluginManager
         // basepath and url are not very useful without their factories, however the doctype
         // helper works fine as an invokable. The factory for doctype simply checks for the
         // config value from the merged config.
-        'doctype'             => 'Zend\View\Helper\Doctype', // overridden by a factory in ViewHelperManagerFactory
         'basepath'            => 'Zend\View\Helper\BasePath',
-        'url'                 => 'Zend\View\Helper\Url',
         'cycle'               => 'Zend\View\Helper\Cycle',
         'declarevars'         => 'Zend\View\Helper\DeclareVars',
+        'doctype'             => 'Zend\View\Helper\Doctype', // overridden by a factory in ViewHelperManagerFactory
         'escapehtml'          => 'Zend\View\Helper\EscapeHtml',
         'escapehtmlattr'      => 'Zend\View\Helper\EscapeHtmlAttr',
         'escapejs'            => 'Zend\View\Helper\EscapeJs',
@@ -73,6 +72,7 @@ class HelperPluginManager extends AbstractPluginManager
         'renderchildmodel'    => 'Zend\View\Helper\RenderChildModel',
         'rendertoplaceholder' => 'Zend\View\Helper\RenderToPlaceholder',
         'serverurl'           => 'Zend\View\Helper\ServerUrl',
+        'url'                 => 'Zend\View\Helper\Url',
         'viewmodel'           => 'Zend\View\Helper\ViewModel',
     );
 
@@ -145,7 +145,9 @@ public function injectTranslator($helper)
     {
         if ($helper instanceof TranslatorAwareInterface) {
             $locator = $this->getServiceLocator();
-            if ($locator && $locator->has('translator')) {
+            if ($locator && $locator->has('MvcTranslator')) {
+                $helper->setTranslator($locator->get('MvcTranslator'));
+            } elseif ($locator && $locator->has('translator')) {
                 $helper->setTranslator($locator->get('translator'));
             }
         }

diff --git a/test/Helper/AbstractTest.php b/test/Helper/AbstractTest.php
@@ -5,7 +5,6 @@
  * @link      https://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
- * @package   Zend_View
  */
 
 namespace ZendTest\View\Helper;
@@ -14,9 +13,6 @@
 use ZendTest\View\Helper\TestAsset\ConcreteHelper;
 
 /**
- * @category   Zend
- * @package    Zend_View
- * @subpackage UnitTests
  * @group      Zend_View
  * @group      Zend_View_Helper
  */

diff --git a/test/Helper/BasePathTest.php b/test/Helper/BasePathTest.php
@@ -5,7 +5,6 @@
  * @link      https://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
- * @package   Zend_View
  */
 
 namespace ZendTest\View\Helper;
@@ -14,9 +13,6 @@
 use Zend\View\Helper\BasePath;
 
 /**
- * @category   Zend
- * @package    Zend_View
- * @subpackage UnitTests
  * @group      Zend_View
  * @group      Zend_View_Helper
  */

diff --git a/test/Helper/CycleTest.php b/test/Helper/CycleTest.php
@@ -5,7 +5,6 @@
  * @link      https://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
- * @package   Zend_View
  */
 
 namespace ZendTest\View\Helper;
@@ -15,9 +14,6 @@
 /**
  * Test class for Zend_View_Helper_Cycle.
  *
- * @category   Zend
- * @package    Zend_View
- * @subpackage UnitTests
  * @group      Zend_View
  * @group      Zend_View_Helper
  */

diff --git a/test/Helper/DeclareVarsTest.php b/test/Helper/DeclareVarsTest.php
@@ -5,7 +5,6 @@
  * @link      https://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
- * @package   Zend_View
  */
 
 namespace ZendTest\View\Helper;
@@ -14,9 +13,6 @@
 use Zend\View\Helper\DeclareVars;
 
 /**
- * @category   Zend
- * @package    Zend_View
- * @subpackage UnitTests
  * @group      Zend_View
  * @group      Zend_View_Helper
  */

diff --git a/test/Helper/DoctypeTest.php b/test/Helper/DoctypeTest.php
@@ -5,7 +5,6 @@
  * @link      https://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
- * @package   Zend_View
  */
 
 namespace ZendTest\View\Helper;
@@ -15,9 +14,6 @@
 /**
  * Test class for Zend_View_Helper_Doctype.
  *
- * @category   Zend
- * @package    Zend_View
- * @subpackage UnitTests
  * @group      Zend_View
  * @group      Zend_View_Helper
  */