chillerlan / php-traits

src/TraitException.php

Spacing +1 added lines, -1 removed lines

@@ -12,4 +12,4 @@
 
 namespace chillerlan\Traits;
 
-class TraitException extends \Exception{}
+class TraitException extends \Exception {}

src/ClassLoader.php

Braces +2 added lines, -4 removed lines

@@ -50,8 +50,7 @@ 
 
 				if($reflectionType->isInterface() && !$reflectionClass->implementsInterface($type)){
 					trigger_error($class.' does not implement '.$type);
-				}
-				elseif(!$reflectionClass->isSubclassOf($type)) {
+				} elseif(!$reflectionClass->isSubclassOf($type)) {
 					trigger_error($class.' does not inherit '.$type);
 				}
 
@@ -64,8 +63,7 @@ 
 			}
 
 			return $object;
-		}
-		catch(Exception $e){
+		} catch(Exception $e){
 			throw new TraitException('ClassLoader: '.$e->getMessage());
 		}
 

Spacing +11 added lines, -11 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,31 +27,31 @@ 
 	 * @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 === null ? $class : $type;
 
-		try{
+		try {
 			$reflectionClass = new ReflectionClass($class);
 			$reflectionType  = new ReflectionClass($type);
 
-			if($reflectionType->isTrait()){
+			if ($reflectionType->isTrait()) {
 				trigger_error($class.' cannot be an instance of trait '.$type);
 			}
 
-			if($reflectionClass->isAbstract()){
+			if ($reflectionClass->isAbstract()) {
 				trigger_error('cannot instance abstract class '.$class);
 			}
 
-			if($reflectionClass->isTrait()){
+			if ($reflectionClass->isTrait()) {
 				trigger_error('cannot instance trait '.$class);
 			}
 
-			if($class !== $type){
+			if ($class !== $type) {
 
-				if($reflectionType->isInterface() && !$reflectionClass->implementsInterface($type)){
+				if ($reflectionType->isInterface() && !$reflectionClass->implementsInterface($type)) {
 					trigger_error($class.' does not implement '.$type);
 				}
-				elseif(!$reflectionClass->isSubclassOf($type)) {
+				elseif (!$reflectionClass->isSubclassOf($type)) {
 					trigger_error($class.' does not inherit '.$type);
 				}
 
@@ -59,13 +59,13 @@ 
 
 			$object = $reflectionClass->newInstanceArgs($params);
 
-			if(!$object instanceof $type){
+			if (!$object instanceof $type) {
 				trigger_error('how did u even get here?'); // @codeCoverageIgnore
 			}
 
 			return $object;
 		}
-		catch(Exception $e){
+		catch (Exception $e) {
 			throw new TraitException('ClassLoader: '.$e->getMessage());
 		}
 

src/Magic.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 /**
  * A Container that turns methods into magic properties
  */
-trait Magic{
+trait Magic {
 
 	/**
 	 * @param string $name
@@ -56,7 +56,7 @@ 
 	private function set(string $name, $value) {
 		$method = 'magic_set_'.$name;
 
-		if(method_exists($this, $method)){
+		if (method_exists($this, $method)) {
 			$this->$method($value);
 		}
 

src/Container.php

Spacing +8 added lines, -8 removed lines

@@ -15,14 +15,14 @@ 
 /**
  * a generic container with magic getter and setter
  */
-trait Container{
+trait Container {
 
 	/**
 	 * @param array $properties
 	 */
-	public function __construct(array $properties = []){
+	public function __construct(array $properties = []) {
 
-		foreach($properties as $key => $value){
+		foreach ($properties as $key => $value) {
 			$this->__set($key, $value);
 		}
 
@@ -33,9 +33,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get(string $property){
+	public function __get(string $property) {
 
-		if(property_exists($this, $property)){
+		if (property_exists($this, $property)) {
 			return $this->{$property};
 		}
 
@@ -48,9 +48,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function __set(string $property, $value){
+	public function __set(string $property, $value) {
 
-		if(property_exists($this, $property)){
+		if (property_exists($this, $property)) {
 			$this->{$property} = $value;
 		}
 
@@ -62,7 +62,7 @@ 
 	public function __toArray():array {
 		$data = [];
 
-		foreach($this as $key => $value){
+		foreach ($this as $key => $value) {
 			$data[$key] = $value;
 		}
 

src/Enumerable.php

Spacing +5 added lines, -5 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($callback){
+	public function __each($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;
 

src/DotEnv.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace chillerlan\Traits;
 
-class DotEnv{
+class DotEnv {
 	use Env;
 
 	/**
@@ -31,7 +31,7 @@ 
 	 * @param string      $path
 	 * @param string|null $filename
 	 */
-	public function __construct(string $path, string $filename = null){
+	public function __construct(string $path, string $filename = null) {
 		$this->path     = $path;
 		$this->filename = $filename;
 	}
@@ -62,7 +62,7 @@ 
 	 *
 	 * @return bool|mixed
 	 */
-	public function get(string $var){
+	public function get(string $var) {
 		return $this->__getEnv($var);
 	}
 
@@ -72,7 +72,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function set(string $var, string $value){
+	public function set(string $var, string $value) {
 		return $this->__setEnv($var, $value);
 	}
 

src/Env.php

Spacing +26 added lines, -26 removed lines

@@ -19,7 +19,7 @@ 
  *
  * @link https://github.com/vlucas/phpdotenv
  */
-trait Env{
+trait Env {
 
 	/**
 	 * a backup environment in case everything goes downhill
@@ -36,7 +36,7 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function __loadEnv(string $path, string $filename = null, bool $overwrite = null, array $required = null){
+	protected function __loadEnv(string $path, string $filename = null, bool $overwrite = null, array $required = null) {
 		$overwrite = $overwrite !== null ? $overwrite : false;
 		$content   = $this->__read(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.($filename ?? '.env'));
 
@@ -51,20 +51,20 @@ 
 	 *
 	 * @return bool|mixed
 	 */
-	protected function __getEnv(string $var){
+	protected function __getEnv(string $var) {
 		$var = strtoupper($var);
 
-		if(array_key_exists($var, $_ENV)){
+		if (array_key_exists($var, $_ENV)) {
 			return $_ENV[$var];
 		}
-		elseif(function_exists('getenv')){
-			if($e = getenv($var) !== false){
+		elseif (function_exists('getenv')) {
+			if ($e = getenv($var) !== false) {
 				return $e;
 			}
 		}
 		// @codeCoverageIgnoreStart
-		elseif(function_exists('apache_getenv')){
-			if($e = apache_getenv($var) !== false){
+		elseif (function_exists('apache_getenv')) {
+			if ($e = apache_getenv($var) !== false) {
 				return $e;
 			}
 		}
@@ -79,7 +79,7 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function __setEnv(string $var, string $value = null){
+	protected function __setEnv(string $var, string $value = null) {
 		$var   = strtoupper($var);
 		$value = $this->__parse($value);
 
@@ -90,7 +90,7 @@ 
 		// a backup
 		$this->_ENV[$var] = $value;
 
-		if(function_exists('apache_setenv')){
+		if (function_exists('apache_setenv')) {
 			apache_setenv($var, $value);
 		}
 
@@ -102,7 +102,7 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function __unsetEnv(string $var){
+	protected function __unsetEnv(string $var) {
 		$var = strtoupper($var);
 
 		unset($_ENV[$var]);
@@ -117,7 +117,7 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function __clearEnv(){
+	protected function __clearEnv() {
 		$_ENV       = [];
 		$this->_ENV = [];
 
@@ -132,7 +132,7 @@ 
 	 */
 	private function __read(string $file):array{
 
-		if(!is_readable($file) || !is_file($file)){
+		if (!is_readable($file) || !is_file($file)) {
 			throw new TraitException('invalid file: '.$file);
 		}
 
@@ -142,7 +142,7 @@ 
 		$lines = file($file, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 		ini_set('auto_detect_line_endings', $autodetect);
 
-		if(!is_array($lines) || empty($lines)){
+		if (!is_array($lines) || empty($lines)) {
 			throw new TraitException('error while reading file: '.$file);
 		}
 
@@ -157,19 +157,19 @@ 
 	 *
 	 * @return $this
 	 */
-	private function __load(array $data, bool $overwrite){
+	private function __load(array $data, bool $overwrite) {
 
-		foreach($data as $line){
+		foreach ($data as $line) {
 
 			// skip empty lines and comments
-			if(empty($line) || strpos($line, '#') === 0){
+			if (empty($line) || strpos($line, '#') === 0) {
 				continue;
 			}
 
 			$kv = array_map('trim', explode('=', $line, 2));
 
 			// skip empty and numeric keys, keys with spaces, existing keys that shall not be overwritten
-			if(empty($kv[0]) || is_numeric($kv[0]) || strpos($kv[0], ' ') !== false || (!$overwrite && array_key_exists($kv[0], $_ENV))){
+			if (empty($kv[0]) || is_numeric($kv[0]) || strpos($kv[0], ' ') !== false || (!$overwrite && array_key_exists($kv[0], $_ENV))) {
 				continue;
 			}
 
@@ -184,9 +184,9 @@ 
 	 *
 	 * @return string|null
 	 */
-	private function __parse(string $value = null){
+	private function __parse(string $value = null) {
 
-		if($value !== null){
+		if ($value !== null) {
 
 			$q = $value[0] ?? null;
 
@@ -200,8 +200,8 @@ 
 			$value = implode(PHP_EOL, explode('\\n', $value));
 
 			// handle nested ${VARS}
-			if(strpos($value, '$') !== false){
-				$value = preg_replace_callback('/\${([_a-z\d]+)}/i', function($matches){
+			if (strpos($value, '$') !== false) {
+				$value = preg_replace_callback('/\${([_a-z\d]+)}/i', function($matches) {
 					return $this->__getEnv($matches[1]);
 				}, $value);
 			}
@@ -217,14 +217,14 @@ 
 	 * @return $this
 	 * @throws \chillerlan\Traits\TraitException
 	 */
-	private function __check(array $required = null){
+	private function __check(array $required = null) {
 
-		if($required === null || empty($required)){
+		if ($required === null || empty($required)) {
 			return $this;
 		}
 
-		foreach($required as $var){
-			if(!$this->__getEnv($var) || $this->__getEnv($var) === null){
+		foreach ($required as $var) {
+			if (!$this->__getEnv($var) || $this->__getEnv($var) === null) {
 				throw new TraitException('required variable not set: '.strtoupper($var));
 			}
 		}

Braces +1 added lines, -2 removed lines

@@ -56,8 +56,7 @@
 
 		if(array_key_exists($var, $_ENV)){
 			return $_ENV[$var];
-		}
-		elseif(function_exists('getenv')){
+		} elseif(function_exists('getenv')){
 			if($e = getenv($var) !== false){
 				return $e;
 			}