intraxia / jaxion

src/Axolotl/Dictionary.php

Indentation +368 added lines, -368 removed lines

@@ -14,372 +14,372 @@
  */
 class Dictionary implements DictionaryContract {
 
-	/**
-	 * Dictionary storage array.
-	 *
-	 * @var array
-	 */
-	protected $storage = array();
-
-	/**
-	 * Key Type service.
-	 *
-	 * @var Type
-	 */
-	protected $key_type;
-
-	/**
-	 * Value Type service.
-	 *
-	 * @var Type
-	 */
-	protected $val_type;
-
-	/**
-	 * Where Dictionary is in loop.
-	 *
-	 * @var int
-	 */
-	protected $position = 0;
-
-	/**
-	 * Dictionary keys.
-	 *
-	 * @var array
-	 */
-	protected $keys = array();
-
-	/**
-	 * Dictionary constructor.
-	 *
-	 * @param string $key_type
-	 * @param string $val_type
-	 * @param array  $storage
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	public function __construct( $key_type, $val_type, array $storage = array() ) {
-		$this->key_type = new Type( $key_type, true );
-		$this->val_type = new Type( $val_type );
-
-		foreach ( $storage as $key => $val ) {
-			$this->key_type->validate_element( $key );
-			$this->val_type->validate_element( $val );
-
-			$this->storage[ $key ] = $val;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @return string
-	 */
-	public function get_key_type() {
-		return $this->key_type->get_type();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @return string
-	 */
-	public function get_value_type() {
-		return $this->val_type->get_type();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param mixed $key Key to check.
-	 *
-	 * @return bool
-	 */
-	public function exists( $key ) {
-		return array_key_exists( $key, $this->storage );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param mixed $key Key to get.
-	 *
-	 * @return mixed|null
-	 */
-	public function get( $key ) {
-		return $this->exists( $key ) ? $this->storage[ $key ] : null;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param mixed $key Key to remove.
-	 *
-	 * @return DictionaryContract
-	 */
-	public function delete( $key ) {
-		$storage = $this->storage;
-		if ( $this->exists( $key ) ) {
-			unset( $storage[ $key ] );
-		}
-
-		return new static( $this->get_key_type(), $this->get_value_type(), $storage );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param mixed $value Value to validate.
-	 *
-	 * @return bool
-	 */
-	public function value_exists( $value ) {
-		return in_array( $value, $this->storage );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function count() {
-		return count( $this->storage );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function clear() {
-		return new static( $this->get_key_type(), $this->get_value_type() );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @return array
-	 */
-	public function to_array() {
-		return $this->storage;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param callable $condition Conditional callback.
-	 *
-	 * @return DictionaryContract
-	 */
-	public function filter( $condition ) {
-		$storage = array();
-
-		foreach ( $this->storage as $key => $value ) {
-			if ( call_user_func( $condition, $value, $key ) ) {
-				$storage[ $key ] = $value;
-			}
-		}
-
-		return new static( $this->get_key_type(), $this->get_value_type(), $storage );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param callable $condition Callback condition.
-	 *
-	 * @return DictionaryContract
-	 */
-	public function reject( $condition ) {
-		return $this->filter( function ( $v, $k ) use ( $condition ) {
-			return ! call_user_func( $condition, $v, $k );
-		} );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param mixed $key   Key to add.
-	 * @param mixed $value Value to add.
-	 *
-	 * @return DictionaryContract
-	 */
-	public function add( $key, $value ) {
-		$storage         = $this->storage;
-		$storage[ $key ] = $value;
-
-		return new static( $this->get_key_type(), $this->get_value_type(), $storage );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param callable $callable Function to call.
-	 */
-	public function each( $callable ) {
-		foreach ( $this->storage as $key => $value ) {
-			call_user_func( $callable, $value, $key );
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param mixed $key     Key to fetch.
-	 * @param mixed $default Default to return if key is missing.
-	 *
-	 * @return mixed
-	 */
-	public function get_or_else( $key, $default ) {
-		return ( $this->exists( $key ) ) ? $this->get( $key ) : $default;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function keys() {
-		return array_keys( $this->storage );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function values() {
-		return array_values( $this->storage );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param callable $callable Function to call.
-	 *
-	 * @return DictionaryContract
-	 */
-	public function map( $callable ) {
-		$items = array();
-		$val_type = null;
-
-		foreach ( $this->storage as $key => $val ) {
-			$v = call_user_func( $callable, $val, $key );
-
-			if ( ! isset( $val_type ) ) {
-				$val_type = gettype( $v );
-			}
-
-			$items[ $key ] = $v;
-		}
-
-		return new static( $this->get_key_type(), $val_type ? : $this->get_value_type(), $items );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param array|DictionaryContract $source Source to merge.
-	 *
-	 * @return DictionaryContract
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	public function merge( $source ) {
-		if ( $source instanceof self ) {
-			$source = $source->to_array();
-		}
-
-		if ( ! is_array( $source ) ) {
-			throw new InvalidArgumentException( 'Combine must be a Dictionary or an array' );
-		}
-
-		return new static( $this->get_key_type(), $this->get_value_type(), array_merge( $this->storage, $source ) );
-	}
-
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param callable $callable
-	 *
-	 * @return bool
-	 */
-	public function contains( $callable ) {
-		foreach ( $this->storage as $key => $value ) {
-			if ( call_user_func( $callable, $value, $key ) ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param callable $callable
-	 * @param mixed    $initial
-	 *
-	 * @return mixed
-	 */
-	public function reduce( $callable, $initial ) {
-		$carry = $initial;
-
-		foreach ( $this->storage as $key => $value ) {
-			$carry = $callable( $carry, $value, $key );
-		}
-
-		return $carry;
-	}
-
-	/**
-	 * Return the current element.
-	 *
-	 * @return mixed
-	 */
-	public function current() {
-		$key = $this->keys[ $this->position ];
-		return $this->storage[ $key ];
-	}
-
-	/**
-	 * Move forward to next element.
-	 */
-	public function next() {
-		$this->position ++;
-	}
-
-	/**
-	 * Return the key of the current element.
-	 *
-	 * @return mixed
-	 */
-	public function key() {
-		return $this->keys[ $this->position ];
-	}
-
-	/**
-	 * Checks if current position is valid.
-	 *
-	 * @return bool
-	 */
-	public function valid() {
-		return isset( $this->keys[ $this->position ] );
-	}
-
-	/**
-	 * Rewind the Iterator to the first element.
-	 */
-	public function rewind() {
-		$this->position = 0;
-		$this->keys = array_keys( $this->storage );
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @return array
-	 */
-	public function serialize() {
-		return $this->map(function( $val ) {
-			if ( $val instanceof Serializes ) {
-				$val = $val->serialize();
-			}
-
-			return $val;
-		})->to_array();
-	}
+    /**
+     * Dictionary storage array.
+     *
+     * @var array
+     */
+    protected $storage = array();
+
+    /**
+     * Key Type service.
+     *
+     * @var Type
+     */
+    protected $key_type;
+
+    /**
+     * Value Type service.
+     *
+     * @var Type
+     */
+    protected $val_type;
+
+    /**
+     * Where Dictionary is in loop.
+     *
+     * @var int
+     */
+    protected $position = 0;
+
+    /**
+     * Dictionary keys.
+     *
+     * @var array
+     */
+    protected $keys = array();
+
+    /**
+     * Dictionary constructor.
+     *
+     * @param string $key_type
+     * @param string $val_type
+     * @param array  $storage
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct( $key_type, $val_type, array $storage = array() ) {
+        $this->key_type = new Type( $key_type, true );
+        $this->val_type = new Type( $val_type );
+
+        foreach ( $storage as $key => $val ) {
+            $this->key_type->validate_element( $key );
+            $this->val_type->validate_element( $val );
+
+            $this->storage[ $key ] = $val;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function get_key_type() {
+        return $this->key_type->get_type();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function get_value_type() {
+        return $this->val_type->get_type();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param mixed $key Key to check.
+     *
+     * @return bool
+     */
+    public function exists( $key ) {
+        return array_key_exists( $key, $this->storage );
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param mixed $key Key to get.
+     *
+     * @return mixed|null
+     */
+    public function get( $key ) {
+        return $this->exists( $key ) ? $this->storage[ $key ] : null;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param mixed $key Key to remove.
+     *
+     * @return DictionaryContract
+     */
+    public function delete( $key ) {
+        $storage = $this->storage;
+        if ( $this->exists( $key ) ) {
+            unset( $storage[ $key ] );
+        }
+
+        return new static( $this->get_key_type(), $this->get_value_type(), $storage );
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param mixed $value Value to validate.
+     *
+     * @return bool
+     */
+    public function value_exists( $value ) {
+        return in_array( $value, $this->storage );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function count() {
+        return count( $this->storage );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clear() {
+        return new static( $this->get_key_type(), $this->get_value_type() );
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return array
+     */
+    public function to_array() {
+        return $this->storage;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param callable $condition Conditional callback.
+     *
+     * @return DictionaryContract
+     */
+    public function filter( $condition ) {
+        $storage = array();
+
+        foreach ( $this->storage as $key => $value ) {
+            if ( call_user_func( $condition, $value, $key ) ) {
+                $storage[ $key ] = $value;
+            }
+        }
+
+        return new static( $this->get_key_type(), $this->get_value_type(), $storage );
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param callable $condition Callback condition.
+     *
+     * @return DictionaryContract
+     */
+    public function reject( $condition ) {
+        return $this->filter( function ( $v, $k ) use ( $condition ) {
+            return ! call_user_func( $condition, $v, $k );
+        } );
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param mixed $key   Key to add.
+     * @param mixed $value Value to add.
+     *
+     * @return DictionaryContract
+     */
+    public function add( $key, $value ) {
+        $storage         = $this->storage;
+        $storage[ $key ] = $value;
+
+        return new static( $this->get_key_type(), $this->get_value_type(), $storage );
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param callable $callable Function to call.
+     */
+    public function each( $callable ) {
+        foreach ( $this->storage as $key => $value ) {
+            call_user_func( $callable, $value, $key );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param mixed $key     Key to fetch.
+     * @param mixed $default Default to return if key is missing.
+     *
+     * @return mixed
+     */
+    public function get_or_else( $key, $default ) {
+        return ( $this->exists( $key ) ) ? $this->get( $key ) : $default;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function keys() {
+        return array_keys( $this->storage );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function values() {
+        return array_values( $this->storage );
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param callable $callable Function to call.
+     *
+     * @return DictionaryContract
+     */
+    public function map( $callable ) {
+        $items = array();
+        $val_type = null;
+
+        foreach ( $this->storage as $key => $val ) {
+            $v = call_user_func( $callable, $val, $key );
+
+            if ( ! isset( $val_type ) ) {
+                $val_type = gettype( $v );
+            }
+
+            $items[ $key ] = $v;
+        }
+
+        return new static( $this->get_key_type(), $val_type ? : $this->get_value_type(), $items );
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param array|DictionaryContract $source Source to merge.
+     *
+     * @return DictionaryContract
+     *
+     * @throws InvalidArgumentException
+     */
+    public function merge( $source ) {
+        if ( $source instanceof self ) {
+            $source = $source->to_array();
+        }
+
+        if ( ! is_array( $source ) ) {
+            throw new InvalidArgumentException( 'Combine must be a Dictionary or an array' );
+        }
+
+        return new static( $this->get_key_type(), $this->get_value_type(), array_merge( $this->storage, $source ) );
+    }
+
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param callable $callable
+     *
+     * @return bool
+     */
+    public function contains( $callable ) {
+        foreach ( $this->storage as $key => $value ) {
+            if ( call_user_func( $callable, $value, $key ) ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param callable $callable
+     * @param mixed    $initial
+     *
+     * @return mixed
+     */
+    public function reduce( $callable, $initial ) {
+        $carry = $initial;
+
+        foreach ( $this->storage as $key => $value ) {
+            $carry = $callable( $carry, $value, $key );
+        }
+
+        return $carry;
+    }
+
+    /**
+     * Return the current element.
+     *
+     * @return mixed
+     */
+    public function current() {
+        $key = $this->keys[ $this->position ];
+        return $this->storage[ $key ];
+    }
+
+    /**
+     * Move forward to next element.
+     */
+    public function next() {
+        $this->position ++;
+    }
+
+    /**
+     * Return the key of the current element.
+     *
+     * @return mixed
+     */
+    public function key() {
+        return $this->keys[ $this->position ];
+    }
+
+    /**
+     * Checks if current position is valid.
+     *
+     * @return bool
+     */
+    public function valid() {
+        return isset( $this->keys[ $this->position ] );
+    }
+
+    /**
+     * Rewind the Iterator to the first element.
+     */
+    public function rewind() {
+        $this->position = 0;
+        $this->keys = array_keys( $this->storage );
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array
+     */
+    public function serialize() {
+        return $this->map(function( $val ) {
+            if ( $val instanceof Serializes ) {
+                $val = $val->serialize();
+            }
+
+            return $val;
+        })->to_array();
+    }
 }

Spacing +63 added lines, -63 removed lines

@@ -58,15 +58,15 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( $key_type, $val_type, array $storage = array() ) {
-		$this->key_type = new Type( $key_type, true );
-		$this->val_type = new Type( $val_type );
+	public function __construct($key_type, $val_type, array $storage = array()) {
+		$this->key_type = new Type($key_type, true);
+		$this->val_type = new Type($val_type);
 
-		foreach ( $storage as $key => $val ) {
-			$this->key_type->validate_element( $key );
-			$this->val_type->validate_element( $val );
+		foreach ($storage as $key => $val) {
+			$this->key_type->validate_element($key);
+			$this->val_type->validate_element($val);
 
-			$this->storage[ $key ] = $val;
+			$this->storage[$key] = $val;
 		}
 	}
 
@@ -95,8 +95,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function exists( $key ) {
-		return array_key_exists( $key, $this->storage );
+	public function exists($key) {
+		return array_key_exists($key, $this->storage);
 	}
 
 	/**
@@ -106,8 +106,8 @@ 
 	 *
 	 * @return mixed|null
 	 */
-	public function get( $key ) {
-		return $this->exists( $key ) ? $this->storage[ $key ] : null;
+	public function get($key) {
+		return $this->exists($key) ? $this->storage[$key] : null;
 	}
 
 	/**
@@ -117,13 +117,13 @@ 
 	 *
 	 * @return DictionaryContract
 	 */
-	public function delete( $key ) {
+	public function delete($key) {
 		$storage = $this->storage;
-		if ( $this->exists( $key ) ) {
-			unset( $storage[ $key ] );
+		if ($this->exists($key)) {
+			unset($storage[$key]);
 		}
 
-		return new static( $this->get_key_type(), $this->get_value_type(), $storage );
+		return new static($this->get_key_type(), $this->get_value_type(), $storage);
 	}
 
 	/**
@@ -133,22 +133,22 @@ 
 	 *
 	 * @return bool
 	 */
-	public function value_exists( $value ) {
-		return in_array( $value, $this->storage );
+	public function value_exists($value) {
+		return in_array($value, $this->storage);
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
 	public function count() {
-		return count( $this->storage );
+		return count($this->storage);
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
 	public function clear() {
-		return new static( $this->get_key_type(), $this->get_value_type() );
+		return new static($this->get_key_type(), $this->get_value_type());
 	}
 
 	/**
@@ -167,16 +167,16 @@ 
 	 *
 	 * @return DictionaryContract
 	 */
-	public function filter( $condition ) {
+	public function filter($condition) {
 		$storage = array();
 
-		foreach ( $this->storage as $key => $value ) {
-			if ( call_user_func( $condition, $value, $key ) ) {
-				$storage[ $key ] = $value;
+		foreach ($this->storage as $key => $value) {
+			if (call_user_func($condition, $value, $key)) {
+				$storage[$key] = $value;
 			}
 		}
 
-		return new static( $this->get_key_type(), $this->get_value_type(), $storage );
+		return new static($this->get_key_type(), $this->get_value_type(), $storage);
 	}
 
 	/**
@@ -186,9 +186,9 @@ 
 	 *
 	 * @return DictionaryContract
 	 */
-	public function reject( $condition ) {
-		return $this->filter( function ( $v, $k ) use ( $condition ) {
-			return ! call_user_func( $condition, $v, $k );
+	public function reject($condition) {
+		return $this->filter(function($v, $k) use ($condition) {
+			return !call_user_func($condition, $v, $k);
 		} );
 	}
 
@@ -200,11 +200,11 @@ 
 	 *
 	 * @return DictionaryContract
 	 */
-	public function add( $key, $value ) {
+	public function add($key, $value) {
 		$storage         = $this->storage;
-		$storage[ $key ] = $value;
+		$storage[$key] = $value;
 
-		return new static( $this->get_key_type(), $this->get_value_type(), $storage );
+		return new static($this->get_key_type(), $this->get_value_type(), $storage);
 	}
 
 	/**
@@ -212,9 +212,9 @@ 
 	 *
 	 * @param callable $callable Function to call.
 	 */
-	public function each( $callable ) {
-		foreach ( $this->storage as $key => $value ) {
-			call_user_func( $callable, $value, $key );
+	public function each($callable) {
+		foreach ($this->storage as $key => $value) {
+			call_user_func($callable, $value, $key);
 		}
 	}
 
@@ -226,22 +226,22 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function get_or_else( $key, $default ) {
-		return ( $this->exists( $key ) ) ? $this->get( $key ) : $default;
+	public function get_or_else($key, $default) {
+		return ($this->exists($key)) ? $this->get($key) : $default;
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
 	public function keys() {
-		return array_keys( $this->storage );
+		return array_keys($this->storage);
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
 	public function values() {
-		return array_values( $this->storage );
+		return array_values($this->storage);
 	}
 
 	/**
@@ -251,21 +251,21 @@ 
 	 *
 	 * @return DictionaryContract
 	 */
-	public function map( $callable ) {
+	public function map($callable) {
 		$items = array();
 		$val_type = null;
 
-		foreach ( $this->storage as $key => $val ) {
-			$v = call_user_func( $callable, $val, $key );
+		foreach ($this->storage as $key => $val) {
+			$v = call_user_func($callable, $val, $key);
 
-			if ( ! isset( $val_type ) ) {
-				$val_type = gettype( $v );
+			if (!isset($val_type)) {
+				$val_type = gettype($v);
 			}
 
-			$items[ $key ] = $v;
+			$items[$key] = $v;
 		}
 
-		return new static( $this->get_key_type(), $val_type ? : $this->get_value_type(), $items );
+		return new static($this->get_key_type(), $val_type ?: $this->get_value_type(), $items);
 	}
 
 	/**
@@ -277,16 +277,16 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function merge( $source ) {
-		if ( $source instanceof self ) {
+	public function merge($source) {
+		if ($source instanceof self) {
 			$source = $source->to_array();
 		}
 
-		if ( ! is_array( $source ) ) {
-			throw new InvalidArgumentException( 'Combine must be a Dictionary or an array' );
+		if (!is_array($source)) {
+			throw new InvalidArgumentException('Combine must be a Dictionary or an array');
 		}
 
-		return new static( $this->get_key_type(), $this->get_value_type(), array_merge( $this->storage, $source ) );
+		return new static($this->get_key_type(), $this->get_value_type(), array_merge($this->storage, $source));
 	}
 
 
@@ -297,9 +297,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public function contains( $callable ) {
-		foreach ( $this->storage as $key => $value ) {
-			if ( call_user_func( $callable, $value, $key ) ) {
+	public function contains($callable) {
+		foreach ($this->storage as $key => $value) {
+			if (call_user_func($callable, $value, $key)) {
 				return true;
 			}
 		}
@@ -315,11 +315,11 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function reduce( $callable, $initial ) {
+	public function reduce($callable, $initial) {
 		$carry = $initial;
 
-		foreach ( $this->storage as $key => $value ) {
-			$carry = $callable( $carry, $value, $key );
+		foreach ($this->storage as $key => $value) {
+			$carry = $callable($carry, $value, $key);
 		}
 
 		return $carry;
@@ -331,15 +331,15 @@ 
 	 * @return mixed
 	 */
 	public function current() {
-		$key = $this->keys[ $this->position ];
-		return $this->storage[ $key ];
+		$key = $this->keys[$this->position];
+		return $this->storage[$key];
 	}
 
 	/**
 	 * Move forward to next element.
 	 */
 	public function next() {
-		$this->position ++;
+		$this->position++;
 	}
 
 	/**
@@ -348,7 +348,7 @@ 
 	 * @return mixed
 	 */
 	public function key() {
-		return $this->keys[ $this->position ];
+		return $this->keys[$this->position];
 	}
 
 	/**
@@ -357,7 +357,7 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return isset( $this->keys[ $this->position ] );
+		return isset($this->keys[$this->position]);
 	}
 
 	/**
@@ -365,7 +365,7 @@ 
 	 */
 	public function rewind() {
 		$this->position = 0;
-		$this->keys = array_keys( $this->storage );
+		$this->keys = array_keys($this->storage);
 	}
 
 	/**
@@ -374,8 +374,8 @@ 
 	 * @return array
 	 */
 	public function serialize() {
-		return $this->map(function( $val ) {
-			if ( $val instanceof Serializes ) {
+		return $this->map(function($val) {
+			if ($val instanceof Serializes) {
 				$val = $val->serialize();
 			}