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/Cloud.php

@@ -134,7 +134,7 @@ public function appendTag($tag)
         if ($tag instanceof TaggableInterface) {
             $tags[] = $tag;
             return $this;
-        } 
+        }
 
         if (!is_array($tag)) {
             throw new Exception\InvalidArgumentException(sprintf(

src/Cloud/Decorator/DecoratorInterface.php

@@ -23,16 +23,16 @@ interface DecoratorInterface
      * Constructor
      *
      * Allow passing options to the constructor.
-     * 
-     * @param  mixed $options 
+     *
+     * @param  mixed $options
      * @return void
      */
     public function __construct($options = null);
 
     /**
      * Render a list of tags
-     * 
-     * @param  mixed $tags 
+     *
+     * @param  mixed $tags
      * @return string
      */
     public function render($tags);

src/Cloud/DecoratorPluginManager.php

@@ -17,7 +17,7 @@
  * Plugin manager implementation for decorators.
  *
  * Enforces that decorators retrieved are instances of
- * Decorator\DecoratorInterface. Additionally, it registers a number of default 
+ * Decorator\DecoratorInterface. Additionally, it registers a number of default
  * decorators available.
  *
  * @category   Zend
@@ -28,7 +28,7 @@ class DecoratorPluginManager extends AbstractPluginManager
 {
     /**
      * Default set of decorators
-     * 
+     *
      * @var array
      */
     protected $invokableClasses = array(
@@ -42,8 +42,8 @@ class DecoratorPluginManager extends AbstractPluginManager
      *
      * Checks that the decorator loaded is an instance
      * of Decorator\DecoratorInterface.
-     * 
-     * @param  mixed $plugin 
+     *
+     * @param  mixed $plugin
      * @return void
      * @throws Exception\InvalidArgumentException if invalid
      */

src/ItemList.php

@@ -177,7 +177,8 @@ public function rewind()
      * @param  mixed $offset
      * @return boolean
      */
-    public function offsetExists($offset) {
+    public function offsetExists($offset)
+    {
         return array_key_exists($offset, $this->_items);
     }
 
@@ -187,7 +188,8 @@ public function offsetExists($offset) {
      * @param  mixed $offset
      * @return TaggableInterface
      */
-    public function offsetGet($offset) {
+    public function offsetGet($offset)
+    {
         return $this->_items[$offset];
     }
 
@@ -199,7 +201,8 @@ public function offsetGet($offset) {
      * @throws OutOfBoundsException When item does not implement Zend\Tag\TaggableInterface
      * @return void
      */
-    public function offsetSet($offset, $item) {
+    public function offsetSet($offset, $item)
+    {
         // We need to make that check here, as the method signature must be
         // compatible with ArrayAccess::offsetSet()
         if (!($item instanceof TaggableInterface)) {
@@ -219,7 +222,8 @@ public function offsetSet($offset, $item) {
      * @param  mixed $offset
      * @return void
      */
-    public function offsetUnset($offset) {
+    public function offsetUnset($offset)
+    {
         unset($this->_items[$offset]);
     }
 }

test/Cloud/Decorator/HtmlTagTest.php

@@ -12,7 +12,7 @@
 
 use	Zend\Tag,
     Zend\Tag\Cloud\Decorator,
-	Zend\Tag\Cloud\Decorator\Exception\InvalidArgumentException;
+    Zend\Tag\Cloud\Decorator\Exception\InvalidArgumentException;
 
 /**
  * @category   Zend

test/ItemListTest.php

@@ -56,7 +56,7 @@ public function testSeekableIterator()
         $list->seek(2);
         $this->assertEquals($list->current()->getTitle(), $values[2]);
     }
-    
+
     public function testSeektableIteratorThrowsBoundsException()
     {
         $list = new Tag\ItemList();
@@ -66,7 +66,7 @@ public function testSeektableIteratorThrowsBoundsException()
             $list[] = $this->_getItem($value);
         }
         $list->seek(2);
-        
+
         $this->setExpectedException('Zend\Tag\Exception\OutOfBoundsException', 'Invalid seek position');
         $list->seek(3);
     }