chillerlan / php-traits

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];
 		}