chillerlan / php-traits

src/ArrayHelpers/ByteArrayDispenser.php

Spacing +15 added lines, -15 removed lines

@@ -18,7 +18,7 @@ 
 /**
  *
  */
-class ByteArrayDispenser{
+class ByteArrayDispenser {
 
 	/**
 	 * @var string
@@ -42,7 +42,7 @@ 
 	 */
 	public function fromIntSize(int $size):ByteArray{
 
-		if(!$this->isAllowedInt($size)){
+		if (!$this->isAllowedInt($size)) {
 			throw new TraitException('invalid size');
 		}
 
@@ -58,12 +58,12 @@ 
 	 */
 	public function fromArray($array, $save_indexes = null):ByteArray{
 
-		try{
+		try {
 			$out = $this->fromIntSize(count($array));
 
 			$array = ($save_indexes ?? true) ? $array : array_values($array);
 
-			foreach($array as $k => $v){
+			foreach ($array as $k => $v) {
 				$out[$k] = $v;
 			}
 
@@ -71,7 +71,7 @@ 
 		}
 		// this can be anything
 		// @codeCoverageIgnoreStart
-		catch(Exception $e){
+		catch (Exception $e) {
 			throw new TraitException($e->getMessage());
 		}
 		// @codeCoverageIgnoreEnd
@@ -88,7 +88,7 @@ 
 	 */
 	public function fromArrayFill(int $len, $fill = null):ByteArray{
 
-		if(!$this->isAllowedInt($len)){
+		if (!$this->isAllowedInt($len)) {
 			throw new TraitException('invalid length');
 		}
 
@@ -124,7 +124,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');
 		}
 
@@ -151,7 +151,7 @@ 
 	public function fromJSON(string $json):ByteArray{
 		$json = trim($json);
 
-		if(!$this->isAllowedJSON($json)){
+		if (!$this->isAllowedJSON($json)) {
 			throw new TraitException('invalid JSON array');
 		}
 
@@ -178,7 +178,7 @@ 
 	public function fromBase64(string $base64):ByteArray{
 		$base64 = trim($base64);
 
-		if(!$this->isAllowedBase64($base64)){
+		if (!$this->isAllowedBase64($base64)) {
 			throw new TraitException('invalid base64 string');
 		}
 
@@ -205,7 +205,7 @@ 
 	public function fromBin(string $bin):ByteArray{
 		$bin = trim($bin);
 
-		if(!$this->isAllowedBin($bin)){
+		if (!$this->isAllowedBin($bin)) {
 			throw new TraitException('invalid binary string');
 		}
 
@@ -220,19 +220,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(['Bin', 'Hex', 'JSON', 'Base64'] as $type){
+			foreach (['Bin', 'Hex', 'JSON', 'Base64'] as $type) {
 
-				if(call_user_func_array([$this, 'isAllowed'.$type], [$data]) === true){
+				if (call_user_func_array([$this, 'isAllowed'.$type], [$data]) === true) {
 					return call_user_func_array([$this, 'from'.$type], [$data]);
 				}
 

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/ArrayHelpers/SearchableArray.php

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
 
 use ArrayIterator, ArrayObject, RecursiveArrayIterator, RecursiveIteratorIterator, Traversable;
 
-trait SearchableArray{
+trait SearchableArray {
 	use DotArray;
 
 	/**
@@ -32,22 +32,22 @@ 
 	 *
 	 * @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;
 		}
-		else{
+		else {
 			$this->array = [];
 		}
 	}
@@ -57,12 +57,12 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function search(string $dotKey){
+	public function search(string $dotKey) {
 		$this->iterator = $this->getRecursiveIteratorIterator();
 
-		foreach($this->iterator as $v){
+		foreach ($this->iterator as $v) {
 
-			if($this->getPath() === $dotKey){
+			if ($this->getPath() === $dotKey) {
 				return $v;
 			}
 
@@ -79,9 +79,9 @@ 
 	public function isset(string $dotKey):bool{
 		$this->iterator = $this->getRecursiveIteratorIterator();
 
-		foreach($this->iterator as $v){
+		foreach ($this->iterator as $v) {
 
-			if($this->getPath() === $dotKey){
+			if ($this->getPath() === $dotKey) {
 				return true;
 			}
 

Braces +3 added lines, -6 removed lines

@@ -36,18 +36,15 @@
 
 		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;
-		}
-		else{
+		} else{
 			$this->array = [];
 		}
 	}

src/ArrayHelpers/DotArray.php

Spacing +13 added lines, -13 removed lines

@@ -15,7 +15,7 @@ 
 /**
  * @link https://github.com/laravel/framework/blob/5.4/src/Illuminate/Support/Arr.php
  */
-trait DotArray{
+trait DotArray {
 
 	/**
 	 * @var array
@@ -30,17 +30,17 @@ 
 	 *
 	 * @return mixed returns $array[$key], $default otherwise.
 	 */
-	public function get(string $dotKey, $default = null){
+	public function get(string $dotKey, $default = null) {
 
-		if(isset($this->array[$dotKey])){
+		if (isset($this->array[$dotKey])) {
 			return $this->array[$dotKey];
 		}
 
 		$array = &$this->array;
 
-		foreach(explode('.', $dotKey) as $segment){
+		foreach (explode('.', $dotKey) as $segment) {
 
-			if(!is_array($array) || !array_key_exists($segment, $array)){
+			if (!is_array($array) || !array_key_exists($segment, $array)) {
 				return $default;
 			}
 
@@ -59,19 +59,19 @@ 
 	 */
 	public function in(string $dotKey):bool{
 
-		if(empty($this->array)){
+		if (empty($this->array)) {
 			return false;
 		}
 
-		if(array_key_exists($dotKey, $this->array)){
+		if (array_key_exists($dotKey, $this->array)) {
 			return true;
 		}
 
 		$array = &$this->array;
 
-		foreach(explode('.', $dotKey) as $segment){
+		foreach (explode('.', $dotKey) as $segment) {
 
-			if(!is_array($array) || !array_key_exists($segment, $array)){
+			if (!is_array($array) || !array_key_exists($segment, $array)) {
 				return false;
 			}
 
@@ -91,9 +91,9 @@ 
 	 *
 	 * @return \chillerlan\Traits\ArrayHelpers\DotArray
 	 */
-	public function set(string $dotKey, $value){
+	public function set(string $dotKey, $value) {
 
-		if(empty($dotKey)){
+		if (empty($dotKey)) {
 			$this->array = $value;
 
 			return $this;
@@ -102,13 +102,13 @@ 
 		$array = &$this->array;
 		$keys = explode('.', $dotKey);
 
-		while(count($keys) > 1){
+		while (count($keys) > 1) {
 			$dotKey = array_shift($keys);
 
 			// If the key doesn't exist at this depth, we will just create an empty array
 			// to hold the next value, allowing us to create the arrays to hold final
 			// values at the correct depth. Then we'll keep digging into the array.
-			if(!isset($array[$dotKey]) || !is_array($array[$dotKey])){
+			if (!isset($array[$dotKey]) || !is_array($array[$dotKey])) {
 				$array[$dotKey] = [];
 			}
 

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

@@ -20,7 +20,7 @@ 
  * @method DotEnv unset(string $var)
  * @method DotEnv clear()
  */
-class DotEnv{
+class DotEnv {
 	use Env{
 		// allow a magic getter & setter
 		__getEnv as public __get;
@@ -49,7 +49,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