chillerlan / php-traits

src/DotEnv.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
  * @method void unset(string $var)
  * @method DotEnv clear()
  */
-class DotEnv{
+class DotEnv {
 	use Env{
 		// allow a magic getter & setter
 		__getEnv as public __get;
@@ -57,7 +57,7 @@ 
 	 * @param string|null $filename
 	 * @param bool|null   $global
 	 */
-	public function __construct(string $path, string $filename = null, bool $global = null){
+	public function __construct(string $path, string $filename = null, bool $global = null) {
 		$this->path     = $path;
 		$this->filename = $filename;
 		$this->_global  = $global ?? true; // emulate vlucas/dotenv behaviour by default

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];
 		}
 
@@ -103,9 +103,9 @@ 
 
 		// keep an extended class
 		/** @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];
 		}
 
@@ -119,13 +119,13 @@ 
 	 */
 	public function equal(SplFixedArray $array):bool{
 
-		if($this->count() !== $array->count()){
+		if ($this->count() !== $array->count()) {
 			return false;
 		}
 
 		$diff = 0;
 
-		foreach($this as $k => $v){
+		foreach ($this as $k => $v) {
 			$diff |= $v ^ $array[$k];
 		}
 

src/Interfaces/ArrayAccessTrait.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
  *
  * @link http://php.net/manual/class.arrayaccess.php
  */
-trait ArrayAccessTrait{
+trait ArrayAccessTrait {
 
 	/**
 	 * @var array
@@ -41,7 +41,7 @@ 
 	 * @link  http://php.net/manual/arrayaccess.offsetget.php
 	 * @inheritdoc
 	 */
-	public function offsetGet($offset){
+	public function offsetGet($offset) {
 		return $this->array[$offset] ?? null;
 	}
 
@@ -49,7 +49,7 @@ 
 	 * @link  http://php.net/manual/arrayaccess.offsetset.php
 	 * @inheritdoc
 	 */
-	public function offsetSet($offset, $value){
+	public function offsetSet($offset, $value) {
 
 		$offset !== null
 			? $this->array[$offset] = $value
@@ -60,7 +60,7 @@ 
 	 * @link  http://php.net/manual/arrayaccess.offsetunset.php
 	 * @inheritdoc
 	 */
-	public function offsetUnset($offset){
+	public function offsetUnset($offset) {
 		unset($this->array[$offset]);
 	}
 

src/ContainerInterface.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 /**
  * a generic container with magic getter and setter
  */
-interface ContainerInterface{
+interface ContainerInterface {
 
 	/**
 	 * @param iterable $properties

src/Container.php

Braces +2 added lines, -4 removed lines

@@ -46,8 +46,7 @@ 
 
 		if($this->__isset($property)){
 			return $this->{$property};
-		}
-		elseif($this->env instanceof DotEnv){
+		} elseif($this->env instanceof DotEnv){
 			return $this->env->get($property);
 		}
 
@@ -65,8 +64,7 @@ 
 		// avoid overwriting private properties
 		if(property_exists($this, $property) && !$this->__isPrivate($property)){
 			$this->{$property} = $value;
-		}
-		elseif($this->env instanceof DotEnv){
+		} elseif($this->env instanceof DotEnv){
 			$this->env->set($property, $value);
 		}
 

Spacing +16 added lines, -16 removed lines

@@ -17,7 +17,7 @@ 
 /**
  * a generic container with magic getter and setter
  */
-trait Container{
+trait Container {
 
 	/**
 	 * @var \chillerlan\Traits\DotEnv|null
@@ -28,10 +28,10 @@ 
 	 * @param iterable                       $properties
 	 * @param \chillerlan\Traits\DotEnv|null $env
 	 */
-	public function __construct(array $properties = null, DotEnv $env = null){
+	public function __construct(array $properties = null, DotEnv $env = null) {
 		$this->env = $env;
 
-		if(!empty($properties)){
+		if (!empty($properties)) {
 			$this->__fromIterable($properties);
 		}
 
@@ -42,12 +42,12 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get(string $property){
+	public function __get(string $property) {
 
-		if($this->__isset($property)){
+		if ($this->__isset($property)) {
 			return $this->{$property};
 		}
-		elseif($this->env instanceof DotEnv){
+		elseif ($this->env instanceof DotEnv) {
 			return $this->env->get($property);
 		}
 
@@ -60,13 +60,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function __set(string $property, $value){
+	public function __set(string $property, $value) {
 
 		// avoid overwriting private properties
-		if(property_exists($this, $property) && !$this->__isPrivate($property)){
+		if (property_exists($this, $property) && !$this->__isPrivate($property)) {
 			$this->{$property} = $value;
 		}
-		elseif($this->env instanceof DotEnv){
+		elseif ($this->env instanceof DotEnv) {
 			$this->env->set($property, $value);
 		}
 
@@ -95,10 +95,10 @@ 
 	 *
 	 * @return void
 	 */
-	public function __unset(string $property){
+	public function __unset(string $property) {
 
 		// avoid unsetting private properties
-		if($this->__isset($property)){
+		if ($this->__isset($property)) {
 			unset($this->{$property});
 		}
 
@@ -117,10 +117,10 @@ 
 	public function __toArray():array{
 		$data = [];
 
-		foreach($this as $property => $value){
+		foreach ($this as $property => $value) {
 
 			// exclude private properties
-			if($this->__isset($property)){
+			if ($this->__isset($property)) {
 				$data[$property] = $value;
 			}
 
@@ -134,9 +134,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function __fromIterable(array $properties){
+	public function __fromIterable(array $properties) {
 
-		foreach($properties as $key => $value){
+		foreach ($properties as $key => $value) {
 			$this->__set($key, $value);
 		}
 
@@ -155,7 +155,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function __fromJSON(string $json){
+	public function __fromJSON(string $json) {
 		return $this->__fromIterable(json_decode($json, true));
 	}
 

src/EnumerableInterface.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 namespace chillerlan\Traits;
 
-interface EnumerableInterface{
+interface EnumerableInterface {
 
 	/**
 	 * @return array

src/Enumerable.php

Spacing +15 added lines, -15 removed lines

@@ -15,7 +15,7 @@ 
 /**
  * @link http://api.prototypejs.org/language/Enumerable/
  */
-trait Enumerable{
+trait Enumerable {
 
 	/**
 	 * @var array
@@ -45,7 +45,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function __each(callable $callback){
+	public function __each(callable $callback) {
 		$this->__map($callback);
 
 		return $this;
@@ -62,13 +62,13 @@ 
 	 */
 	public function __map($callback):array {
 
-		if(!is_callable($callback)){
+		if (!is_callable($callback)) {
 			throw new TraitException('invalid callback');
 		}
 
 		$return = [];
 
-		foreach($this->array as $index => $element){
+		foreach ($this->array as $index => $element) {
 			$return[$index] = call_user_func_array($callback, [$element, $index]);
 		}
 
@@ -80,7 +80,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function __reverse(){
+	public function __reverse() {
 		$this->array  = array_reverse($this->array);
 		$this->offset = 0;
 
@@ -90,14 +90,14 @@ 
 	/**
 	 * @return mixed
 	 */
-	public function __last(){
+	public function __last() {
 		return $this->array[count($this->array) - 1];
 	}
 
 	/**
 	 * @return $this
 	 */
-	public function __clear(){
+	public function __clear() {
 		$this->array = [];
 
 		return $this;
@@ -122,15 +122,15 @@ 
 	 */
 	public function __findAll(callable $callback):array{
 
-		if(!is_callable($callback)){
+		if (!is_callable($callback)) {
 			throw new TraitException('invalid callback');
 		}
 
 		$return = [];
 
-		foreach($this->array as $index => $element){
+		foreach ($this->array as $index => $element) {
 
-			if(call_user_func_array($callback, [$element, $index]) === true){
+			if (call_user_func_array($callback, [$element, $index]) === true) {
 				$return[] = $element;
 			}
 
@@ -149,15 +149,15 @@ 
 	 */
 	public function __reject(callable $callback):array{
 
-		if(!is_callable($callback)){
+		if (!is_callable($callback)) {
 			throw new TraitException('invalid callback');
 		}
 
 		$return = [];
 
-		foreach($this->array as $index => $element){
+		foreach ($this->array as $index => $element) {
 
-			if(call_user_func_array($callback, [$element, $index]) !== true){
+			if (call_user_func_array($callback, [$element, $index]) !== true) {
 				$return[] = $element;
 			}
 
@@ -173,13 +173,13 @@ 
 	 */
 	public function __equal(array $y):bool{
 
-		if(count($this->array) !== count($y)){
+		if (count($this->array) !== count($y)) {
 			return false;
 		}
 
 		$diff = 0;
 
-		foreach($this->array as $kx => $vx){
+		foreach ($this->array as $kx => $vx) {
 			$diff |= $vx ^ $y[$kx];
 		}
 

src/ClassLoader.php

Spacing +13 added lines, -13 removed lines

@@ -14,7 +14,7 @@ 
 
 use Exception, ReflectionClass;
 
-trait ClassLoader{
+trait ClassLoader {
 
 	/**
 	 * Instances an object of $class/$type with an arbitrary number of $params
@@ -27,51 +27,51 @@ 
 	 * @return mixed of type $type
 	 * @throws \Exception
 	 */
-	public function loadClass(string $class, string $type = null, ...$params){
+	public function loadClass(string $class, string $type = null, ...$params) {
 		$type = $type ?? $class;
 
-		try{
+		try {
 			$reflectionClass = new ReflectionClass($class);
 			$reflectionType  = new ReflectionClass($type);
 		}
-		catch(Exception $e){
+		catch (Exception $e) {
 			throw new TraitException('ClassLoader: '.$e->getMessage());
 		}
 
 
-		if($reflectionType->isTrait()){
+		if ($reflectionType->isTrait()) {
 			throw new TraitException($class.' cannot be an instance of trait '.$type);
 		}
 
-		if($reflectionClass->isAbstract()){
+		if ($reflectionClass->isAbstract()) {
 			throw new TraitException('cannot instance abstract class '.$class);
 		}
 
-		if($reflectionClass->isTrait()){
+		if ($reflectionClass->isTrait()) {
 			throw new TraitException('cannot instance trait '.$class);
 		}
 
-		if($class !== $type){
+		if ($class !== $type) {
 
-			if($reflectionType->isInterface() && !$reflectionClass->implementsInterface($type)){
+			if ($reflectionType->isInterface() && !$reflectionClass->implementsInterface($type)) {
 				throw new TraitException($class.' does not implement '.$type);
 			}
-			elseif(!$reflectionClass->isSubclassOf($type)) {
+			elseif (!$reflectionClass->isSubclassOf($type)) {
 				throw new TraitException($class.' does not inherit '.$type);
 			}
 
 		}
 
-		try{
+		try {
 			$object = $reflectionClass->newInstanceArgs($params);
 
-			if(!$object instanceof $type){
+			if (!$object instanceof $type) {
 				throw new TraitException('how did u even get here?'); // @codeCoverageIgnore
 			}
 
 			return $object;
 		}
-		catch(Exception $e){
+		catch (Exception $e) {
 			throw new TraitException('ClassLoader: '.$e->getMessage());
 		}
 

Braces +3 added lines, -6 removed lines

@@ -33,8 +33,7 @@ 
 		try{
 			$reflectionClass = new ReflectionClass($class);
 			$reflectionType  = new ReflectionClass($type);
-		}
-		catch(Exception $e){
+		} catch(Exception $e){
 			throw new TraitException('ClassLoader: '.$e->getMessage());
 		}
 
@@ -55,8 +54,7 @@ 
 
 			if($reflectionType->isInterface() && !$reflectionClass->implementsInterface($type)){
 				throw new TraitException($class.' does not implement '.$type);
-			}
-			elseif(!$reflectionClass->isSubclassOf($type)) {
+			} elseif(!$reflectionClass->isSubclassOf($type)) {
 				throw new TraitException($class.' does not inherit '.$type);
 			}
 
@@ -70,8 +68,7 @@ 
 			}
 
 			return $object;
-		}
-		catch(Exception $e){
+		} catch(Exception $e){
 			throw new TraitException('ClassLoader: '.$e->getMessage());
 		}
 

src/ContainerAbstract.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 
 namespace chillerlan\Traits;
 
-abstract class ContainerAbstract implements ContainerInterface{
+abstract class ContainerAbstract implements ContainerInterface {
 	use Container;
 }