Merge branch 'master' of https://github.com/zendframework/zf2 into qu…

…ickfix/sharedem-type-preference

.travis/run-tests.sh

@@ -8,7 +8,7 @@ for tested in "${testedcomponents[@]}"
     do
         echo "$tested:"
         phpunit -c $testdir/phpunit.xml $testdir/$tested
-        let "result = $result || $?"
+        result=$(($result || $?))
 done
 
-exit $result
+exit $result

.travis/tested-components

@@ -10,7 +10,7 @@ Zend/Crypt
 Zend/Currency
 Zend/Db
 Zend/Di
-Zend/Docbook
+Zend/DocBook
 Zend/Dojo
 Zend/Dom
 Zend/EventManager

src/Helper/Placeholder/Registry.php

@@ -21,6 +21,7 @@
 
 namespace Zend\View\Helper\Placeholder;
 
+use Zend\Registry as RegistryZend;
 use Zend\View\Exception;
 
 /**
@@ -58,11 +59,11 @@ class Registry
      */
     public static function getRegistry()
     {
-        if (\Zend\Registry::isRegistered(self::REGISTRY_KEY)) {
-            $registry = \Zend\Registry::get(self::REGISTRY_KEY);
+        if (RegistryZend::isRegistered(self::REGISTRY_KEY)) {
+            $registry = RegistryZend::get(self::REGISTRY_KEY);
         } else {
             $registry = new self();
-            \Zend\Registry::set(self::REGISTRY_KEY, $registry);
+            RegistryZend::set(self::REGISTRY_KEY, $registry);
         }
 
         return $registry;
@@ -73,7 +74,7 @@ public static function getRegistry()
      *
      * @param  string $key
      * @param  array $value
-     * @return \Zend\View\Helper\Placeholder\Container\AbstractContainer
+     * @return Container\AbstractContainer
      */
     public function createContainer($key, array $value = array())
     {
@@ -87,7 +88,7 @@ public function createContainer($key, array $value = array())
      * Retrieve a placeholder container
      *
      * @param  string $key
-     * @return \Zend\View\Helper\Placeholder\Container\AbstractContainer
+     * @return Container\AbstractContainer
      */
     public function getContainer($key)
     {
@@ -118,10 +119,10 @@ public function containerExists($key)
      * Set the container for an item in the registry
      *
      * @param  string $key
-     * @param  Zend\View\Placeholder\Container\AbstractContainer $container
-     * @return Zend\View\Placeholder\Registry
+     * @param  Container\AbstractContainer $container
+     * @return Registry
      */
-    public function setContainer($key, \Zend\View\Helper\Placeholder\Container\AbstractContainer $container)
+    public function setContainer($key, Container\AbstractContainer $container)
     {
         $key = (string) $key;
         $this->_items[$key] = $container;
@@ -149,16 +150,20 @@ public function deleteContainer($key)
      * Set the container class to use
      *
      * @param  string $name
-     * @return \Zend\View\Helper\Placeholder\Registry
      * @throws Exception\InvalidArgumentException
+     * @throws Exception\DomainException
+     * @return Registry
      */
     public function setContainerClass($name)
     {
         if (!class_exists($name)) {
-            \Zend\Loader::loadClass($name);
+            throw new Exception\DomainException(
+                sprintf('%s expects a valid registry class name; received "%s", which did not resolve',
+                        __METHOD__,
+                        $name
+                ));
         }
 
-
         if (!in_array('Zend\View\Helper\Placeholder\Container\AbstractContainer', class_parents($name))) {
             throw new Exception\InvalidArgumentException('Invalid Container class specified');
         }