Merge branch 'cs/various-things' of https://github.com/Maks3w/zf2

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/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/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
      */