diff --git a/src/Renderer/AbstractRenderer.php b/src/Renderer/AbstractRenderer.php index b84c335..9871f33 100644 --- a/src/Renderer/AbstractRenderer.php +++ b/src/Renderer/AbstractRenderer.php @@ -317,13 +317,8 @@ public function getAutomaticRenderError() * @param Object\ObjectInterface $barcode * @return AbstractRenderer */ - public function setBarcode($barcode) + public function setBarcode(Object\ObjectInterface $barcode) { - if (!$barcode instanceof Object\ObjectInterface) { - throw new Exception\InvalidArgumentException( - 'Invalid barcode object provided to setBarcode()' - ); - } $this->barcode = $barcode; return $this; } diff --git a/src/Renderer/RendererInterface.php b/src/Renderer/RendererInterface.php index 51dd10d..a7a8faf 100644 --- a/src/Renderer/RendererInterface.php +++ b/src/Renderer/RendererInterface.php @@ -21,6 +21,8 @@ namespace Zend\Barcode\Renderer; +use Zend\Barcode\Object\ObjectInterface; + /** * Class for rendering the barcode * @@ -146,14 +148,14 @@ public function getAutomaticRenderError(); /** * Set the barcode object - * @param Object\ObjectInterface $barcode + * @param ObjectInterface $barcode * @return Renderer */ - public function setBarcode($barcode); + public function setBarcode(ObjectInterface $barcode); /** * Retrieve the barcode object - * @return Object\ObjectInterface + * @return ObjectInterface */ public function getBarcode(); diff --git a/src/Renderer/Svg.php b/src/Renderer/Svg.php index 71d8fcf..570fdbe 100644 --- a/src/Renderer/Svg.php +++ b/src/Renderer/Svg.php @@ -116,17 +116,11 @@ public function getWidth() /** * Set an image resource to draw the barcode inside * - * @param DOMDocument $value + * @param DOMDocument $svg * @return Svg - * @throw Exception */ - public function setResource($svg) + public function setResource(DOMDocument $svg) { - if (!$svg instanceof DOMDocument) { - throw new Exception\InvalidArgumentException( - 'Invalid DOMDocument resource provided to setResource()' - ); - } $this->resource = $svg; return $this; } diff --git a/test/Renderer/SvgTest.php b/test/Renderer/SvgTest.php index 2e54c93..94a014b 100644 --- a/test/Renderer/SvgTest.php +++ b/test/Renderer/SvgTest.php @@ -81,13 +81,6 @@ public function testGoodSvgResource() $this->renderer->setResource($svgResource, 10); } - public function testObjectSvgResource() - { - $this->setExpectedException('Zend\Barcode\Renderer\Exception\ExceptionInterface'); - $svgResource = new \StdClass(); - $this->renderer->setResource($svgResource); - } - public function testDrawReturnResource() { Barcode\Barcode::setBarcodeFont(__DIR__ . '/../Object/_fonts/Vera.ttf'); diff --git a/test/Renderer/TestCommon.php b/test/Renderer/TestCommon.php index 6379107..25c627c 100644 --- a/test/Renderer/TestCommon.php +++ b/test/Renderer/TestCommon.php @@ -74,13 +74,6 @@ public function testSetBarcodeObject() $this->assertSame($barcode, $this->renderer->getBarcode()); } - public function testSetInvalidBarcodeObject() - { - $this->setExpectedException('\Zend\Barcode\Renderer\Exception\ExceptionInterface'); - $barcode = new \StdClass(); - $this->renderer->setBarcode($barcode); - } - public function testGoodModuleSize() { $this->renderer->setModuleSize(2.34);