chillerlan / php-traits

src/Interfaces/ArrayAccessTrait.php

Spacing +2 added lines, -2 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;
 	}
 

src/Interfaces/IteratorTrait.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
  *
  * @link http://php.net/manual/class.traversable.php
  */
-trait IteratorTrait{
+trait IteratorTrait {
 
 	/**
 	 * @var array
@@ -34,7 +34,7 @@ 
 	 * @link  http://php.net/manual/iterator.current.php
 	 * @inheritdoc
 	 */
-	public function current(){
+	public function current() {
 		return $this->array[$this->offset] ?? null;
 	}
 
@@ -50,7 +50,7 @@ 
 	 * @link  http://php.net/manual/iterator.key.php
 	 * @inheritdoc
 	 */
-	public function key(){
+	public function key() {
 		return $this->offset;
 	}
 

src/ImmutableSettingsInterface.php

Spacing +1 added lines, -1 removed lines

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

src/Magic.php

Spacing +4 added lines, -4 removed lines

@@ -15,14 +15,14 @@ 
 /**
  * A Container that turns methods into magic properties
  */
-trait Magic{
+trait Magic {
 
 	/**
 	 * @param string $name
 	 *
 	 * @return mixed|null
 	 */
-	public function __get(string $name){
+	public function __get(string $name) {
 		return $this->get($name);
 	}
 
@@ -41,7 +41,7 @@ 
 	 *
 	 * @return mixed|null
 	 */
-	private function get(string $name){
+	private function get(string $name) {
 		$method = 'magic_get_'.$name;
 
 		return method_exists($this, $method) ? $this->$method() : null;
@@ -56,7 +56,7 @@ 
 	private function set(string $name, $value):void{
 		$method = 'magic_set_'.$name;
 
-		if(method_exists($this, $method)){
+		if (method_exists($this, $method)) {
 			$this->$method($value);
 		}
 

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 ?? 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')) {
 				/** @noinspection PhpComposerExtensionStubsInspection */
 				$env = apache_getenv($var);
 			}
@@ -92,18 +92,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')) {
 				/** @noinspection PhpComposerExtensionStubsInspection */
 				apache_setenv($var, $value);
 			}
@@ -136,10 +136,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);
 		}
@@ -154,9 +154,9 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function __clearEnv(){
+	protected function __clearEnv() {
 
-		if($this->_global === true){
+		if ($this->_global === true) {
 			$_ENV = [];
 		}
 
@@ -173,7 +173,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);
 		}
 
@@ -183,7 +183,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);
 		}
 
@@ -196,19 +196,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;
 			}
 
@@ -223,9 +223,9 @@ 
 	 *
 	 * @return string|null
 	 */
-	private function __parse(string $value = null):?string{
+	private function __parse(string $value = null): ?string{
 
-		if($value !== null){
+		if ($value !== null) {
 
 			$q = $value[0] ?? null;
 
@@ -239,8 +239,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);
 			}
@@ -256,14 +256,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->__issetEnv($var)){
+		foreach ($required as $var) {
+			if (!$this->__issetEnv($var)) {
 				throw new TraitException('required variable not set: '.strtoupper($var));
 			}
 		}

src/ImmutableSettingsAbstract.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 
 namespace chillerlan\Traits;
 
-abstract class ImmutableSettingsAbstract implements ImmutableSettingsInterface{
+abstract class ImmutableSettingsAbstract implements ImmutableSettingsInterface {
 	use ImmutableSettingsContainer;
 }

src/Crypto/CryptoKeypair.php

Spacing +2 added lines, -2 removed lines

@@ -45,9 +45,9 @@
 	 *
 	 * @throws \chillerlan\Traits\Crypto\CryptoException
 	 */
-	public function __construct(iterable $properties = null){
+	public function __construct(iterable $properties = null) {
 
-		if(!extension_loaded('sodium') || !function_exists('sodium_memzero')){
+		if (!extension_loaded('sodium') || !function_exists('sodium_memzero')) {
 			throw new CryptoException('sodium extension (PHP 7.2+) required!'); // @codeCoverageIgnore
 		}
 

src/Crypto/CryptoBox.php

Spacing +7 added lines, -7 removed lines

@@ -53,9 +53,9 @@ 
 	 *
 	 * @throws \chillerlan\Traits\Crypto\CryptoException
 	 */
-	public function __construct(iterable $properties = null){
+	public function __construct(iterable $properties = null) {
 
-		if(!extension_loaded('sodium') || !function_exists('sodium_memzero')){
+		if (!extension_loaded('sodium') || !function_exists('sodium_memzero')) {
 			throw new CryptoException('sodium extension (PHP 7.2+) required!'); // @codeCoverageIgnore
 		}
 
@@ -71,14 +71,14 @@ 
 	 */
 	protected function checkKeypair(int $secretLength = null, int $PublicLength = null):void{
 
-		if($secretLength !== null){
-			if(!$this->keypair->secret || strlen($this->keypair->secret) !== $secretLength){
+		if ($secretLength !== null) {
+			if (!$this->keypair->secret || strlen($this->keypair->secret) !== $secretLength) {
 				throw new CryptoException('invalid secret key');
 			}
 		}
 
-		if($PublicLength !== null){
-			if(!$this->keypair->public || strlen($this->keypair->public) !== $PublicLength){
+		if ($PublicLength !== null) {
+			if (!$this->keypair->public || strlen($this->keypair->public) !== $PublicLength) {
 				throw new CryptoException('invalid public key');
 			}
 		}
@@ -94,7 +94,7 @@ 
 	protected function checkMessage(string $message):string{
 		$message = trim($message);
 
-		if(empty($message)){
+		if (empty($message)) {
 			throw new CryptoException('invalid message');
 		}
 

src/ImmutableSettingsContainer.php

Spacing +14 added lines, -14 removed lines

@@ -17,24 +17,24 @@ 
 /**
  * a generic container with magic getter and setter
  */
-trait ImmutableSettingsContainer{
+trait ImmutableSettingsContainer {
 
 	/**
 	 * @param iterable|null $properties
 	 */
-	public function __construct(iterable $properties = null){
+	public function __construct(iterable $properties = null) {
 
-		if(!empty($properties)){
+		if (!empty($properties)) {
 			$this->__fromIterable($properties);
 		}
 
 		// call a method with trait name as replacement constructor for each trait
 		$traits = (new ReflectionClass($this))->getTraits();
 
-		foreach($traits as $trait){
+		foreach ($traits as $trait) {
 			$method = $trait->getShortName();
 
-			if(method_exists($this, $method)){
+			if (method_exists($this, $method)) {
 				call_user_func([$this, $trait->getShortName()]);
 			}
 		}
@@ -45,9 +45,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get(string $property){
+	public function __get(string $property) {
 
-		if($this->__isset($property)){
+		if ($this->__isset($property)) {
 			return $this->{$property};
 		}
 
@@ -63,7 +63,7 @@ 
 	public function __set(string $property, $value):void{
 
 		// avoid overwriting private properties
-		if(property_exists($this, $property) && !$this->__isPrivate($property)){
+		if (property_exists($this, $property) && !$this->__isPrivate($property)) {
 			$this->{$property} = $value;
 			return;
 		}
@@ -97,7 +97,7 @@ 
 	public function __unset(string $property):void{
 
 		// avoid unsetting private properties
-		if($this->__isset($property)){
+		if ($this->__isset($property)) {
 			unset($this->{$property});
 		}
 
@@ -116,10 +116,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;
 			}
 
@@ -133,9 +133,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);
 		}
 
@@ -156,7 +156,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function __fromJSON(string $json){
+	public function __fromJSON(string $json) {
 		return $this->__fromIterable(json_decode($json, true));
 	}