intraxia / jaxion

src/Axolotl/Collection.php

Spacing +141 added lines, -141 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( $condition ) {
-		return (bool) $this->find( $condition );
+	public function contains($condition) {
+		return (bool) $this->find($condition);
 	}
 
 	/**
@@ -121,10 +121,10 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function find( $condition ) {
-		$index = $this->find_index( $condition );
+	public function find($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( $condition ) {
+	public function find_index($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( $condition ) {
+	public function filter($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( $condition ) {
-		$index = $this->find_last_index( $condition );
+	public function find_last($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( $condition ) {
+	public function find_last_index($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,26 +243,26 @@ 
 	 *
 	 * @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;
 
-		return $this->new_from_trusted( array_slice( $this->elements, $start, $length ) );
+		return $this->new_from_trusted(array_slice($this->elements, $start, $length));
 	}
 
 	/**
@@ -276,16 +276,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));
 	}
 
 	/**
@@ -298,19 +298,19 @@ 
 	 *
 	 * @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);
 
-		if ( $index < 0 ) {
+		if ($index < 0) {
 			$index = $this->count() + $index + 1;
 		}
 
 		return $this->new_from_trusted(
 			array_merge(
-				array_slice( $this->elements, 0, $index ),
+				array_slice($this->elements, 0, $index),
 				$elements,
-				array_slice( $this->elements, $index, count( $this->elements ) )
+				array_slice($this->elements, $index, count($this->elements))
 			)
 		);
 	}
@@ -322,12 +322,12 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function without( $condition ) {
-		$inverse = function ( $element ) use ( $condition ) {
-			return ! call_user_func( $condition, $element );
+	public function without($condition) {
+		$inverse = function($element) use ($condition) {
+			return !call_user_func($condition, $element);
 		};
 
-		return $this->filter( $inverse );
+		return $this->filter($inverse);
 	}
 
 	/**
@@ -339,15 +339,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))
 			)
 		);
 	}
@@ -358,7 +358,7 @@ 
 	 */
 	public function reverse() {
 		return $this->new_from_trusted(
-			array_reverse( $this->elements )
+			array_reverse($this->elements)
 		);
 	}
 
@@ -369,10 +369,10 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function sort( $callback ) {
+	public function sort($callback) {
 		$elements = $this->elements;
-		usort( $elements, $callback );
-		return $this->new_from_trusted( $elements );
+		usort($elements, $callback);
+		return $this->new_from_trusted($elements);
 	}
 
 	/**
@@ -393,8 +393,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function reduce( $callable, $initial = null ) {
-		return array_reduce( $this->elements, $callable, $initial );
+	public function reduce($callable, $initial = null) {
+		return array_reduce($this->elements, $callable, $initial);
 	}
 
 	/**
@@ -404,13 +404,13 @@ 
 	 *
 	 * @return bool
 	 */
-	public function every( $condition ) {
+	public function every($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;
 			}
@@ -428,12 +428,12 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function drop( $num ) {
-		if ( $num > $this->count() ) {
+	public function drop($num) {
+		if ($num > $this->count()) {
 			$num = $this->count();
 		}
 
-		return $this->slice( $num, $this->count() );
+		return $this->slice($num, $this->count());
 	}
 
 	/**
@@ -445,9 +445,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();
 	}
 
@@ -458,9 +458,9 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function drop_while( $condition ) {
-		$count = $this->count_while_true( $condition );
-		return $count ? $this->drop( $count ) : $this;
+	public function drop_while($condition) {
+		$count = $this->count_while_true($condition);
+		return $count ? $this->drop($count) : $this;
 	}
 	/**
 	 * {@inheritdoc}
@@ -470,7 +470,7 @@ 
 	 * @throws InvalidArgumentException
 	 */
 	public function tail() {
-		return $this->slice( 1, $this->count() );
+		return $this->slice(1, $this->count());
 	}
 
 	/**
@@ -482,8 +482,8 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function take( $num ) {
-		return $this->slice( 0, $num - 1 );
+	public function take($num) {
+		return $this->slice(0, $num - 1);
 	}
 
 	/**
@@ -495,8 +495,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());
 	}
 
 	/**
@@ -506,10 +506,10 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function take_while( $condition ) {
-		$count = $this->count_while_true( $condition );
+	public function take_while($condition) {
+		$count = $this->count_while_true($condition);
 
-		return $count ? $this->take( $count ) : $this->clear();
+		return $count ? $this->take($count) : $this->clear();
 	}
 
 	/**
@@ -517,9 +517,9 @@ 
 	 *
 	 * @param callable $callable Callback function.
 	 */
-	public function each( $callable ) {
-		foreach ( $this->elements as $element ) {
-			call_user_func( $callable, $element );
+	public function each($callable) {
+		foreach ($this->elements as $element) {
+			call_user_func($callable, $element);
 		}
 	}
 
@@ -530,24 +530,24 @@ 
 	 *
 	 * @return Collection
 	 */
-	public function map( $callable ) {
+	public function map($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());
 	}
 
 	/**
@@ -558,9 +558,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function reduce_right( $callable, $initial = null ) {
+	public function reduce_right($callable, $initial = null) {
 		return array_reduce(
-			array_reverse( $this->elements ),
+			array_reverse($this->elements),
 			$callable,
 			$initial
 		);
@@ -573,9 +573,9 @@ 
 	 */
 	public function shuffle() {
 		$elements = $this->elements;
-		shuffle( $elements );
+		shuffle($elements);
 
-		return $this->new_from_trusted( $elements );
+		return $this->new_from_trusted($elements);
 	}
 
 	/**
@@ -587,19 +587,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)
 		);
 	}
 
@@ -611,11 +611,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);
 	}
 
 	/**
@@ -626,11 +626,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);
 	}
 
 	/**
@@ -639,7 +639,7 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->elements );
+		return count($this->elements);
 	}
 
 	/**
@@ -648,8 +648,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();
 			}
 
@@ -663,14 +663,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++;
 	}
 
 	/**
@@ -688,7 +688,7 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return isset( $this->elements[ $this->position ] );
+		return isset($this->elements[$this->position]);
 	}
 
 	/**
@@ -707,9 +707,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;
 	}
@@ -719,7 +719,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;
 	}
 
@@ -729,11 +729,11 @@ 
 	 * @param callable $condition Condition to check.
 	 * @return int
 	 */
-	protected function count_while_true( $condition ) {
+	protected function count_while_true($condition) {
 		$count = 0;
 
-		foreach ( $this->elements as $element ) {
-			if ( ! $condition($element) ) {
+		foreach ($this->elements as $element) {
+			if (!$condition($element)) {
 				break;
 			}
 			$count++;
@@ -749,11 +749,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');
 		}
 	}
 }