chillerlan / php-traits

src/Env.php

Spacing +28 added lines, -28 removed lines

@@ -21,7 +21,7 @@ 
  * @link http://php.net/variables-order
  *
  */
-trait Env{
+trait Env {
 
 	/**
 	 * a backup environment in case everything goes downhill
@@ -47,7 +47,7 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function __loadEnv(string $path, string $filename = null, bool $overwrite = null, array $required = null, bool $global = null){
+	protected function __loadEnv(string $path, string $filename = null, bool $overwrite = null, array $required = null, bool $global = null) {
 		$this->_global = $global !== null ? $global : false;
 		$content       = $this->__read(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.($filename ?? '.env'));
 
@@ -62,20 +62,20 @@ 
 	 *
 	 * @return bool|mixed
 	 */
-	protected function __getEnv(string $var){
+	protected function __getEnv(string $var) {
 		$var = strtoupper($var);
 		$env = null;
 
-		if($this->_global === true){
+		if ($this->_global === true) {
 
-			if(array_key_exists($var, $_ENV)){
+			if (array_key_exists($var, $_ENV)) {
 				$env = $_ENV[$var];
 			}
-			elseif(function_exists('getenv')){
+			elseif (function_exists('getenv')) {
 				$env = getenv($var);
 			}
 			// @codeCoverageIgnoreStart
-			elseif(function_exists('apache_getenv')){
+			elseif (function_exists('apache_getenv')) {
 				$env = apache_getenv($var);
 			}
 			// @codeCoverageIgnoreEnd
@@ -91,18 +91,18 @@ 
 	 *
 	 * @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);
 
-		if($this->_global === true){
+		if ($this->_global === true) {
 			putenv($var.'='.$value);
 
 			// fill $_ENV explicitly, assuming variables_order="GPCS" (production)
 			$_ENV[$var] = $value;
 
 			// @codeCoverageIgnoreStart
-			if(function_exists('apache_setenv')){
+			if (function_exists('apache_setenv')) {
 				apache_setenv($var, $value);
 			}
 			// @codeCoverageIgnoreEnd
@@ -119,10 +119,10 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function __unsetEnv(string $var){
+	protected function __unsetEnv(string $var) {
 		$var = strtoupper($var);
 
-		if($this->_global === true){
+		if ($this->_global === true) {
 			unset($_ENV[$var]);
 			putenv($var);
 		}
@@ -137,9 +137,9 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function __clearEnv(){
+	protected function __clearEnv() {
 
-		if($this->_global === true){
+		if ($this->_global === true) {
 			$_ENV = [];
 		}
 
@@ -156,7 +156,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);
 		}
 
@@ -166,7 +166,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);
 		}
 
@@ -179,19 +179,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 && $this->__getEnv($kv[0]) !== false)){
+			if (empty($kv[0]) || is_numeric($kv[0]) || strpos($kv[0], ' ') !== false || (!$overwrite && $this->__getEnv($kv[0]) !== false)) {
 				continue;
 			}
 
@@ -206,9 +206,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;
 
@@ -222,8 +222,8 @@ 
 			$value = implode(PHP_EOL, explode('\\n', $value));
 
 			// handle nested ${VARS}
-			if(strpos($value, '$') !== false){
-				$value = preg_replace_callback('/\${(?<var>[_a-z\d]+)}/i', function($matches){
+			if (strpos($value, '$') !== false) {
+				$value = preg_replace_callback('/\${(?<var>[_a-z\d]+)}/i', function($matches) {
 					return $this->__getEnv($matches['var']);
 				}, $value);
 			}
@@ -239,14 +239,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) === false || $this->__getEnv($var) === null){
+		foreach ($required as $var) {
+			if ($this->__getEnv($var) === false || $this->__getEnv($var) === null) {
 				throw new TraitException('required variable not set: '.strtoupper($var));
 			}
 		}

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 
 			if(array_key_exists($var, $_ENV)){
 				$env = $_ENV[$var];
-			}
-			elseif(function_exists('getenv')){
+			} elseif(function_exists('getenv')){
 				$env = getenv($var);
 			}
 			// @codeCoverageIgnoreStart

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/EnumerableInterface.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use Closure;
 
-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($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;
 
@@ -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/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

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(iterable $properties = null, DotEnv $env = null){
+	public function __construct(iterable $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(iterable $properties){
+	public function __fromIterable(iterable $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));
 	}
 

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