chillerlan / php-traits

src/Crypto/SecretBox.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace chillerlan\Traits\Crypto;
 
-class SecretBox extends CryptoBox{
+class SecretBox extends CryptoBox {
 
 	/**
 	 * @param string      $message
@@ -29,7 +29,7 @@ 
 
 		sodium_memzero($message);
 
-		if($nonce_bin !== null){
+		if ($nonce_bin !== null) {
 			sodium_memzero($nonce_bin);
 		}
 
@@ -48,7 +48,7 @@ 
 
 		$this->message = sodium_crypto_secretbox_open($box_bin, $nonce_bin, $this->keypair->secret);
 
-		if($this->message === false){
+		if ($this->message === false) {
 			throw new CryptoException('invalid box'); // @codeCoverageIgnore
 		}
 

src/Crypto/CryptoBox.php

Spacing +8 added lines, -8 removed lines

@@ -53,9 +53,9 @@ 
 	 *
 	 * @throws \chillerlan\Traits\Crypto\CryptoException
 	 */
-	public function __construct(array $properties = null){
+	public function __construct(array $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
 		}
 
@@ -69,16 +69,16 @@ 
 	 * @return void
 	 * @throws \chillerlan\Traits\Crypto\CryptoException
 	 */
-	protected function checkKeypair(int $secretLength = null, int $PublicLength = null){
+	protected function checkKeypair(int $secretLength = null, int $PublicLength = null) {
 
-		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/Crypto/SignKeypair.php

Spacing +3 added lines, -3 removed lines

@@ -12,12 +12,12 @@ 
 
 namespace chillerlan\Traits\Crypto;
 
-class SignKeypair extends CryptoKeypair{
+class SignKeypair extends CryptoKeypair {
 
 	/** @inheritdoc */
 	public function create(string &$seed_bin = null):CryptoKeyInterface{
 
-		if($seed_bin !== null && strlen($seed_bin) !== SODIUM_CRYPTO_SIGN_SEEDBYTES){
+		if ($seed_bin !== null && strlen($seed_bin) !== SODIUM_CRYPTO_SIGN_SEEDBYTES) {
 			throw new CryptoException('invalid seed length');
 		}
 
@@ -31,7 +31,7 @@ 
 
 		sodium_memzero($keypair);
 
-		if($seed_bin !== null){
+		if ($seed_bin !== null) {
 			sodium_memzero($seed_bin);
 		}
 

src/Crypto/SealedBox.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace chillerlan\Traits\Crypto;
 
-class SealedBox extends CryptoBox{
+class SealedBox extends CryptoBox {
 
 	/** @inheritdoc */
 	public function create(string &$message):CryptoBoxInterface{
@@ -35,7 +35,7 @@ 
 		sodium_memzero($keypair);
 		sodium_memzero($box_bin);
 
-		if($this->message === false){
+		if ($this->message === false) {
 			throw new CryptoException('invalid box'); // @codeCoverageIgnore
 		}
 

src/Crypto/CryptoTrait.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace chillerlan\Traits\Crypto;
 
-trait CryptoTrait{
+trait CryptoTrait {
 
 	/**
 	 * @var \chillerlan\Traits\Crypto\CryptoKeyInterface
@@ -25,7 +25,7 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function setBoxKeypair(string $secret_hex = null, string $public_hex = null){
+	protected function setBoxKeypair(string $secret_hex = null, string $public_hex = null) {
 		return $this->setCryptoKeyInterface(BoxKeypair::class, $secret_hex, $public_hex);
 	}
 
@@ -35,7 +35,7 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function setSignKeypair(string $secret_hex = null, string $public_hex = null){
+	protected function setSignKeypair(string $secret_hex = null, string $public_hex = null) {
 		return $this->setCryptoKeyInterface(SignKeypair::class, $secret_hex, $public_hex);
 	}
 
@@ -44,7 +44,7 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function setKeypair(CryptoKeyInterface $keypair){
+	protected function setKeypair(CryptoKeyInterface $keypair) {
 		unset($this->cryptoKeyInterface);
 
 		$this->cryptoKeyInterface = $keypair;
@@ -59,7 +59,7 @@ 
 	 *
 	 * @return $this
 	 */
-	private function setCryptoKeyInterface(string $type_fqcn, string &$secret_hex = null, string &$public_hex = null){
+	private function setCryptoKeyInterface(string $type_fqcn, string &$secret_hex = null, string &$public_hex = null) {
 		unset($this->cryptoKeyInterface);
 
 		$this->cryptoKeyInterface = new $type_fqcn([
@@ -67,11 +67,11 @@ 
 			'public' => !empty($public_hex) ? sodium_hex2bin($public_hex) : null,
 		]);
 
-		if($secret_hex !== null){
+		if ($secret_hex !== null) {
 			sodium_memzero($secret_hex);
 		}
 
-		if($public_hex !== null){
+		if ($public_hex !== null) {
 			sodium_memzero($public_hex);
 		}
 

src/Crypto/BoxKeypair.php

Spacing +4 added lines, -4 removed lines

@@ -12,12 +12,12 @@ 
 
 namespace chillerlan\Traits\Crypto;
 
-class BoxKeypair extends CryptoKeypair{
+class BoxKeypair extends CryptoKeypair {
 
 	/** @inheritdoc */
 	public function create(string &$seed_bin = null):CryptoKeyInterface{
 
-		if($seed_bin !== null && strlen($seed_bin) !== SODIUM_CRYPTO_BOX_SEEDBYTES){
+		if ($seed_bin !== null && strlen($seed_bin) !== SODIUM_CRYPTO_BOX_SEEDBYTES) {
 			throw new CryptoException('invalid seed length');
 		}
 
@@ -31,7 +31,7 @@ 
 
 		sodium_memzero($keypair);
 
-		if($seed_bin !== null){
+		if ($seed_bin !== null) {
 			sodium_memzero($seed_bin);
 		}
 
@@ -46,7 +46,7 @@ 
 	 */
 	public function createFromSecret(string &$secret_bin):CryptoKeyInterface{
 
-		if(strlen($secret_bin) !== SODIUM_CRYPTO_BOX_SECRETKEYBYTES){
+		if (strlen($secret_bin) !== SODIUM_CRYPTO_BOX_SECRETKEYBYTES) {
 			throw new CryptoException('invalid secret key length');
 		}
 

src/Crypto/SignedMessage.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace chillerlan\Traits\Crypto;
 
-class SignedMessage extends CryptoBox{
+class SignedMessage extends CryptoBox {
 
 	/** @inheritdoc */
 	public function create(string &$message):CryptoBoxInterface{
@@ -33,7 +33,7 @@ 
 
 		sodium_memzero($box_bin);
 
-		if($this->message === false){
+		if ($this->message === false) {
 			throw new CryptoException('invalid box'); // @codeCoverageIgnore
 		}
 

src/Crypto/MemzeroDestructorTrait.php

Spacing +6 added lines, -6 removed lines

@@ -12,21 +12,21 @@
 
 namespace chillerlan\Traits\Crypto;
 
-trait MemzeroDestructorTrait{
+trait MemzeroDestructorTrait {
 
 	/**
 	 * @return void
 	 */
-	public function __destruct(){
+	public function __destruct() {
 
-		if(!function_exists('sodium_memzero')){
+		if (!function_exists('sodium_memzero')) {
 			return;
 		}
 
-		foreach(array_keys(get_object_vars($this)) as $key){
+		foreach (array_keys(get_object_vars($this)) as $key) {
 
-			if(is_scalar($this->{$key})){
-				$this->{$key} = (string)$this->{$key};
+			if (is_scalar($this->{$key})) {
+				$this->{$key} = (string) $this->{$key};
 
 				sodium_memzero($this->{$key});
 			}

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