Merge branch 'master' of git://github.com/zendframework/zf2

Conflicts: .gitignore
zendframework · Jul 29, 2011 · fcebd68 · fcebd68
17 parents a97b4ed + a62b890 + 369a5ce + 2f4d803 + 045137d + 2fdcee4 + 147c99e + d95685a + 9fceeb6 + 4682ed8 + f00b78e + 18be569 + af6e96a + 58e6c7d + f9a818b + b470c79 + ce259b2
commit fcebd68
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/Barcode.php b/src/Barcode.php
@@ -301,9 +301,8 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array
         }
 
         $rendererName = self::getPluginLoader(self::RENDERER)->load($renderer);
-
         if (!class_exists($rendererName)) {
-            throw new Exception\InvalidArgumentException(sprintf(
+            throw new InvalidArgumentException(sprintf(
                 'Invalid renderer "%s"; does not resolve to a valid class', $renderer
             ));
         }

diff --git a/src/Object/AbstractObject.php b/src/Object/AbstractObject.php
@@ -31,7 +31,8 @@
     Zend\Barcode\Object\Exception\RuntimeException,
     Zend\Barcode\Object\Exception\InvalidArgumentException,
     Zend\Barcode\Object\Exception\BarcodeValidationException,
-    Zend\Barcode\Object\Exception\OutOfRangeException;
+    Zend\Barcode\Object\Exception\OutOfRangeException,
+    Zend\Barcode\Object\Exception\ExtensionNotLoadedException;
 
 /**
  * Class for generate Barcode

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -320,7 +320,7 @@ public function testBarcodeFactoryWithNamespaceButWithoutExtendingRendererAbstra
 
     public function testBarcodeRendererFactoryWithUnexistantRenderer()
     {
-        $this->setExpectedException('\Zend\Loader\Exception\PluginLoaderException');
+        $this->setExpectedException('\Zend\Barcode\Exception\InvalidArgumentException');
         $renderer = Barcode\Barcode::makeRenderer('zend', array());
     }
 

diff --git a/tools/phptools b/tools/phptools