Merge branch 'master' into acceptHandling

Conflicts:
	library/Zend/Http/Header/AbstractAccept.php
	library/Zend/Http/Header/AcceptEncoding.php
	library/Zend/Http/Header/AcceptLanguage.php
	tests/Zend/Http/Header/AcceptCharsetTest.php
	tests/Zend/Http/Header/AcceptEncodingTest.php
	tests/Zend/Http/Header/AcceptLanguageTest.php
	tests/Zend/Http/Header/AcceptTest.php

src/Exception/UnexpectedValueException.php

@@ -16,7 +16,7 @@
  * @category   Zend
  * @package    Zend_Barcode
  */
-class UnexpectedValueException extends \UnexpectedValueException implements 
+class UnexpectedValueException extends \UnexpectedValueException implements
     ExceptionInterface
 {
 }

src/Object/Code128.php

@@ -232,7 +232,7 @@ protected function convertToBarcodeChars($string)
                     $result[] = $code;
                     $currentCharset = 'C';
                 }
-            } else if (in_array($char, $this->charSets['B']) && $currentCharset != 'B'
+            } elseif (in_array($char, $this->charSets['B']) && $currentCharset != 'B'
                   && !(in_array($char, $this->charSets['A']) && $currentCharset == 'A')) {
                 /**
                  * Switch to B as B contains the char and B is not the current charset.
@@ -244,7 +244,7 @@ protected function convertToBarcodeChars($string)
                 }
                 $result[] = $code;
                 $currentCharset = 'B';
-            } else if (array_key_exists($char, $this->charSets['A']) && $currentCharset != 'A'
+            } elseif (array_key_exists($char, $this->charSets['A']) && $currentCharset != 'A'
                   && !(array_key_exists($char, $this->charSets['B']) && $currentCharset == 'B')) {
                 /**
                  * Switch to C as C contains the char and C is not the current charset.

src/Object/Ean13.php

@@ -40,17 +40,17 @@ class Ean13 extends AbstractObject
         ));
 
     protected $parities = array(
-		0 => array('A','A','A','A','A','A'),
-		1 => array('A','A','B','A','B','B'),
-		2 => array('A','A','B','B','A','B'),
-		3 => array('A','A','B','B','B','A'),
-		4 => array('A','B','A','A','B','B'),
-		5 => array('A','B','B','A','A','B'),
-		6 => array('A','B','B','B','A','A'),
-		7 => array('A','B','A','B','A','B'),
-		8 => array('A','B','A','B','B','A'),
-		9 => array('A','B','B','A','B','A')
-	);
+        0 => array('A','A','A','A','A','A'),
+        1 => array('A','A','B','A','B','B'),
+        2 => array('A','A','B','B','A','B'),
+        3 => array('A','A','B','B','B','A'),
+        4 => array('A','B','A','A','B','B'),
+        5 => array('A','B','B','A','A','B'),
+        6 => array('A','B','B','B','A','A'),
+        7 => array('A','B','A','B','A','B'),
+        8 => array('A','B','A','B','B','A'),
+        9 => array('A','B','B','A','B','A')
+    );
 
     /**
      * Default options for Postnet barcode

src/Object/Exception/InvalidArgumentException.php

@@ -18,7 +18,7 @@
  * @category   Zend
  * @package    Zend_Barcode
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+class InvalidArgumentException extends Exception\InvalidArgumentException implements
     ExceptionInterface
 {
 }

src/Object/Exception/OutOfRangeException.php

@@ -18,7 +18,7 @@
  * @category   Zend
  * @package    Zend_Barcode
  */
-class OutOfRangeException extends Exception\OutOfRangeException implements 
+class OutOfRangeException extends Exception\OutOfRangeException implements
     ExceptionInterface
 {
 }

src/Object/Exception/RuntimeException.php

@@ -18,7 +18,7 @@
  * @category   Zend
  * @package    Zend_Barcode
  */
-class RuntimeException extends Exception\RuntimeException implements 
+class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface
 {
 }

src/ObjectPluginManager.php

@@ -16,7 +16,7 @@
  * Plugin manager implementation for barcode parsers.
  *
  * Enforces that barcode parsers retrieved are instances of
- * Object\AbstractObject. Additionally, it registers a number of default 
+ * Object\AbstractObject. Additionally, it registers a number of default
  * barcode parsers.
  *
  * @category   Zend
@@ -26,7 +26,7 @@ class ObjectPluginManager extends AbstractPluginManager
 {
     /**
      * Default set of barcode parsers
-     * 
+     *
      * @var array
      */
     protected $invokableClasses = array(
@@ -55,8 +55,8 @@ class ObjectPluginManager extends AbstractPluginManager
      *
      * Checks that the barcode parser loaded is an instance
      * of Object\AbstractObject.
-     * 
-     * @param  mixed $plugin 
+     *
+     * @param  mixed $plugin
      * @return void
      * @throws Exception\InvalidArgumentException if invalid
      */

src/Renderer/Exception/InvalidArgumentException.php

@@ -18,7 +18,7 @@
  * @category   Zend
  * @package    Zend_Barcode
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+class InvalidArgumentException extends Exception\InvalidArgumentException implements
     ExceptionInterface
 {
 }

src/Renderer/Exception/OutOfRangeException.php

@@ -18,7 +18,7 @@
  * @category   Zend
  * @package    Zend_Barcode
  */
-class OutOfRangeException extends Exception\OutOfRangeException implements 
+class OutOfRangeException extends Exception\OutOfRangeException implements
     ExceptionInterface
 {
 }

src/Renderer/Exception/RuntimeException.php

@@ -18,7 +18,7 @@
  * @category   Zend
  * @package    Zend_Barcode
  */
-class RuntimeException extends Exception\RuntimeException implements 
+class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface
 {
 }

src/Renderer/Exception/UnexpectedValueException.php

@@ -18,7 +18,7 @@
  * @category   Zend
  * @package    Zend_Barcode
  */
-class UnexpectedValueException extends Exception\UnexpectedValueException implements 
+class UnexpectedValueException extends Exception\UnexpectedValueException implements
     ExceptionInterface
 {
 }

src/Renderer/Image.php

@@ -11,6 +11,7 @@
 namespace Zend\Barcode\Renderer;
 
 use Zend\Barcode\Exception\RendererCreationException;
+use Zend\Stdlib\ErrorHandler;
 
 /**
  * Class for rendering the barcode as image
@@ -312,7 +313,10 @@ public function render()
         header("Content-Type: image/" . $this->imageType);
         $functionName = 'image' . $this->imageType;
         $functionName($this->resource);
-        @imagedestroy($this->resource);
+
+        ErrorHandler::start(E_WARNING);
+        imagedestroy($this->resource);
+        ErrorHandler::stop();
     }
 
     /**

src/RendererPluginManager.php

@@ -16,7 +16,7 @@
  * Plugin manager implementation for barcode renderers.
  *
  * Enforces that barcode parsers retrieved are instances of
- * Renderer\AbstractRenderer. Additionally, it registers a number of default 
+ * Renderer\AbstractRenderer. Additionally, it registers a number of default
  * barcode renderers.
  *
  * @category   Zend
@@ -26,7 +26,7 @@ class RendererPluginManager extends AbstractPluginManager
 {
     /**
      * Default set of barcode renderers
-     * 
+     *
      * @var array
      */
     protected $invokableClasses = array(
@@ -40,8 +40,8 @@ class RendererPluginManager extends AbstractPluginManager
      *
      * Checks that the barcode parser loaded is an instance
      * of Renderer\AbstractRenderer.
-     * 
-     * @param  mixed $plugin 
+     *
+     * @param  mixed $plugin
      * @return void
      * @throws Exception\InvalidArgumentException if invalid
      */

test/FactoryTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode;
+
 use Zend\Barcode;
 use Zend\Barcode\Renderer;
 use Zend\Barcode\Object;

test/Object/CodabarTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/Code128Test.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**
@@ -33,15 +34,15 @@ public function testType()
     public function testChecksum()
     {
         $this->assertSame(33, $this->object->getChecksum('BarCode 1'));
-    	$this->assertSame(47, $this->object->getChecksum('CODE-128'));
+        $this->assertSame(47, $this->object->getChecksum('CODE-128'));
         $this->assertSame(32, $this->object->getChecksum('FRAMEWORK-ZEND-COM'));
     }
 
     public function testKnownBarcodeConversion()
     {
-    	$barcode = new TestAsset\Code128Test();
-    	$this->assertSame(array(104, 13, 17, 18, 19), $barcode->convertToBarcodeChars(-123));
-    	$this->assertSame(array(104, 40, 41, 99, 34, 56, 78), $barcode->convertToBarcodeChars('HI345678'));
+        $barcode = new TestAsset\Code128Test();
+        $this->assertSame(array(104, 13, 17, 18, 19), $barcode->convertToBarcodeChars(-123));
+        $this->assertSame(array(104, 40, 41, 99, 34, 56, 78), $barcode->convertToBarcodeChars('HI345678'));
     }
 
     public function testSetText()

test/Object/Code25Test.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/Code25interleavedTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/Code39Test.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/Ean13Test.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/Ean2Test.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/Ean5Test.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/Ean8Test.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode\Object\Ean8;
 
 /**

test/Object/ErrorTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/IdentcodeTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/Itf14Test.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/LeitcodeTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/PlanetTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/PostnetTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**

test/Object/RoyalmailTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Barcode\Object;
+
 use Zend\Barcode;
 
 /**