intraxia / jaxion

src/Axolotl/Model.php

Spacing +121 added lines, -121 removed lines

@@ -114,16 +114,16 @@ 
 	 *
 	 * @param array <string, mixed> $attributes
 	 */
-	public function __construct( array $attributes = array() ) {
+	public function __construct(array $attributes = array()) {
 		$this->maybe_boot();
 		$this->sync_original();
 
-		if ( $this->uses_wp_object() ) {
+		if ($this->uses_wp_object()) {
 			$this->create_wp_object();
 		}
 
 		$this->unguard();
-		$this->refresh( $attributes );
+		$this->refresh($attributes);
 		$this->reguard();
 	}
 
@@ -137,10 +137,10 @@ 
 	 *
 	 * @return $this
 	 */
-	public function refresh( array $attributes ) {
+	public function refresh(array $attributes) {
 		$this->clear();
 
-		return $this->merge( $attributes );
+		return $this->merge($attributes);
 	}
 
 	/**
@@ -150,9 +150,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function merge( array $attributes ) {
-		foreach ( $attributes as $name => $value ) {
-			$this->set_attribute( $name, $value );
+	public function merge(array $attributes) {
+		foreach ($attributes as $name => $value) {
+			$this->set_attribute($name, $value);
 		}
 
 		return $this;
@@ -167,7 +167,7 @@ 
 	 * @return array
 	 */
 	public function get_table_attributes() {
-		return $this->attributes[ self::TABLE_KEY ];
+		return $this->attributes[self::TABLE_KEY];
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 * @return array
 	 */
 	public function get_original_table_attributes() {
-		return $this->original[ self::TABLE_KEY ];
+		return $this->original[self::TABLE_KEY];
 	}
 
 	/**
@@ -189,11 +189,11 @@ 
 	public function get_changed_table_attributes() {
 		$changed = array();
 
-		foreach ( $this->get_table_attributes() as $key => $value ) {
-			if ( $value !==
-				 $this->get_original_attribute( $key )
+		foreach ($this->get_table_attributes() as $key => $value) {
+			if ($value !==
+				 $this->get_original_attribute($key)
 			) {
-				$changed[ $key ] = $value;
+				$changed[$key] = $value;
 			}
 		}
 
@@ -209,8 +209,8 @@ 
 	 * @return false|WP_Post|WP_Term
 	 */
 	public function get_underlying_wp_object() {
-		if ( isset( $this->attributes[ self::OBJECT_KEY ] ) ) {
-			return $this->attributes[ self::OBJECT_KEY ];
+		if (isset($this->attributes[self::OBJECT_KEY])) {
+			return $this->attributes[self::OBJECT_KEY];
 		}
 
 		return false;
@@ -222,7 +222,7 @@ 
 	 * @return WP_Post
 	 */
 	public function get_original_underlying_wp_object() {
-		return $this->original[ self::OBJECT_KEY ];
+		return $this->original[self::OBJECT_KEY];
 	}
 
 	/**
@@ -235,11 +235,11 @@ 
 	public function get_changed_wp_object_attributes() {
 		$changed = array();
 
-		foreach ( $this->get_wp_object_keys() as $key ) {
-			if ( $this->get_attribute( $key ) !==
-				 $this->get_original_attribute( $key )
+		foreach ($this->get_wp_object_keys() as $key) {
+			if ($this->get_attribute($key) !==
+				 $this->get_original_attribute($key)
 			) {
-				$changed[ $key ] = $this->get_attribute( $key );
+				$changed[$key] = $this->get_attribute($key);
 			}
 		}
 
@@ -254,8 +254,8 @@ 
 	 * @param string $name
 	 * @param mixed  $value
 	 */
-	public function __set( $name, $value ) {
-		$this->set_attribute( $name, $value );
+	public function __set($name, $value) {
+		$this->set_attribute($name, $value);
 	}
 
 	/**
@@ -272,23 +272,23 @@ 
 	 *
 	 * @throws GuardedPropertyException
 	 */
-	public function set_attribute( $name, $value ) {
-		if ( self::OBJECT_KEY === $name ) {
-			return $this->override_wp_object( $value );
+	public function set_attribute($name, $value) {
+		if (self::OBJECT_KEY === $name) {
+			return $this->override_wp_object($value);
 		}
 
-		if ( self::TABLE_KEY === $name ) {
-			return $this->override_table( $value );
+		if (self::TABLE_KEY === $name) {
+			return $this->override_table($value);
 		}
 
-		if ( ! $this->is_fillable( $name ) ) {
+		if (!$this->is_fillable($name)) {
 			throw new GuardedPropertyException;
 		}
 
-		if ( $method = $this->has_map_method( $name ) ) {
-			$this->attributes[ self::OBJECT_KEY ]->{$this->{$method}()} = $value;
+		if ($method = $this->has_map_method($name)) {
+			$this->attributes[self::OBJECT_KEY]->{$this->{$method}()} = $value;
 		} else {
-			$this->attributes[ self::TABLE_KEY ][ $name ] = $value;
+			$this->attributes[self::TABLE_KEY][$name] = $value;
 		}
 
 		return $this;
@@ -300,11 +300,11 @@ 
 	 * @return array
 	 */
 	public function get_attribute_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ]
+		return self::$memo[get_called_class()][__METHOD__]
 			= array_merge(
 				$this->fillable,
 				$this->guarded,
@@ -318,21 +318,21 @@ 
 	 * @return array
 	 */
 	public function get_table_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
 		$keys = array();
 
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( ! $this->has_map_method( $key ) &&
-				 ! $this->has_compute_method( $key )
+		foreach ($this->get_attribute_keys() as $key) {
+			if (!$this->has_map_method($key) &&
+				 !$this->has_compute_method($key)
 			) {
 				$keys[] = $key;
 			}
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+		return self::$memo[get_called_class()][__METHOD__] = $keys;
 	}
 
 	/**
@@ -341,19 +341,19 @@ 
 	 * @return array
 	 */
 	public function get_wp_object_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
 		$keys = array();
 
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( $this->has_map_method( $key ) ) {
+		foreach ($this->get_attribute_keys() as $key) {
+			if ($this->has_map_method($key)) {
 				$keys[] = $key;
 			}
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+		return self::$memo[get_called_class()][__METHOD__] = $keys;
 	}
 
 	/**
@@ -362,19 +362,19 @@ 
 	 * @return array
 	 */
 	public function get_computed_keys() {
-		if ( isset( self::$memo[ get_called_class() ][ __METHOD__ ] ) ) {
-			return self::$memo[ get_called_class() ][ __METHOD__ ];
+		if (isset(self::$memo[get_called_class()][__METHOD__])) {
+			return self::$memo[get_called_class()][__METHOD__];
 		}
 
 		$keys = array();
 
-		foreach ( $this->get_attribute_keys() as $key ) {
-			if ( $this->has_compute_method( $key ) ) {
+		foreach ($this->get_attribute_keys() as $key) {
+			if ($this->has_compute_method($key)) {
 				$keys[] = $key;
 			}
 		}
 
-		return self::$memo[ get_called_class() ][ __METHOD__ ] = $keys;
+		return self::$memo[get_called_class()][__METHOD__] = $keys;
 	}
 
 	/**
@@ -385,32 +385,32 @@ 
 	public function serialize() {
 		$attributes = array();
 
-		if ( $this->visible ) {
+		if ($this->visible) {
 			// If visible attributes are set, we'll only reveal those.
-			foreach ( $this->visible as $key ) {
-				$attributes[ $key ] = $this->get_attribute( $key );
+			foreach ($this->visible as $key) {
+				$attributes[$key] = $this->get_attribute($key);
 			}
-		} elseif ( $this->hidden ) {
+		} elseif ($this->hidden) {
 			// If hidden attributes are set, we'll grab everything and hide those.
-			foreach ( $this->get_attribute_keys() as $key ) {
-				if ( ! in_array( $key, $this->hidden ) ) {
-					$attributes[ $key ] = $this->get_attribute( $key );
+			foreach ($this->get_attribute_keys() as $key) {
+				if (!in_array($key, $this->hidden)) {
+					$attributes[$key] = $this->get_attribute($key);
 				}
 			}
 		} else {
 			// If nothing is hidden/visible, we'll grab and reveal everything.
-			foreach ( $this->get_attribute_keys() as $key ) {
-				$attributes[ $key ] = $this->get_attribute( $key );
+			foreach ($this->get_attribute_keys() as $key) {
+				$attributes[$key] = $this->get_attribute($key);
 			}
 		}
 
-		return array_map( function ( $attribute ) {
-			if ( $attribute instanceof Serializes ) {
+		return array_map(function($attribute) {
+			if ($attribute instanceof Serializes) {
 				return $attribute->serialize();
 			}
 
 			return $attribute;
-		}, $attributes );
+		}, $attributes);
 	}
 
 	/**
@@ -421,13 +421,13 @@ 
 	public function sync_original() {
 		$this->original = $this->attributes;
 
-		if ( $this->attributes[ self::OBJECT_KEY ] ) {
-			$this->original[ self::OBJECT_KEY ] = clone $this->attributes[ self::OBJECT_KEY ];
+		if ($this->attributes[self::OBJECT_KEY]) {
+			$this->original[self::OBJECT_KEY] = clone $this->attributes[self::OBJECT_KEY];
 		}
 
-		foreach ( $this->original[ self::TABLE_KEY ] as $key => $item ) {
-			if ( is_object( $item ) ) {
-				$this->original[ $key ] = clone $item;
+		foreach ($this->original[self::TABLE_KEY] as $key => $item) {
+			if (is_object($item)) {
+				$this->original[$key] = clone $item;
 			}
 		}
 
@@ -443,24 +443,24 @@ 
 	 *
 	 * @return bool
 	 */
-	private function is_fillable( $name ) {
+	private function is_fillable($name) {
 		// If this model isn't guarded, everything is fillable.
-		if ( ! $this->is_guarded ) {
+		if (!$this->is_guarded) {
 			return true;
 		}
 
 		// If it's in the fillable array, then it's fillable.
-		if ( in_array( $name, $this->fillable ) ) {
+		if (in_array($name, $this->fillable)) {
 			return true;
 		}
 
 		// If it's explicitly guarded, then it's not fillable.
-		if ( in_array( $name, $this->guarded ) ) {
+		if (in_array($name, $this->guarded)) {
 			return false;
 		}
 
 		// If fillable hasn't been defined, then everything else fillable.
-		return ! $this->fillable;
+		return !$this->fillable;
 	}
 
 	/**
@@ -472,13 +472,13 @@ 
 	 *
 	 * @return $this
 	 */
-	private function override_wp_object( $value ) {
-		if ( is_object( $value ) ) {
-			$this->attributes[ self::OBJECT_KEY ] = $this->set_wp_object_constants( $value );
+	private function override_wp_object($value) {
+		if (is_object($value)) {
+			$this->attributes[self::OBJECT_KEY] = $this->set_wp_object_constants($value);
 		} else {
-			$this->attributes[ self::OBJECT_KEY ] = null;
+			$this->attributes[self::OBJECT_KEY] = null;
 
-			if ( $this->uses_wp_object() ) {
+			if ($this->uses_wp_object()) {
 				$this->create_wp_object();
 			}
 		}
@@ -493,8 +493,8 @@ 
 	 *
 	 * @return $this
 	 */
-	private function override_table( array $value ) {
-		$this->attributes[ self::TABLE_KEY ] = $value;
+	private function override_table(array $value) {
+		$this->attributes[self::TABLE_KEY] = $value;
 
 		return $this;
 	}
@@ -508,19 +508,19 @@ 
 	 * @throws LogicException
 	 */
 	private function create_wp_object() {
-		switch ( true ) {
+		switch (true) {
 			case $this instanceof UsesWordPressPost:
-				$object = new WP_Post( (object) array() );
+				$object = new WP_Post((object) array());
 				break;
 			case $this instanceof UsesWordPressTerm:
-				$object = new WP_Term( (object) array() );
+				$object = new WP_Term((object) array());
 				break;
 			default:
 				throw new LogicException;
 				break;
 		}
 
-		$this->attributes[ self::OBJECT_KEY ] = $this->set_wp_object_constants( $object );
+		$this->attributes[self::OBJECT_KEY] = $this->set_wp_object_constants($object);
 	}
 
 	/**
@@ -534,12 +534,12 @@ 
 	 *
 	 * @return object
 	 */
-	protected function set_wp_object_constants( $object ) {
-		if ( $this instanceof UsesWordPressPost ) {
+	protected function set_wp_object_constants($object) {
+		if ($this instanceof UsesWordPressPost) {
 			$object->post_type = static::get_post_type();
 		}
 
-		if ( $this instanceof UsesWordPressTerm ) {
+		if ($this instanceof UsesWordPressTerm) {
 			$object->taxonomy = static::get_taxonomy();
 		}
 
@@ -555,8 +555,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get( $name ) {
-		return $this->get_attribute( $name );
+	public function __get($name) {
+		return $this->get_attribute($name);
 	}
 
 	/**
@@ -568,24 +568,24 @@ 
 	 *
 	 * @throws PropertyDoesNotExistException If property isn't found.
 	 */
-	public function get_attribute( $name ) {
-		if ( $method = $this->has_map_method( $name ) ) {
-			return $this->attributes[ self::OBJECT_KEY ]->{$this->{$method}()};
+	public function get_attribute($name) {
+		if ($method = $this->has_map_method($name)) {
+			return $this->attributes[self::OBJECT_KEY]->{$this->{$method}()};
 		}
 
-		if ( $method = $this->has_compute_method( $name ) ) {
+		if ($method = $this->has_compute_method($name)) {
 			return $this->{$method}();
 		}
 
-		if ( isset( $this->attributes[ self::TABLE_KEY ][ $name ] ) ) {
-			return $this->attributes[ self::TABLE_KEY ][ $name ];
+		if (isset($this->attributes[self::TABLE_KEY][$name])) {
+			return $this->attributes[self::TABLE_KEY][$name];
 		}
 
-		if ( isset( $this->defaults[ $name ] ) ) {
-			return $this->defaults[ $name ];
+		if (isset($this->defaults[$name])) {
+			return $this->defaults[$name];
 		}
 
-		throw new PropertyDoesNotExistException( $name );
+		throw new PropertyDoesNotExistException($name);
 	}
 
 	/**
@@ -597,18 +597,18 @@ 
 	 *
 	 * @throws PropertyDoesNotExistException If property isn't found.
 	 */
-	public function get_original_attribute( $name ) {
+	public function get_original_attribute($name) {
 		$original_attributes = $this->original;
 
-		if ( ! is_object( $original_attributes[ static::OBJECT_KEY ] ) ) {
-			unset( $original_attributes[ static::OBJECT_KEY ] );
+		if (!is_object($original_attributes[static::OBJECT_KEY])) {
+			unset($original_attributes[static::OBJECT_KEY]);
 		}
 
-		$original = new static( $original_attributes );
+		$original = new static($original_attributes);
 
 		try {
-			return $original->get_attribute( $name );
-		} catch ( Exception $exception ) {
+			return $original->get_attribute($name);
+		} catch (Exception $exception) {
 			return null;
 		}
 	}
@@ -622,11 +622,11 @@ 
 	 * @throws LogicException
 	 */
 	public function get_primary_id() {
-		if ( $this instanceof UsesWordPressPost ) {
+		if ($this instanceof UsesWordPressPost) {
 			return $this->get_underlying_wp_object()->ID;
 		}
 
-		if ( $this instanceof UsesWordPressTerm ) {
+		if ($this instanceof UsesWordPressTerm) {
 			return $this->get_underlying_wp_object()->term_id;
 		}
 
@@ -645,8 +645,8 @@ 
 	 *
 	 * @return false|string
 	 */
-	protected function has_map_method( $name ) {
-		if ( method_exists( $this, $method = "map_{$name}" ) ) {
+	protected function has_map_method($name) {
+		if (method_exists($this, $method = "map_{$name}")) {
 			return $method;
 		}
 
@@ -663,8 +663,8 @@ 
 	 *
 	 * @return false|string
 	 */
-	protected function has_compute_method( $name ) {
-		if ( method_exists( $this, $method = "compute_{$name}" ) ) {
+	protected function has_compute_method($name) {
+		if (method_exists($this, $method = "compute_{$name}")) {
 			return $method;
 		}
 
@@ -685,10 +685,10 @@ 
 			$this->get_wp_object_keys()
 		);
 
-		foreach ( $keys as $key ) {
+		foreach ($keys as $key) {
 			try {
-				$this->set_attribute( $key, null );
-			} catch ( GuardedPropertyException $e ) {
+				$this->set_attribute($key, null);
+			} catch (GuardedPropertyException $e) {
 				// We won't clear out guarded attributes.
 			}
 		}
@@ -722,13 +722,13 @@ 
 	 * @return array
 	 */
 	protected function get_compute_methods() {
-		$methods = get_class_methods( get_called_class() );
-		$methods = array_filter( $methods, function ( $method ) {
-			return strrpos( $method, 'compute_', - strlen( $method ) ) !== false;
+		$methods = get_class_methods(get_called_class());
+		$methods = array_filter($methods, function($method) {
+			return strrpos($method, 'compute_', - strlen($method)) !== false;
 		} );
-		$methods = array_map( function ( $method ) {
-			return substr( $method, strlen( 'compute_' ) );
-		}, $methods );
+		$methods = array_map(function($method) {
+			return substr($method, strlen('compute_'));
+		}, $methods);
 
 		return $methods;
 	}
@@ -737,8 +737,8 @@ 
 	 * Sets up the memo array for the creating model.
 	 */
 	private function maybe_boot() {
-		if ( ! isset( self::$memo[ get_called_class() ] ) ) {
-			self::$memo[ get_called_class() ] = array();
+		if (!isset(self::$memo[get_called_class()])) {
+			self::$memo[get_called_class()] = array();
 		}
 	}
 

src/Axolotl/Type.php

Spacing +33 added lines, -34 removed lines

@@ -27,8 +27,8 @@ 
 	 *
 	 * @param string $type
 	 */
-	public function __construct( $type ) {
-		$this->type = $this->determine( $type );
+	public function __construct($type) {
+		$this->type = $this->determine($type);
 	}
 
 	/**
@@ -46,12 +46,12 @@ 
 	 * @return bool
 	 */
 	public function is_model() {
-		if ( ! class_exists( $this->type ) ) {
+		if (!class_exists($this->type)) {
 			return false;
 		}
 
-		$reflection = new ReflectionClass( $this->type );
-		return $reflection->isSubclassOf( 'Intraxia\Jaxion\Axolotl\Model' );
+		$reflection = new ReflectionClass($this->type);
+		return $reflection->isSubclassOf('Intraxia\Jaxion\Axolotl\Model');
 	}
 
 	/**
@@ -61,8 +61,8 @@ 
 	 *
 	 * @return Model
 	 */
-	public function create_model( array $data ) {
-		return new $this->type( $data );
+	public function create_model(array $data) {
+		return new $this->type($data);
 	}
 
 	/**
@@ -72,9 +72,9 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function validate_elements( array $elements ) {
-		foreach ( $elements as $element ) {
-			$this->validate_element( $element );
+	public function validate_elements(array $elements) {
+		foreach ($elements as $element) {
+			$this->validate_element($element);
 		}
 	}
 
@@ -85,25 +85,25 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function validate_element( $element ) {
-		$type = gettype( $element );
+	public function validate_element($element) {
+		$type = gettype($element);
 		$callable = $this->type === 'callable';
 		$is_object = 'object' === $type;
 		$loose_check = $this->type === 'object';
 
 		// callable must be callable
-		if ( $callable && ! is_callable( $element ) ) {
-			throw new InvalidArgumentException( 'Item must be callable' );
+		if ($callable && !is_callable($element)) {
+			throw new InvalidArgumentException('Item must be callable');
 		}
 
 		// target isn't callable, object must be an instance of target
-		if ( ! $loose_check && ! $callable && $is_object && ! is_a( $element, $this->type ) ) {
-			throw new InvalidArgumentException( "Item is not type or subtype of $this->type" );
+		if (!$loose_check && !$callable && $is_object && !is_a($element, $this->type)) {
+			throw new InvalidArgumentException("Item is not type or subtype of $this->type");
 		}
 
 		// a non callable, non object type should match the target string
-		if ( ! $callable && ! $is_object && $type !== $this->type ) {
-			throw new InvalidArgumentException( "Item is not of type: $this->type" );
+		if (!$callable && !$is_object && $type !== $this->type) {
+			throw new InvalidArgumentException("Item is not of type: $this->type");
 		}
 	}
 
@@ -117,20 +117,20 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function determine( $type, $key_type = false ) {
-		if ( ! $key_type && $this->non_scalar_type_exists( $type ) ) {
+	private function determine($type, $key_type = false) {
+		if (!$key_type && $this->non_scalar_type_exists($type)) {
 			return $type;
 		}
 
-		if ( $scalar_type = $this->determine_scalar( $type ) ) {
-			if ( $key_type && (in_array( $scalar_type, [ 'double', 'boolean' ] )) ) {
-				throw new InvalidArgumentException( 'This type is not supported as a key.' );
+		if ($scalar_type = $this->determine_scalar($type)) {
+			if ($key_type && (in_array($scalar_type, ['double', 'boolean']))) {
+				throw new InvalidArgumentException('This type is not supported as a key.');
 			}
 
 			return $scalar_type;
 		}
 
-		throw new InvalidArgumentException( 'This type does not exist.' );
+		throw new InvalidArgumentException('This type does not exist.');
 	}
 
 	/**
@@ -140,10 +140,10 @@ 
 	 *
 	 * @return bool
 	 */
-	private function non_scalar_type_exists( $type ) {
-		return class_exists( $type )
-				|| interface_exists( $type )
-				|| in_array( $type, [ 'array', 'object', 'callable' ] );
+	private function non_scalar_type_exists($type) {
+		return class_exists($type)
+				|| interface_exists($type)
+				|| in_array($type, ['array', 'object', 'callable']);
 	}
 
 	/**
@@ -153,19 +153,18 @@ 
 	 *
 	 * @return string|null
 	 */
-	private function determine_scalar( $type ) {
+	private function determine_scalar($type) {
 		$synonyms = array(
 			'int' => 'integer',
 			'float' => 'double',
 			'bool' => 'boolean',
 		);
 
-		if ( array_key_exists( $type, $synonyms ) ) {
-			$type = $synonyms[ $type ];
+		if (array_key_exists($type, $synonyms)) {
+			$type = $synonyms[$type];
 		}
 
-		return in_array( $type, array( 'string', 'integer', 'double', 'boolean' ) ) ?
-			$type :
-			null;
+		return in_array($type, array('string', 'integer', 'double', 'boolean')) ?
+			$type : null;
 	}
 }

src/Contract/Axolotl/Collection.php

Spacing +27 added lines, -27 removed lines

@@ -23,7 +23,7 @@ 
 	 * @return Collection
 	 * @throws InvalidArgumentException
 	 */
-	public function add( $element );
+	public function add($element);
 
 	/**
 	 * Removes every element from the collection.
@@ -39,7 +39,7 @@ 
 	 * @param callable $condition
 	 * @return bool
 	 */
-	public function contains( callable $condition );
+	public function contains(callable $condition);
 
 	/**
 	 * Returns the first element in the collection that satisfies
@@ -48,7 +48,7 @@ 
 	 * @param callable $condition
 	 * @return mixed
 	 */
-	public function find( callable $condition );
+	public function find(callable $condition);
 
 	/**
 	 * Returns the index of the first element in the collection that satisfies
@@ -57,7 +57,7 @@ 
 	 * @param callable $condition
 	 * @return int
 	 */
-	public function find_index( callable $condition );
+	public function find_index(callable $condition);
 
 	/**
 	 * Returns the element in the collection at $index.
@@ -66,7 +66,7 @@ 
 	 * @return mixed
 	 * @throws OutOfRangeException
 	 */
-	public function at( $index );
+	public function at($index);
 
 	/**
 	 * Returns true if $index is within the collection's range and returns false
@@ -76,7 +76,7 @@ 
 	 * @return bool
 	 * @throws InvalidArgumentException
 	 */
-	public function index_exists( $index );
+	public function index_exists($index);
 
 	/**
 	 * Returns the number of elements in the collection.
@@ -92,7 +92,7 @@ 
 	 * @param callable $condition
 	 * @return Collection
 	 */
-	public function filter( callable $condition );
+	public function filter(callable $condition);
 
 	/**
 	 * Returns the last element in the collection that satisfies $condition,
@@ -101,7 +101,7 @@ 
 	 * @param callable $condition
 	 * @return mixed
 	 */
-	public function find_last( callable $condition );
+	public function find_last(callable $condition);
 
 	/**
 	 * Returns the index of the last element in the collection that satisfies
@@ -110,7 +110,7 @@ 
 	 * @param callable $condition
 	 * @return int
 	 */
-	public function find_last_index( callable $condition );
+	public function find_last_index(callable $condition);
 
 	/**
 	 * Returns a collection that contains the subset of elements ranging from the
@@ -121,7 +121,7 @@ 
 	 * @return Collection
 	 * @throws InvalidArgumentException
 	 */
-	public function slice( $start, $end );
+	public function slice($start, $end);
 
 	/**
 	 * Inserts $element at $index.
@@ -132,7 +132,7 @@ 
 	 * @throws InvalidArgumentException
 	 * @throws OutOfRangeException
 	 */
-	public function insert( $index, $element );
+	public function insert($index, $element);
 
 	/**
 	 * Inserts the range $elements at $index.
@@ -142,7 +142,7 @@ 
 	 * @return Collection
 	 * @throws OutOfRangeException
 	 */
-	public function insert_range( $index, array $elements );
+	public function insert_range($index, array $elements);
 
 	/**
 	 * Removes all of the elements that satisfy $condition.
@@ -150,7 +150,7 @@ 
 	 * @param  callable $condition
 	 * @return Collection
 	 */
-	public function without( callable $condition );
+	public function without(callable $condition);
 
 	/**
 	 * Removes the element at $index.
@@ -159,7 +159,7 @@ 
 	 * @return Collection
 	 * @throws OutOfRangeException
 	 */
-	public function remove_at( $index );
+	public function remove_at($index);
 
 	/**
 	 * Reverses the order of the elements in the collection.
@@ -175,7 +175,7 @@ 
 	 * @param callable $callback
 	 * @return Collection
 	 */
-	public function sort( callable $callback );
+	public function sort(callable $callback);
 
 	/**
 	 * Returns an array containing the elements in the collection.
@@ -192,7 +192,7 @@ 
 	 * @param null     $initial
 	 * @return mixed
 	 */
-	public function reduce( callable $callable, $initial = null );
+	public function reduce(callable $callable, $initial = null);
 
 	/**
 	 * Returns true if every element in the collection satisfies $condition,
@@ -201,7 +201,7 @@ 
 	 * @param callable $condition
 	 * @return bool
 	 */
-	public function every( callable $condition );
+	public function every(callable $condition);
 
 	/**
 	 * Removes all of the elements in the collection starting at index $num.
@@ -210,7 +210,7 @@ 
 	 * @return Collection
 	 * @throws InvalidArgumentException
 	 */
-	public function drop( $num );
+	public function drop($num);
 
 	/**
 	 * Removes all of the elements in the collectioin between index 0 and $num.
@@ -219,7 +219,7 @@ 
 	 * @return Collection
 	 * @throws InvalidArgumentException
 	 */
-	public function drop_right( $num );
+	public function drop_right($num);
 
 	/**
 	 * Iteratively drops elements in the collection that satisfy $condition until
@@ -228,7 +228,7 @@ 
 	 * @param callable $condition
 	 * @return Collection
 	 */
-	public function drop_while( callable $condition );
+	public function drop_while(callable $condition);
 
 	/**
 	 * Removes the first element in the collection.
@@ -245,7 +245,7 @@ 
 	 * @return Collection
 	 * @throws InvalidArgumentException
 	 */
-	public function take( $num );
+	public function take($num);
 
 	/**
 	 * Removes all of the elements in the collection before index $num.
@@ -254,7 +254,7 @@ 
 	 * @return Collection
 	 * @throws InvalidArgumentException
 	 */
-	public function take_right( $num );
+	public function take_right($num);
 
 	/**
 	 * Iterates through the collection until an element is encountered that does
@@ -264,14 +264,14 @@ 
 	 * @param callable $condition
 	 * @return Collection
 	 */
-	public function take_while( callable $condition );
+	public function take_while(callable $condition);
 
 	/**
 	 * Applies the callback function $callable to each element in the collection.
 	 *
 	 * @param callable $callable
 	 */
-	public function each( callable $callable );
+	public function each(callable $callable);
 
 	/**
 	 * Returns a new instance of the collection with the callback function
@@ -280,7 +280,7 @@ 
 	 * @param callable $callable
 	 * @return Collection
 	 */
-	public function map( callable $callable );
+	public function map(callable $callable);
 
 	/**
 	 * Iteratively reduces the collection to a single value using the callback
@@ -290,7 +290,7 @@ 
 	 * @param null     $initial
 	 * @return mixed
 	 */
-	public function reduce_right( callable $callable, $initial = null );
+	public function reduce_right(callable $callable, $initial = null);
 
 	/**
 	 * Randomly reorders the elements in the collection.
@@ -306,7 +306,7 @@ 
 	 * @return Collection
 	 * @throws InvalidArgumentException
 	 */
-	public function merge( $elements );
+	public function merge($elements);
 
 	/**
 	 * Get first element of the collection

src/Axolotl/Collection.php

Spacing +144 added lines, -144 removed lines

@@ -42,19 +42,19 @@ 
 	 * @param string $type
 	 * @param array  $elements
 	 */
-	public function __construct( $type, array $elements = array() ) {
-		$this->type = new Type( $type );
+	public function __construct($type, array $elements = array()) {
+		$this->type = new Type($type);
 
-		if ( $this->type->is_model() ) {
-			foreach ( $elements as $idx => $element ) {
-				if ( is_array( $element ) ) {
-					$elements[ $idx ] = $this->type->create_model( $element );
+		if ($this->type->is_model()) {
+			foreach ($elements as $idx => $element) {
+				if (is_array($element)) {
+					$elements[$idx] = $this->type->create_model($element);
 				}
 			}
 		}
 
-		if ( $elements ) {
-			$this->type->validate_elements( $elements );
+		if ($elements) {
+			$this->type->validate_elements($elements);
 		}
 
 		$this->elements = $elements;
@@ -78,18 +78,18 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function add( $element ) {
-		if ( $this->type->is_model() && is_array( $element ) ) {
-			$element = $this->type->create_model( $element );
+	public function add($element) {
+		if ($this->type->is_model() && is_array($element)) {
+			$element = $this->type->create_model($element);
 		}
 
-		$this->type->validate_element( $element );
+		$this->type->validate_element($element);
 
 		$elements   = $this->elements;
 		$elements[] = $element;
 
-		$collection = new static( $this->get_type() );
-		$collection->set_from_trusted( $elements );
+		$collection = new static($this->get_type());
+		$collection->set_from_trusted($elements);
 
 		return $collection;
 	}
@@ -100,7 +100,7 @@ 
 	 * @return Collection
 	 */
 	public function clear() {
-		return new static( $this->get_type() );
+		return new static($this->get_type());
 	}
 
 	/**
@@ -110,8 +110,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function contains( callable $condition ) {
-		return (bool) $this->find( $condition );
+	public function contains(callable $condition) {
+		return (bool) $this->find($condition);
 	}
 
 	/**
@@ -121,10 +121,10 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function find( callable $condition ) {
-		$index = $this->find_index( $condition );
+	public function find(callable $condition) {
+		$index = $this->find_index($condition);
 
-		return -1 === $index ? false : $this->elements[ $index ];
+		return -1 === $index ? false : $this->elements[$index];
 	}
 
 	/**
@@ -134,11 +134,11 @@ 
 	 *
 	 * @return int
 	 */
-	public function find_index( callable $condition ) {
+	public function find_index(callable $condition) {
 		$index = -1;
 
-		for ( $i = 0, $count = count( $this->elements ); $i < $count; $i++ ) {
-			if ( call_user_func( $condition, ($this->at( $i ) ) ) ) {
+		for ($i = 0, $count = count($this->elements); $i < $count; $i++) {
+			if (call_user_func($condition, ($this->at($i)))) {
 				$index = $i;
 				break;
 			}
@@ -156,10 +156,10 @@ 
 	 *
 	 * @throws OutOfRangeException
 	 */
-	public function at( $index ) {
-		$this->validate_index( $index );
+	public function at($index) {
+		$this->validate_index($index);
 
-		return $this->elements[ $index ];
+		return $this->elements[$index];
 	}
 
 	/**
@@ -171,13 +171,13 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function index_exists( $index ) {
-		if ( ! is_int( $index ) ) {
-			throw new InvalidArgumentException( 'Index must be an integer' );
+	public function index_exists($index) {
+		if (!is_int($index)) {
+			throw new InvalidArgumentException('Index must be an integer');
 		}
 
-		if ( $index < 0 ) {
-			throw new InvalidArgumentException( 'Index must be a non-negative integer' );
+		if ($index < 0) {
+			throw new InvalidArgumentException('Index must be a non-negative integer');
 		}
 
 		return $index < $this->count();
@@ -190,16 +190,16 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function filter( callable $condition ) {
+	public function filter(callable $condition) {
 		$elements = array();
 
-		foreach ( $this->elements as $element ) {
-			if ( call_user_func( $condition, $element ) ) {
+		foreach ($this->elements as $element) {
+			if (call_user_func($condition, $element)) {
 				$elements[] = $element;
 			}
 		}
 
-		return $this->new_from_trusted( $elements );
+		return $this->new_from_trusted($elements);
 	}
 	/**
 	 * {@inheritdoc}
@@ -208,10 +208,10 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function find_last( callable $condition ) {
-		$index = $this->find_last_index( $condition );
+	public function find_last(callable $condition) {
+		$index = $this->find_last_index($condition);
 
-		return -1 === $index ? null : $this->elements[ $index ];
+		return -1 === $index ? null : $this->elements[$index];
 	}
 
 	/**
@@ -220,11 +220,11 @@ 
 	 * @param  callable $condition
 	 * @return int
 	 */
-	public function find_last_index( callable $condition ) {
+	public function find_last_index(callable $condition) {
 		$index = -1;
 
-		for ( $i = count( $this->elements ) - 1; $i >= 0; $i-- ) {
-			if ( call_user_func( $condition, $this->elements[ $i ] ) ) {
+		for ($i = count($this->elements) - 1; $i >= 0; $i--) {
+			if (call_user_func($condition, $this->elements[$i])) {
 				$index = $i;
 				break;
 			}
@@ -243,28 +243,28 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function slice( $start, $end ) {
-		if ( $start < 0 || ! is_int( $start ) ) {
-			throw new InvalidArgumentException( 'Start must be a non-negative integer' );
+	public function slice($start, $end) {
+		if ($start < 0 || !is_int($start)) {
+			throw new InvalidArgumentException('Start must be a non-negative integer');
 		}
 
-		if ( $end < 0 || ! is_int( $end ) ) {
-			throw new InvalidArgumentException( 'End must be a positive integer' );
+		if ($end < 0 || !is_int($end)) {
+			throw new InvalidArgumentException('End must be a positive integer');
 		}
 
-		if ( $start > $end ) {
-			throw new InvalidArgumentException( 'End must be greater than start' );
+		if ($start > $end) {
+			throw new InvalidArgumentException('End must be greater than start');
 		}
 
-		if ( $end > $this->count() + 1 ) {
-			throw new InvalidArgumentException( 'End must be less than the count of the items in the Collection' );
+		if ($end > $this->count() + 1) {
+			throw new InvalidArgumentException('End must be less than the count of the items in the Collection');
 		}
 
 		$length = $end - $start + 1;
-		$subset = array_slice( $this->elements, $start, $length );
+		$subset = array_slice($this->elements, $start, $length);
 
 		$collection = new static($this->type);
-		$collection->set_from_trusted( $subset );
+		$collection->set_from_trusted($subset);
 
 		return $collection;
 	}
@@ -280,16 +280,16 @@ 
 	 * @throws InvalidArgumentException
 	 * @throws OutOfRangeException
 	 */
-	public function insert( $index, $element ) {
-		$this->validate_index( $index );
-		$this->type->validate_element( $element );
+	public function insert($index, $element) {
+		$this->validate_index($index);
+		$this->type->validate_element($element);
 
-		$a = array_slice( $this->elements, 0, $index );
-		$b = array_slice( $this->elements, $index, count( $this->elements ) );
+		$a = array_slice($this->elements, 0, $index);
+		$b = array_slice($this->elements, $index, count($this->elements));
 
 		$a[] = $element;
 
-		return $this->new_from_trusted( array_merge( $a, $b ) );
+		return $this->new_from_trusted(array_merge($a, $b));
 	}
 
 	/**
@@ -302,21 +302,21 @@ 
 	 *
 	 * @throws OutOfRangeException
 	 */
-	public function insert_range( $index, array $elements ) {
-		$this->validate_index( $index );
-		$this->type->validate_elements( $elements );
+	public function insert_range($index, array $elements) {
+		$this->validate_index($index);
+		$this->type->validate_elements($elements);
 
 		// To work with negative index, get the positive relation to 0 index
 		$index < 0 && $index = $this->count() + $index + 1;
 
-		$partA = array_slice( $this->elements, 0, $index );
-		$partB = array_slice( $this->elements, $index, count( $this->elements ) );
+		$partA = array_slice($this->elements, 0, $index);
+		$partB = array_slice($this->elements, $index, count($this->elements));
 
-		$elements1 = array_merge( $partA, $elements );
-		$elements1 = array_merge( $elements1, $partB );
+		$elements1 = array_merge($partA, $elements);
+		$elements1 = array_merge($elements1, $partB);
 
-		$col = new static( $this->type );
-		$col->set_from_trusted( $elements1 );
+		$col = new static($this->type);
+		$col->set_from_trusted($elements1);
 
 		return $col;
 	}
@@ -328,12 +328,12 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function without( callable $condition ) {
-		$inverse = function ( $element ) use ( $condition ) {
-			return ! call_user_func( $condition, $element );
+	public function without(callable $condition) {
+		$inverse = function($element) use ($condition) {
+			return !call_user_func($condition, $element);
 		};
 
-		return $this->filter( $inverse );
+		return $this->filter($inverse);
 	}
 
 	/**
@@ -345,15 +345,15 @@ 
 	 *
 	 * @throws OutOfRangeException
 	 */
-	public function remove_at( $index ) {
-		$this->validate_index( $index );
+	public function remove_at($index) {
+		$this->validate_index($index);
 
 		$elements = $this->elements;
 
 		return $this->new_from_trusted(
 			array_merge(
-				array_slice( $elements, 0, $index ),
-				array_slice( $elements, $index + 1, count( $elements ) )
+				array_slice($elements, 0, $index),
+				array_slice($elements, $index + 1, count($elements))
 			)
 		);
 	}
@@ -364,7 +364,7 @@ 
 	 */
 	public function reverse() {
 		return $this->new_from_trusted(
-			array_reverse( $this->elements )
+			array_reverse($this->elements)
 		);
 	}
 
@@ -375,10 +375,10 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function sort( callable $callback ) {
+	public function sort(callable $callback) {
 		$elements = $this->elements;
-		usort( $elements, $callback );
-		return $this->new_from_trusted( $elements );
+		usort($elements, $callback);
+		return $this->new_from_trusted($elements);
 	}
 
 	/**
@@ -399,8 +399,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function reduce( callable $callable, $initial = null ) {
-		return array_reduce( $this->elements, $callable, $initial );
+	public function reduce(callable $callable, $initial = null) {
+		return array_reduce($this->elements, $callable, $initial);
 	}
 
 	/**
@@ -410,13 +410,13 @@ 
 	 *
 	 * @return bool
 	 */
-	public function every( callable $condition ) {
+	public function every(callable $condition) {
 		$response = true;
 
-		foreach ( $this->elements as $element ) {
-			$result = call_user_func( $condition, $element );
+		foreach ($this->elements as $element) {
+			$result = call_user_func($condition, $element);
 
-			if ( false === $result ) {
+			if (false === $result) {
 				$response = false;
 				break;
 			}
@@ -434,8 +434,8 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function drop( $num ) {
-		return $this->slice( $num, $this->count() );
+	public function drop($num) {
+		return $this->slice($num, $this->count());
 	}
 
 	/**
@@ -447,9 +447,9 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function drop_right( $num ) {
+	public function drop_right($num) {
 		return $num !== $this->count()
-			? $this->slice( 0, $this->count() - $num - 1 )
+			? $this->slice(0, $this->count() - $num - 1)
 			: $this->clear();
 	}
 
@@ -460,9 +460,9 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function drop_while( callable $condition ) {
-		$count = $this->count_while_true( $condition );
-		return $count ? $this->drop( $count ) : $this;
+	public function drop_while(callable $condition) {
+		$count = $this->count_while_true($condition);
+		return $count ? $this->drop($count) : $this;
 	}
 	/**
 	 * {@inheritdoc}
@@ -472,7 +472,7 @@ 
 	 * @throws InvalidArgumentException
 	 */
 	public function tail() {
-		return $this->slice( 1, $this->count() );
+		return $this->slice(1, $this->count());
 	}
 
 	/**
@@ -484,8 +484,8 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function take( $num ) {
-		return $this->slice( 0, $num - 1 );
+	public function take($num) {
+		return $this->slice(0, $num - 1);
 	}
 
 	/**
@@ -497,8 +497,8 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function take_right( $num ) {
-		return $this->slice( $this->count() - $num, $this->count() );
+	public function take_right($num) {
+		return $this->slice($this->count() - $num, $this->count());
 	}
 
 	/**
@@ -508,10 +508,10 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function take_while( callable $condition ) {
-		$count = $this->count_while_true( $condition );
+	public function take_while(callable $condition) {
+		$count = $this->count_while_true($condition);
 
-		return $count ? $this->take( $count ) : $this->clear();
+		return $count ? $this->take($count) : $this->clear();
 	}
 
 	/**
@@ -519,9 +519,9 @@ 
 	 *
 	 * @param callable $callable Callback function.
 	 */
-	public function each( callable $callable ) {
-		foreach ( $this->elements as $element ) {
-			call_user_func( $callable, $element );
+	public function each(callable $callable) {
+		foreach ($this->elements as $element) {
+			call_user_func($callable, $element);
 		}
 	}
 
@@ -532,24 +532,24 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function map( callable $callable ) {
+	public function map(callable $callable) {
 		$elements = array();
 		$type = null;
-		foreach ( $this->elements as $element ) {
-			$result = call_user_func( $callable, $element );
+		foreach ($this->elements as $element) {
+			$result = call_user_func($callable, $element);
 
-			if ( null === $type ) {
-				$type = gettype( $result );
+			if (null === $type) {
+				$type = gettype($result);
 
-				if ( 'object' === $type ) {
-					$type = get_class( $result );
+				if ('object' === $type) {
+					$type = get_class($result);
 				}
 			}
 
 			$elements[] = $result;
 		}
 
-		return $this->new_from_trusted( $elements, $type ? : $this->get_type() );
+		return $this->new_from_trusted($elements, $type ?: $this->get_type());
 	}
 
 	/**
@@ -560,9 +560,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function reduce_right( callable $callable, $initial = null ) {
+	public function reduce_right(callable $callable, $initial = null) {
 		return array_reduce(
-			array_reverse( $this->elements ),
+			array_reverse($this->elements),
 			$callable,
 			$initial
 		);
@@ -575,9 +575,9 @@ 
 	 */
 	public function shuffle() {
 		$elements = $this->elements;
-		shuffle( $elements );
+		shuffle($elements);
 
-		return $this->new_from_trusted( $elements );
+		return $this->new_from_trusted($elements);
 	}
 
 	/**
@@ -589,19 +589,19 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function merge( $elements ) {
-		if ( $elements instanceof static ) {
+	public function merge($elements) {
+		if ($elements instanceof static) {
 			$elements = $elements->to_array();
 		}
 
-		if ( ! is_array( $elements ) ) {
-			throw new InvalidArgumentException( 'Merge must be given array or Collection' );
+		if (!is_array($elements)) {
+			throw new InvalidArgumentException('Merge must be given array or Collection');
 		}
 
-		$this->type->validate_elements( $elements );
+		$this->type->validate_elements($elements);
 
 		return $this->new_from_trusted(
-			array_merge( $this->elements, $elements )
+			array_merge($this->elements, $elements)
 		);
 	}
 
@@ -613,11 +613,11 @@ 
 	 * @throws OutOfBoundsException
 	 */
 	public function first() {
-		if ( empty( $this->elements ) ) {
-			throw new OutOfBoundsException( 'Cannot get first element of empty Collection' );
+		if (empty($this->elements)) {
+			throw new OutOfBoundsException('Cannot get first element of empty Collection');
 		}
 
-		return reset( $this->elements );
+		return reset($this->elements);
 	}
 
 	/**
@@ -628,11 +628,11 @@ 
 	 * @throws OutOfBoundsException
 	 */
 	public function last() {
-		if ( empty( $this->elements ) ) {
-			throw new OutOfBoundsException( 'Cannot get last element of empty Collection' );
+		if (empty($this->elements)) {
+			throw new OutOfBoundsException('Cannot get last element of empty Collection');
 		}
 
-		return end( $this->elements );
+		return end($this->elements);
 	}
 
 	/**
@@ -641,7 +641,7 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->elements );
+		return count($this->elements);
 	}
 
 	/**
@@ -650,8 +650,8 @@ 
 	 * @return array
 	 */
 	public function serialize() {
-		return $this->map(function( $element ) {
-			if ( $element instanceof Serializes ) {
+		return $this->map(function($element) {
+			if ($element instanceof Serializes) {
 				return $element->serialize();
 			}
 
@@ -665,14 +665,14 @@ 
 	 * @return mixed
 	 */
 	public function current() {
-		return $this->at( $this->position );
+		return $this->at($this->position);
 	}
 
 	/**
 	 * Move forward to next element.
 	 */
 	public function next() {
-		$this->position ++;
+		$this->position++;
 	}
 
 	/**
@@ -690,7 +690,7 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return isset( $this->elements[ $this->position ] );
+		return isset($this->elements[$this->position]);
 	}
 
 	/**
@@ -709,9 +709,9 @@ 
 	 *
 	 * @return static
 	 */
-	protected function new_from_trusted( array $elements, $type = null ) {
-		$collection = new static( null !== $type ? $type : $this->get_type() );
-		$collection->set_from_trusted( $elements );
+	protected function new_from_trusted(array $elements, $type = null) {
+		$collection = new static(null !== $type ? $type : $this->get_type());
+		$collection->set_from_trusted($elements);
 
 		return $collection;
 	}
@@ -721,7 +721,7 @@ 
 	 *
 	 * @param array $elements Pre-validated elements to set.
 	 */
-	protected function set_from_trusted( array $elements ) {
+	protected function set_from_trusted(array $elements) {
 		$this->elements = $elements;
 	}
 
@@ -731,11 +731,11 @@ 
 	 * @param callable $condition Condition to check.
 	 * @return int
 	 */
-	protected function count_while_true( callable $condition ) {
+	protected function count_while_true(callable $condition) {
 		$count = 0;
 
-		foreach ( $this->elements as $element ) {
-			if ( ! $condition($element) ) {
+		foreach ($this->elements as $element) {
+			if (!$condition($element)) {
 				break;
 			}
 			$count++;
@@ -751,11 +751,11 @@ 
 	 *
 	 * @throws OutOfRangeException
 	 */
-	protected function validate_index( $index ) {
-		$exists = $this->index_exists( $index );
+	protected function validate_index($index) {
+		$exists = $this->index_exists($index);
 
-		if ( ! $exists ) {
-			throw new OutOfRangeException( 'Index out of bounds of collection' );
+		if (!$exists) {
+			throw new OutOfRangeException('Index out of bounds of collection');
 		}
 	}
 }