chillerlan / php-traits

src/SPL/SeekableIteratorTrait.php

Spacing +4 added lines, -4 removed lines

@@ -21,19 +21,19 @@
  *
  * @link http://php.net/manual/class.seekableiterator.php
  */
-trait SeekableIteratorTrait{
+trait SeekableIteratorTrait {
 	use IteratorTrait;
 
 	/**
 	 * @link  http://php.net/manual/seekableiterator.seek.php
 	 * @inheritdoc
 	 */
-	public function seek($pos){
+	public function seek($pos) {
 		$this->rewind();
 
-		for( ; $this->offset < $pos; ){
+		for (; $this->offset < $pos;) {
 
-			if(!next($this->array)) {
+			if (!next($this->array)) {
 				throw new OutOfBoundsException('invalid seek position: '.$pos);
 			}
 

src/Container.php

Spacing +9 added lines, -9 removed lines

@@ -17,16 +17,16 @@ 
 /**
  * a generic container with magic getter and setter
  */
-trait Container{
+trait Container {
 
 	/**
 	 * @param array $properties
 	 */
-	public function __construct(array $properties = null){
+	public function __construct(array $properties = null) {
 
-		if(!empty($properties)){
+		if (!empty($properties)) {
 
-			foreach($properties as $key => $value){
+			foreach ($properties as $key => $value) {
 				$this->__set($key, $value);
 			}
 
@@ -39,9 +39,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get(string $property){
+	public function __get(string $property) {
 
-		if(property_exists($this, $property) && !(new ReflectionProperty($this, $property))->isPrivate()){
+		if (property_exists($this, $property) && !(new ReflectionProperty($this, $property))->isPrivate()) {
 			return $this->{$property};
 		}
 
@@ -54,9 +54,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function __set(string $property, $value){
+	public function __set(string $property, $value) {
 
-		if(property_exists($this, $property) && !(new ReflectionProperty($this, $property))->isPrivate()){
+		if (property_exists($this, $property) && !(new ReflectionProperty($this, $property))->isPrivate()) {
 			$this->{$property} = $value;
 		}
 
@@ -68,7 +68,7 @@ 
 	public function __toArray():array {
 		$data = [];
 
-		foreach($this as $key => $value){
+		foreach ($this as $key => $value) {
 			$data[$key] = $value;
 		}
 

src/ArrayHelpers/ByteArrayDispenser.php

Spacing +14 added lines, -14 removed lines

@@ -19,7 +19,7 @@ 
 
 /**
  */
-class ByteArrayDispenser{
+class ByteArrayDispenser {
 
 	/**
 	 * @var string
@@ -43,7 +43,7 @@ 
 	 */
 	public function fromIntSize(int $size):ByteArray{
 
-		if(!$this->isAllowedInt($size)){
+		if (!$this->isAllowedInt($size)) {
 			throw new TraitException('invalid size');
 		}
 
@@ -59,18 +59,18 @@ 
 	 */
 	public function fromArray($array, $save_indexes = null):ByteArray{ // @todo \Traversable, $target, allow variable arrays, iterators etc
 
-		try{
+		try {
 			$out = $this->fromIntSize(count($array));
 
 			$array = ($save_indexes !== null ? $save_indexes : true) ? $array : array_values($array);
 
-			foreach($array as $k => $v){
+			foreach ($array as $k => $v) {
 				$out[$k] = $v;
 			}
 
 			return $out;
 		}
-		catch(Exception $e){
+		catch (Exception $e) {
 			throw new TraitException($e->getMessage());
 		}
 
@@ -85,7 +85,7 @@ 
 	 */
 	public function fromRange(int $start, int $len):ByteArray{
 
-		if(!$this->isAllowedInt($start) || $start < 0){
+		if (!$this->isAllowedInt($start) || $start < 0) {
 			throw new TraitException('invalid start');
 		}
 
@@ -121,7 +121,7 @@ 
 	public function fromHex(string $hex):ByteArray{
 		$hex = preg_replace('/[\s\r\n\t ]/', '', $hex);
 
-		if(!$this->isAllowedHex($hex)){
+		if (!$this->isAllowedHex($hex)) {
 			throw new TraitException('invalid hex string');
 		}
 
@@ -148,7 +148,7 @@ 
 	public function fromJSON(string $json):ByteArray{
 		$json = trim($json);
 
-		if(!$this->isAllowedJSON($json)){
+		if (!$this->isAllowedJSON($json)) {
 			throw new TraitException('invalid JSON array');
 		}
 
@@ -175,7 +175,7 @@ 
 	public function fromBase64(string $base64):ByteArray{
 		$base64 = trim($base64);
 
-		if(!$this->isAllowedBase64($base64)){
+		if (!$this->isAllowedBase64($base64)) {
 			throw new TraitException('invalid base64 string');
 		}
 
@@ -210,19 +210,19 @@ 
 	 */
 	public function guessFrom($data):ByteArray{
 
-		if($data instanceof Traversable){
+		if ($data instanceof Traversable) {
 			return $this->fromArray(iterator_to_array($data));
 		}
 
-		if(is_array($data)){
+		if (is_array($data)) {
 			return $this->fromArray($data);
 		}
 
-		if(is_string($data)){
+		if (is_string($data)) {
 
-			foreach(['Hex', 'Bin', 'JSON', 'Base64'] as $type){
+			foreach (['Hex', 'Bin', 'JSON', 'Base64'] as $type) {
 
-				if($this->{'isAllowed'.$type}($data)){
+				if ($this->{'isAllowed'.$type}($data)) {
 					return $this->{'from'.$type}($data);
 				}
 

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 			}
 
 			return $out;
-		}
-		catch(Exception $e){
+		} catch(Exception $e){
 			throw new TraitException($e->getMessage());
 		}
 

src/ArrayHelpers/ByteArray.php

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,7 @@ 
 /**
  * @extends \SplFixedArray
  */
-class ByteArray extends SplFixedArray{
+class ByteArray extends SplFixedArray {
 
 	/**
 	 * @return string
@@ -30,7 +30,7 @@ 
 	 * @return string
 	 */
 	public function toHex():string{
-		return $this->map(function($v){
+		return $this->map(function($v) {
 			return str_pad(dechex($v), '2', '0', STR_PAD_LEFT);
 		});
 	}
@@ -53,7 +53,7 @@ 
 	 * @return string
 	 */
 	public function toBin():string{
-		return $this->map(function($v){
+		return $this->map(function($v) {
 			return str_pad(decbin($v), '8', '0', STR_PAD_LEFT);
 		});
 	}
@@ -82,11 +82,11 @@ 
 
 		$diff = $offset + $length;
 
-		if($diff > $this->count()){
+		if ($diff > $this->count()) {
 			$this->setSize($diff);
 		}
 
-		for($i = 0; $i < $length; $i++){
+		for ($i = 0; $i < $length; $i++) {
 			$this[$i + $offset] = $src[$i + $srcOffset];
 		}
 
@@ -101,9 +101,9 @@ 
 	 */
 	public function slice(int $offset, int $length = null):ByteArray{
 		/** @var \chillerlan\Traits\ArrayHelpers\ByteArray $slice */
-		$slice  = (new ReflectionClass($this))->newInstanceArgs([$length ?? $this->count() - $offset]);
+		$slice = (new ReflectionClass($this))->newInstanceArgs([$length ?? $this->count() - $offset]);
 
-		foreach($slice as $i => $_){
+		foreach ($slice as $i => $_) {
 			$slice[$i] = $this[$offset + $i];
 		}
 
@@ -117,13 +117,13 @@ 
 	 */
 	public function equal(SplFixedArray $array):bool{
 
-		if($this->count() !== $array->count()){
+		if ($this->count() !== $array->count()) {
 			return false; // @todo: throw Exception?
 		}
 
 		$diff = 0;
 
-		foreach($this as $k => $v){
+		foreach ($this as $k => $v) {
 			$diff |= $v ^ $array[$k];
 		}
 

src/ArrayHelpers/ArraySearch.php

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
 
 use ArrayIterator, ArrayObject, RecursiveArrayIterator, RecursiveIteratorIterator, Traversable;
 
-class ArraySearch{
+class ArraySearch {
 
 	/**
 	 * @var \IteratorIterator|\RecursiveIteratorIterator
@@ -31,21 +31,21 @@ 
 	 *
 	 * @param array|object|\Traversable|\ArrayIterator|\ArrayObject|null $array
 	 */
-	public function __construct($array = null){
+	public function __construct($array = null) {
 
-		if(($array instanceof ArrayObject) || ($array instanceof ArrayIterator)){
+		if (($array instanceof ArrayObject) || ($array instanceof ArrayIterator)) {
 			$this->array = $array->getArrayCopy();
 		}
-		elseif($array instanceof Traversable){
+		elseif ($array instanceof Traversable) {
 			$this->array = iterator_to_array($array);
 		}
-		elseif(gettype($array) === 'object'){
+		elseif (gettype($array) === 'object') {
 			$this->array = get_object_vars($array);
 		}
-		elseif(is_array($array)){
+		elseif (is_array($array)) {
 			$this->array = $array;
 		}
-		else{
+		else {
 			$this->array = [];
 		}
 
@@ -56,12 +56,12 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function arraySearch(string $dotKey){
+	public function arraySearch(string $dotKey) {
 		$this->iterator = $this->getRecursiveIteratorIterator();
 
-		foreach($this->iterator as $v){
+		foreach ($this->iterator as $v) {
 
-			if($this->getPath() === $dotKey){
+			if ($this->getPath() === $dotKey) {
 				return $v;
 			}
 
@@ -78,9 +78,9 @@ 
 	public function arrayIsset(string $dotKey):bool{
 		$this->iterator = $this->getRecursiveIteratorIterator();
 
-		foreach($this->iterator as $v){
+		foreach ($this->iterator as $v) {
 
-			if($this->getPath() === $dotKey){
+			if ($this->getPath() === $dotKey) {
 				return true;
 			}
 

Braces +4 added lines, -8 removed lines

@@ -35,17 +35,13 @@
 
 		if(($array instanceof ArrayObject) || ($array instanceof ArrayIterator)){
 			$this->array = $array->getArrayCopy();
-		}
-		elseif($array instanceof Traversable){
+		} elseif($array instanceof Traversable){
 			$this->array = iterator_to_array($array);
-		}
-		elseif(gettype($array) === 'object'){
+		} elseif(gettype($array) === 'object'){
 			$this->array = get_object_vars($array);
-		}
-		elseif(is_array($array)){
+		} elseif(is_array($array)){
 			$this->array = $array;
-		}
-		else{
+		} else{
 			$this->array = [];
 		}
 

src/ArrayHelpers/DotArray.php

Spacing +13 added lines, -13 removed lines

@@ -15,7 +15,7 @@ 
 /**
  * @link https://github.com/laravel/framework/blob/5.4/src/Illuminate/Support/Arr.php
  */
-trait DotArray{
+trait DotArray {
 
 	/**
 	 *  Checks if $key isset in $array using dot notation and returns it on success.
@@ -26,15 +26,15 @@ 
 	 *
 	 * @return mixed returns $array[$key], $default otherwise.
 	 */
-	protected function arrayGet(array $array, string $key, $default = null){
+	protected function arrayGet(array $array, string $key, $default = null) {
 
-		if(isset($array[$key])){
+		if (isset($array[$key])) {
 			return $array[$key];
 		}
 
-		foreach(explode('.', $key) as $segment){
+		foreach (explode('.', $key) as $segment) {
 
-			if(!is_array($array) || !array_key_exists($segment, $array)){
+			if (!is_array($array) || !array_key_exists($segment, $array)) {
 				return $default;
 			}
 
@@ -54,17 +54,17 @@ 
 	 */
 	protected function arrayIn(array $array, string $key):bool{
 
-		if(empty($array)){
+		if (empty($array)) {
 			return false;
 		}
 
-		if(array_key_exists($key, $array)){
+		if (array_key_exists($key, $array)) {
 			return true;
 		}
 
-		foreach(explode('.', $key) as $segment){
+		foreach (explode('.', $key) as $segment) {
 
-			if(!is_array($array) || !array_key_exists($segment, $array)){
+			if (!is_array($array) || !array_key_exists($segment, $array)) {
 				return false;
 			}
 
@@ -85,21 +85,21 @@ 
 	 *
 	 * @return array
 	 */
-	protected function arraySet(array &$array, string $key, $value){
+	protected function arraySet(array &$array, string $key, $value) {
 
-		if(is_null($key)){
+		if (is_null($key)) {
 			return $array = $value;
 		}
 
 		$keys = explode('.', $key);
 
-		while(count($keys) > 1){
+		while (count($keys) > 1) {
 			$key = array_shift($keys);
 
 			// If the key doesn't exist at this depth, we will just create an empty array
 			// to hold the next value, allowing us to create the arrays to hold final
 			// values at the correct depth. Then we'll keep digging into the array.
-			if(!isset($array[$key]) || !is_array($array[$key])){
+			if (!isset($array[$key]) || !is_array($array[$key])) {
 				$array[$key] = [];
 			}