chillerlan / php-traits

src/Container.php

Spacing +18 added lines, -18 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,17 +42,17 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get(string $property){
+	public function __get(string $property) {
 
 
-		if(method_exists($this, 'get_'.$property) && $this->__isset($property)){
+		if (method_exists($this, 'get_'.$property) && $this->__isset($property)) {
 			return call_user_func([$this, 'get_'.$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);
 		}
 
@@ -65,19 +65,19 @@ 
 	 *
 	 * @return void
 	 */
-	public function __set(string $property, $value){
+	public function __set(string $property, $value) {
 
-		if(method_exists($this, 'set_'.$property) && !$this->__isPrivate($property)){
+		if (method_exists($this, 'set_'.$property) && !$this->__isPrivate($property)) {
 			call_user_func_array([$this, 'set_'.$property], [$value]);
 
 			return;
 		}
 
 		// 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);
 		}
 
@@ -106,10 +106,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});
 		}
 
@@ -128,10 +128,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;
 			}
 
@@ -145,9 +145,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);
 		}
 
@@ -168,7 +168,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function __fromJSON(string $json){
+	public function __fromJSON(string $json) {
 		return $this->__fromIterable(json_decode($json, true));
 	}
 

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,45 +27,45 @@ 
 	 * @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
 			}
 
@@ -73,7 +73,7 @@ 
 		}
 		// @codeCoverageIgnoreStart
 		// here be dragons
-		catch(Exception $e){
+		catch (Exception $e) {
 			throw new TraitException('ClassLoader: '.$e->getMessage());
 		}
 		// @codeCoverageIgnoreEnd

Braces +2 added lines, -4 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);
 			}
 

src/ArrayHelpers/SearchableArray.php

Spacing +13 added lines, -13 removed lines

@@ -14,7 +14,7 @@ 
 
 use ArrayIterator, ArrayObject, RecursiveArrayIterator, RecursiveIteratorIterator, Traversable;
 
-trait SearchableArray{
+trait SearchableArray {
 	use DotArray;
 
 	/**
@@ -27,19 +27,19 @@ 
 	 *
 	 * @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);
 		}
 		// yields unexpected results with DotArray
-		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;
 		}
 
@@ -54,11 +54,11 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function searchByKey(string $dotKey){
+	public function searchByKey(string $dotKey) {
 
-		foreach($this->iterator as $v){
+		foreach ($this->iterator as $v) {
 
-			if($this->getPath() === $dotKey){
+			if ($this->getPath() === $dotKey) {
 				return $v;
 			}
 
@@ -71,9 +71,9 @@ 
 
 		$matches = [];
 
-		foreach($this->iterator as $v){
+		foreach ($this->iterator as $v) {
 
-			if($v === $value){
+			if ($v === $value) {
 				$matches[$this->getPath()] = $value;
 			}
 
@@ -89,9 +89,9 @@ 
 	 */
 	public function isset(string $dotKey):bool{
 
-		foreach($this->iterator as $v){
+		foreach ($this->iterator as $v) {
 
-			if($this->getPath() === $dotKey){
+			if ($this->getPath() === $dotKey) {
 				return true;
 			}
 

Braces +2 added lines, -4 removed lines

@@ -31,15 +31,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);
 		}
 		// yields unexpected results with DotArray
 		elseif(gettype($array) === 'object'){
 			$this->array = get_object_vars($array);
-		}
-		elseif(is_array($array)){
+		} elseif(is_array($array)){
 			$this->array = $array;
 		}