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

src/Adapter/AbstractAdapter.php

@@ -66,7 +66,7 @@ public function setOptions($options)
      * @param  mixed $value Option value
      * @return AbstractAdapter
      */
-    public function setOption($name, $value) 
+    public function setOption($name, $value)
     {
         $this->_options[(string) $name] = $value;
         return $this;
@@ -77,7 +77,7 @@ public function setOption($name, $value)
      *
      * @return array
      */
-    public function getOptions() 
+    public function getOptions()
     {
         return $this->_options;
     }
@@ -89,7 +89,7 @@ public function getOptions()
      * @return mixed
      * @throws InvalidArgumentException
      */
-    public function getOption($name) 
+    public function getOption($name)
     {
         $name = (string) $name;
         if (!array_key_exists($name, $this->_options)) {

src/Adapter/Amf0.php

@@ -22,9 +22,9 @@ class Amf0 extends AbstractAdapter
 {
     /**
      * Serialize a PHP value to AMF0 format
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
+     *
+     * @param  mixed $value
+     * @param  array $opts
      * @return string
      * @throws RuntimeException
      */
@@ -42,9 +42,9 @@ public function serialize($value, array $opts = array())
 
     /**
      * Unserialize an AMF0 value to PHP
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
+     *
+     * @param  mixed $value
+     * @param  array $opts
      * @return void
      * @throws RuntimeException
      */

src/Adapter/Amf3.php

@@ -22,9 +22,9 @@ class Amf3 extends AbstractAdapter
 {
     /**
      * Serialize a PHP value to AMF3 format
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
+     *
+     * @param  mixed $value
+     * @param  array $opts
      * @return string
      * @throws RuntimeException
      */
@@ -42,9 +42,9 @@ public function serialize($value, array $opts = array())
 
     /**
      * Deserialize an AMF3 value to PHP
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
+     *
+     * @param  mixed $value
+     * @param  array $opts
      * @return string
      * @throws RuntimeException
      */

src/Adapter/IgBinary.php

@@ -27,7 +27,7 @@ class IgBinary extends AbstractAdapter
 
     /**
      * Constructor
-     * 
+     *
      * @param  array|\Traversable $options
      * @return void
      * @throws ExtensionNotLoadedException If igbinary extension is not present
@@ -47,9 +47,9 @@ public function __construct($options = array())
 
     /**
      * Serialize PHP value to igbinary
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
+     *
+     * @param  mixed $value
+     * @param  array $opts
      * @return string
      * @throws RuntimeException on igbinary error
      */
@@ -65,9 +65,9 @@ public function serialize($value, array $opts = array())
 
     /**
      * Deserialize igbinary string to PHP value
-     * 
-     * @param  string|binary $serialized 
-     * @param  array $opts 
+     *
+     * @param  string|binary $serialized
+     * @param  array $opts
      * @return mixed
      * @throws RuntimeException on igbinary error
      */

src/Adapter/Json.php

@@ -32,9 +32,9 @@ class Json extends AbstractAdapter
 
     /**
      * Serialize PHP value to JSON
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
+     *
+     * @param  mixed $value
+     * @param  array $opts
      * @return string
      * @throws InvalidArgumentException|RuntimeException on JSON encoding exception
      */
@@ -53,9 +53,9 @@ public function serialize($value, array $opts = array())
 
     /**
      * Deserialize JSON to PHP value
-     * 
-     * @param  string $json 
-     * @param  array $opts 
+     *
+     * @param  string $json
+     * @param  array $opts
      * @return mixed
      * @throws InvalidArgumentException|RuntimeException
      */

src/Adapter/PhpCode.php

@@ -21,9 +21,9 @@ class PhpCode extends AbstractAdapter
 {
     /**
      * Serialize PHP using var_export
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
+     *
+     * @param  mixed $value
+     * @param  array $opts
      * @return string
      */
     public function serialize($value, array $opts = array())
@@ -35,9 +35,9 @@ public function serialize($value, array $opts = array())
      * Deserialize PHP string
      *
      * Warning: this uses eval(), and should likely be avoided.
-     * 
-     * @param  string $code 
-     * @param  array $opts 
+     *
+     * @param  string $code
+     * @param  array $opts
      * @return mixed
      * @throws RuntimeException on eval error
      */

src/Adapter/PhpSerialize.php

@@ -26,7 +26,7 @@ class PhpSerialize extends AbstractAdapter
 
     /**
      * Constructor
-     * 
+     *
      * @param  array|\Traversable $options
      * @return void
      */
@@ -43,9 +43,9 @@ public function __construct($options = array())
 
     /**
      * Serialize using serialize()
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
+     *
+     * @param  mixed $value
+     * @param  array $opts
      * @return string
      * @throws RuntimeException On serialize error
      */
@@ -67,10 +67,10 @@ public function serialize($value, array $opts = array())
 
     /**
      * Unserialize
-     * 
+     *
      * @todo   Allow integration with unserialize_callback_func
-     * @param  string $serialized 
-     * @param  array $opts 
+     * @param  string $serialized
+     * @param  array $opts
      * @return mixed
      * @throws RuntimeException on unserialize error
      */
@@ -89,7 +89,7 @@ public function unserialize($serialized, array $opts = array())
             return $serialized;
         }
 
-        // If we have a serialized boolean false value, just return false; 
+        // If we have a serialized boolean false value, just return false;
         // prevents the unserialize handler from creating an error.
         if ($serialized === self::$serializedFalse) {
             return false;

src/Adapter/PythonPickle.php

@@ -1333,7 +1333,8 @@ protected function _loadTuple2()
      *
      * @return void
      */
-    protected function _loadTuple3() {
+    protected function _loadTuple3()
+    {
         $value3 = array_pop($this->_stack);
         $value2 = array_pop($this->_stack);
         $value1 = array_pop($this->_stack);

src/Adapter/Wddx.php

@@ -31,7 +31,7 @@ class Wddx extends AbstractAdapter
 
     /**
      * Constructor
-     * 
+     *
      * @param  array $options
      * @return void
      * @throws ExtensionNotLoadedException if wddx extension not found
@@ -47,9 +47,9 @@ public function __construct($options = array())
 
     /**
      * Serialize PHP to WDDX
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
+     *
+     * @param  mixed $value
+     * @param  array $opts
      * @return string
      * @throws RuntimeException on wddx error
      */
@@ -72,9 +72,9 @@ public function serialize($value, array $opts = array())
 
     /**
      * Unserialize from WDDX to PHP
-     * 
-     * @param  string $wddx 
-     * @param  array $opts 
+     *
+     * @param  string $wddx
+     * @param  array $opts
      * @return mixed
      * @throws RuntimeException on wddx error
      */

src/AdapterPluginManager.php

@@ -16,7 +16,7 @@
  * Plugin manager implementation for serializer adapters.
  *
  * Enforces that adapters retrieved are instances of
- * Adapter\AdapterInterface. Additionally, it registers a number of default 
+ * Adapter\AdapterInterface. Additionally, it registers a number of default
  * adapters available.
  *
  * @category   Zend
@@ -26,7 +26,7 @@ class AdapterPluginManager extends AbstractPluginManager
 {
     /**
      * Default set of adapters
-     * 
+     *
      * @var array
      */
     protected $invokableClasses = array(
@@ -45,8 +45,8 @@ class AdapterPluginManager extends AbstractPluginManager
      *
      * Checks that the adapter loaded is an instance
      * of Adapter\AdapterInterface.
-     * 
-     * @param  mixed $plugin 
+     *
+     * @param  mixed $plugin
      * @return void
      * @throws Exception\RuntimeException if invalid
      */

src/Exception/InvalidArgumentException.php

@@ -15,6 +15,6 @@
  * @category   Zend
  * @package    Zend_Serializer
  */
-class InvalidArgumentException extends \InvalidArgumentException implements 
+class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {}

src/Serializer.php

@@ -39,7 +39,7 @@ class Serializer
      * @param array |\Traversable $opts Serializer options
      * @return Adapter
      */
-    public static function factory($adapterName, $opts = array()) 
+    public static function factory($adapterName, $opts = array())
     {
         if ($adapterName instanceof Adapter) {
             return $adapterName; // $adapterName is already an adapter object
@@ -53,7 +53,7 @@ public static function factory($adapterName, $opts = array())
      *
      * @return AdapterPluginManager
      */
-    public static function getAdapterPluginManager() 
+    public static function getAdapterPluginManager()
     {
         if (self::$_adapters === null) {
             self::$_adapters = self::_getDefaultAdapterPluginManager();
@@ -67,11 +67,11 @@ public static function getAdapterPluginManager()
      * @param  AdapterPluginManager $adapters
      * @return void
      */
-    public static function setAdapterPluginManager(AdapterPluginManager $adapters) 
+    public static function setAdapterPluginManager(AdapterPluginManager $adapters)
     {
         self::$_adapters = $adapters;
     }
-    
+
     /**
      * Resets the internal adapter plugin manager
      *
@@ -82,7 +82,7 @@ public static function resetAdapterPluginManager()
         self::$_adapters = self::_getDefaultAdapterPluginManager();
         return self::$_adapters;
     }
-    
+
     /**
      * Returns a default adapter plugin manager
      *
@@ -100,7 +100,7 @@ protected static function _getDefaultAdapterPluginManager()
      * @param string|Adapter $adapter
      * @param array|\Traversable $options
      */
-    public static function setDefaultAdapter($adapter, $options = array()) 
+    public static function setDefaultAdapter($adapter, $options = array())
     {
         self::$_defaultAdapter = self::factory($adapter, $options);
     }
@@ -110,7 +110,7 @@ public static function setDefaultAdapter($adapter, $options = array())
      *
      * @return Adapter
      */
-    public static function getDefaultAdapter() 
+    public static function getDefaultAdapter()
     {
         if (!self::$_defaultAdapter instanceof Adapter) {
             self::setDefaultAdapter(self::$_defaultAdapter);
@@ -125,7 +125,7 @@ public static function getDefaultAdapter()
      * @param array $options
      * @return string
      */
-    public static function serialize($value, array $options = array()) 
+    public static function serialize($value, array $options = array())
     {
         if (isset($options['adapter'])) {
             $adapter = self::factory($options['adapter']);
@@ -144,7 +144,7 @@ public static function serialize($value, array $options = array())
      * @param array $options
      * @return mixed
      */
-    public static function unserialize($serialized, array $options = array()) 
+    public static function unserialize($serialized, array $options = array())
     {
         if (isset($options['adapter'])) {
             $adapter = self::factory($options['adapter']);

test/Adapter/JsonTest.php

@@ -97,7 +97,8 @@ public function testUnserializeFalse()
         $this->assertEquals($expected, $data);
     }
 
-    public function testUnserializeNull() {
+    public function testUnserializeNull()
+    {
         $value    = 'null';
         $expected = null;
 

test/Adapter/PhpCodeTest.php

@@ -129,7 +129,7 @@ public function testUnserializeObject()
     public function testUnserializeInvalid()
     {
         $value = 'not a serialized string';
-        
+
         $this->setExpectedException('Zend\Serializer\Exception\RuntimeException', 'eval failed: syntax error');
         $this->_adapter->unserialize($value);
     }

test/SerializerTest.php

@@ -60,7 +60,7 @@ public function testFactoryUnknownAdapter()
         $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
         Serializer::factory('unknown');
     }
-    
+
     public function testFactoryOnADummyClassAdapter()
     {
         $adapters = new AdapterPluginManager();