gravityview / GravityView

vendor/paragonie/sodium_compat/lib/namespaced.php

Spacing +10 added lines, -10 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-require_once dirname(dirname(__FILE__)) . '/autoload.php';
+require_once dirname( dirname( __FILE__ ) ) . '/autoload.php';
 
-if (PHP_VERSION_ID < 50300) {
+if ( PHP_VERSION_ID < 50300 ) {
     return;
 }
 
@@ -20,27 +20,27 @@ 
  *
  * $x = Compat::crypto_aead_xchacha20poly1305_encrypt(...$args);
  */
-spl_autoload_register(function ($class) {
-    if ($class[0] === '\\') {
-        $class = substr($class, 1);
+spl_autoload_register( function( $class ) {
+    if ( $class[ 0 ] === '\\' ) {
+        $class = substr( $class, 1 );
     }
     $namespace = 'ParagonIE\\Sodium';
     // Does the class use the namespace prefix?
-    $len = strlen($namespace);
-    if (strncmp($namespace, $class, $len) !== 0) {
+    $len = strlen( $namespace );
+    if ( strncmp( $namespace, $class, $len ) !== 0 ) {
         // no, move to the next registered autoloader
         return false;
     }
 
     // Get the relative class name
-    $relative_class = substr($class, $len);
+    $relative_class = substr( $class, $len );
 
     // Replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = dirname(dirname(__FILE__)) . '/namespaced/' . str_replace('\\', '/', $relative_class) . '.php';
+    $file = dirname( dirname( __FILE__ ) ) . '/namespaced/' . str_replace( '\\', '/', $relative_class ) . '.php';
     // if the file exists, require it
-    if (file_exists($file)) {
+    if ( file_exists( $file ) ) {
         require_once $file;
         return true;
     }

vendor/paragonie/sodium_compat/lib/stream-xchacha20.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!is_callable('sodium_crypto_stream_xchacha20')) {
+if ( ! is_callable( 'sodium_crypto_stream_xchacha20' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_stream_xchacha20()
      * @param int $len
@@ -10,12 +10,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_stream_xchacha20($len, $nonce, $key)
+    function sodium_crypto_stream_xchacha20( $len, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_stream_xchacha20($len, $nonce, $key, true);
+        return ParagonIE_Sodium_Compat::crypto_stream_xchacha20( $len, $nonce, $key, true );
     }
 }
-if (!is_callable('sodium_crypto_stream_xchacha20_keygen')) {
+if ( ! is_callable( 'sodium_crypto_stream_xchacha20_keygen' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_stream_xchacha20_keygen()
      * @return string
@@ -26,7 +26,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_stream_xchacha20_keygen();
     }
 }
-if (!is_callable('sodium_crypto_stream_xchacha20_xor')) {
+if ( ! is_callable( 'sodium_crypto_stream_xchacha20_xor' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_stream_xchacha20_xor()
      * @param string $message
@@ -36,8 +36,8 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_stream_xchacha20_xor($message, $nonce, $key)
+    function sodium_crypto_stream_xchacha20_xor( $message, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_stream_xchacha20_xor($message, $nonce, $key, true);
+        return ParagonIE_Sodium_Compat::crypto_stream_xchacha20_xor( $message, $nonce, $key, true );
     }
 }

vendor/paragonie/sodium_compat/lib/php72compat.php

Spacing +256 added lines, -256 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once dirname(dirname(__FILE__)) . '/autoload.php';
+require_once dirname( dirname( __FILE__ ) ) . '/autoload.php';
 
 /**
  * This file will monkey patch the pure-PHP implementation in place of the
@@ -9,7 +9,7 @@ 
  * Thus, the functions or constants just proxy to the appropriate
  * ParagonIE_Sodium_Compat method or class constant, respectively.
  */
-foreach (array(
+foreach ( array(
     'BASE64_VARIANT_ORIGINAL',
     'BASE64_VARIANT_ORIGINAL_NO_PADDING',
     'BASE64_VARIANT_URLSAFE',
@@ -103,11 +103,11 @@ 
     'VERSION_STRING'
     ) as $constant
 ) {
-    if (!defined("SODIUM_$constant") && defined("ParagonIE_Sodium_Compat::$constant")) {
-        define("SODIUM_$constant", constant("ParagonIE_Sodium_Compat::$constant"));
+    if ( ! defined( "SODIUM_$constant" ) && defined( "ParagonIE_Sodium_Compat::$constant" ) ) {
+        define( "SODIUM_$constant", constant( "ParagonIE_Sodium_Compat::$constant" ) );
     }
 }
-if (!is_callable('sodium_add')) {
+if ( ! is_callable( 'sodium_add' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::add()
      * @param string $val
@@ -115,12 +115,12 @@ 
      * @return void
      * @throws SodiumException
      */
-    function sodium_add(&$val, $addv)
+    function sodium_add( &$val, $addv )
     {
-        ParagonIE_Sodium_Compat::add($val, $addv);
+        ParagonIE_Sodium_Compat::add( $val, $addv );
     }
 }
-if (!is_callable('sodium_base642bin')) {
+if ( ! is_callable( 'sodium_base642bin' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::bin2base64()
      * @param string $string
@@ -130,12 +130,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_base642bin($string, $variant, $ignore ='')
+    function sodium_base642bin( $string, $variant, $ignore = '' )
     {
-        return ParagonIE_Sodium_Compat::base642bin($string, $variant, $ignore);
+        return ParagonIE_Sodium_Compat::base642bin( $string, $variant, $ignore );
     }
 }
-if (!is_callable('sodium_bin2base64')) {
+if ( ! is_callable( 'sodium_bin2base64' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::bin2base64()
      * @param string $string
@@ -144,12 +144,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_bin2base64($string, $variant)
+    function sodium_bin2base64( $string, $variant )
     {
-        return ParagonIE_Sodium_Compat::bin2base64($string, $variant);
+        return ParagonIE_Sodium_Compat::bin2base64( $string, $variant );
     }
 }
-if (!is_callable('sodium_bin2hex')) {
+if ( ! is_callable( 'sodium_bin2hex' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::hex2bin()
      * @param string $string
@@ -157,12 +157,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_bin2hex($string)
+    function sodium_bin2hex( $string )
     {
-        return ParagonIE_Sodium_Compat::bin2hex($string);
+        return ParagonIE_Sodium_Compat::bin2hex( $string );
     }
 }
-if (!is_callable('sodium_compare')) {
+if ( ! is_callable( 'sodium_compare' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::compare()
      * @param string $a
@@ -171,12 +171,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_compare($a, $b)
+    function sodium_compare( $a, $b )
     {
-        return ParagonIE_Sodium_Compat::compare($a, $b);
+        return ParagonIE_Sodium_Compat::compare( $a, $b );
     }
 }
-if (!is_callable('sodium_crypto_aead_aes256gcm_decrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_aes256gcm_decrypt' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt()
      * @param string $message
@@ -185,18 +185,18 @@ 
      * @param string $key
      * @return string|bool
      */
-    function sodium_crypto_aead_aes256gcm_decrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_aes256gcm_decrypt( $message, $assocData, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt( $message, $assocData, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_aead_aes256gcm_encrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_aes256gcm_encrypt' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_encrypt()
      * @param string $message
@@ -207,12 +207,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_aead_aes256gcm_encrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_aes256gcm_encrypt( $message, $assocData, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_encrypt($message, $assocData, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_encrypt( $message, $assocData, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_aead_aes256gcm_is_available')) {
+if ( ! is_callable( 'sodium_crypto_aead_aes256gcm_is_available' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_is_available()
      * @return bool
@@ -222,7 +222,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_is_available();
     }
 }
-if (!is_callable('sodium_crypto_aead_chacha20poly1305_decrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_decrypt' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt()
      * @param string $message
@@ -231,18 +231,18 @@ 
      * @param string $key
      * @return string|bool
      */
-    function sodium_crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_chacha20poly1305_decrypt( $message, $assocData, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt( $message, $assocData, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_aead_chacha20poly1305_encrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_encrypt' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt()
      * @param string $message
@@ -253,12 +253,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_chacha20poly1305_encrypt( $message, $assocData, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt( $message, $assocData, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_aead_chacha20poly1305_keygen')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_keygen' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_keygen()
      * @return string
@@ -269,7 +269,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_keygen();
     }
 }
-if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_decrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_ietf_decrypt' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt()
      * @param string $message
@@ -278,18 +278,18 @@ 
      * @param string $key
      * @return string|bool
      */
-    function sodium_crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_chacha20poly1305_ietf_decrypt( $message, $assocData, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt( $message, $assocData, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_encrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_ietf_encrypt' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt()
      * @param string $message
@@ -300,12 +300,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_chacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_keygen')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_ietf_keygen' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_keygen()
      * @return string
@@ -316,7 +316,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_keygen();
     }
 }
-if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_xchacha20poly1305_ietf_decrypt' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt()
      * @param string $message
@@ -325,18 +325,18 @@ 
      * @param string $key
      * @return string|bool
      */
-    function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt( $message, $assocData, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key, true);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt( $message, $assocData, $nonce, $key, true );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_xchacha20poly1305_ietf_encrypt' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt()
      * @param string $message
@@ -347,12 +347,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key, true);
+        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key, true );
     }
 }
-if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_keygen')) {
+if ( ! is_callable( 'sodium_crypto_aead_xchacha20poly1305_ietf_keygen' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_keygen()
      * @return string
@@ -363,7 +363,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_keygen();
     }
 }
-if (!is_callable('sodium_crypto_auth')) {
+if ( ! is_callable( 'sodium_crypto_auth' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_auth()
      * @param string $message
@@ -372,12 +372,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_auth($message, $key)
+    function sodium_crypto_auth( $message, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+        return ParagonIE_Sodium_Compat::crypto_auth( $message, $key );
     }
 }
-if (!is_callable('sodium_crypto_auth_keygen')) {
+if ( ! is_callable( 'sodium_crypto_auth_keygen' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_auth_keygen()
      * @return string
@@ -388,7 +388,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_auth_keygen();
     }
 }
-if (!is_callable('sodium_crypto_auth_verify')) {
+if ( ! is_callable( 'sodium_crypto_auth_verify' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_auth_verify()
      * @param string $mac
@@ -398,12 +398,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_auth_verify($mac, $message, $key)
+    function sodium_crypto_auth_verify( $mac, $message, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+        return ParagonIE_Sodium_Compat::crypto_auth_verify( $mac, $message, $key );
     }
 }
-if (!is_callable('sodium_crypto_box')) {
+if ( ! is_callable( 'sodium_crypto_box' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_box()
      * @param string $message
@@ -413,12 +413,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_box($message, $nonce, $kp)
+    function sodium_crypto_box( $message, $nonce, $kp )
     {
-        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+        return ParagonIE_Sodium_Compat::crypto_box( $message, $nonce, $kp );
     }
 }
-if (!is_callable('sodium_crypto_box_keypair')) {
+if ( ! is_callable( 'sodium_crypto_box_keypair' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_box_keypair()
      * @return string
@@ -430,7 +430,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_box_keypair();
     }
 }
-if (!is_callable('sodium_crypto_box_keypair_from_secretkey_and_publickey')) {
+if ( ! is_callable( 'sodium_crypto_box_keypair_from_secretkey_and_publickey' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey()
      * @param string $sk
@@ -439,12 +439,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
+    function sodium_crypto_box_keypair_from_secretkey_and_publickey( $sk, $pk )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
+        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey( $sk, $pk );
     }
 }
-if (!is_callable('sodium_crypto_box_open')) {
+if ( ! is_callable( 'sodium_crypto_box_open' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_box_open()
      * @param string $message
@@ -452,18 +452,18 @@ 
      * @param string $kp
      * @return string|bool
      */
-    function sodium_crypto_box_open($message, $nonce, $kp)
+    function sodium_crypto_box_open( $message, $nonce, $kp )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_box_open( $message, $nonce, $kp );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_box_publickey')) {
+if ( ! is_callable( 'sodium_crypto_box_publickey' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_box_publickey()
      * @param string $keypair
@@ -471,12 +471,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_box_publickey($keypair)
+    function sodium_crypto_box_publickey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_box_publickey( $keypair );
     }
 }
-if (!is_callable('sodium_crypto_box_publickey_from_secretkey')) {
+if ( ! is_callable( 'sodium_crypto_box_publickey_from_secretkey' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey()
      * @param string $sk
@@ -484,12 +484,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_box_publickey_from_secretkey($sk)
+    function sodium_crypto_box_publickey_from_secretkey( $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey( $sk );
     }
 }
-if (!is_callable('sodium_crypto_box_seal')) {
+if ( ! is_callable( 'sodium_crypto_box_seal' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_box_seal()
      * @param string $message
@@ -498,12 +498,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_box_seal($message, $publicKey)
+    function sodium_crypto_box_seal( $message, $publicKey )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+        return ParagonIE_Sodium_Compat::crypto_box_seal( $message, $publicKey );
     }
 }
-if (!is_callable('sodium_crypto_box_seal_open')) {
+if ( ! is_callable( 'sodium_crypto_box_seal_open' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_box_seal_open()
      * @param string $message
@@ -511,19 +511,19 @@ 
      * @return string|bool
      * @throws SodiumException
      */
-    function sodium_crypto_box_seal_open($message, $kp)
+    function sodium_crypto_box_seal_open( $message, $kp )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
-        } catch (SodiumException $ex) {
-            if ($ex->getMessage() === 'Argument 2 must be CRYPTO_BOX_KEYPAIRBYTES long.') {
+            return ParagonIE_Sodium_Compat::crypto_box_seal_open( $message, $kp );
+        } catch ( SodiumException $ex ) {
+            if ( $ex->getMessage() === 'Argument 2 must be CRYPTO_BOX_KEYPAIRBYTES long.' ) {
                 throw $ex;
             }
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_box_secretkey')) {
+if ( ! is_callable( 'sodium_crypto_box_secretkey' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_box_secretkey()
      * @param string $keypair
@@ -531,12 +531,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_box_secretkey($keypair)
+    function sodium_crypto_box_secretkey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_box_secretkey( $keypair );
     }
 }
-if (!is_callable('sodium_crypto_box_seed_keypair')) {
+if ( ! is_callable( 'sodium_crypto_box_seed_keypair' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_box_seed_keypair()
      * @param string $seed
@@ -544,12 +544,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_box_seed_keypair($seed)
+    function sodium_crypto_box_seed_keypair( $seed )
     {
-        return ParagonIE_Sodium_Compat::crypto_box_seed_keypair($seed);
+        return ParagonIE_Sodium_Compat::crypto_box_seed_keypair( $seed );
     }
 }
-if (!is_callable('sodium_crypto_generichash')) {
+if ( ! is_callable( 'sodium_crypto_generichash' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_generichash()
      * @param string $message
@@ -559,12 +559,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_generichash($message, $key = null, $outLen = 32)
+    function sodium_crypto_generichash( $message, $key = null, $outLen = 32 )
     {
-        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+        return ParagonIE_Sodium_Compat::crypto_generichash( $message, $key, $outLen );
     }
 }
-if (!is_callable('sodium_crypto_generichash_final')) {
+if ( ! is_callable( 'sodium_crypto_generichash_final' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_generichash_final()
      * @param string|null $ctx
@@ -573,12 +573,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_generichash_final(&$ctx, $outputLength = 32)
+    function sodium_crypto_generichash_final( &$ctx, $outputLength = 32 )
     {
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+        return ParagonIE_Sodium_Compat::crypto_generichash_final( $ctx, $outputLength );
     }
 }
-if (!is_callable('sodium_crypto_generichash_init')) {
+if ( ! is_callable( 'sodium_crypto_generichash_init' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_generichash_init()
      * @param string|null $key
@@ -587,12 +587,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_generichash_init($key = null, $outLen = 32)
+    function sodium_crypto_generichash_init( $key = null, $outLen = 32 )
     {
-        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+        return ParagonIE_Sodium_Compat::crypto_generichash_init( $key, $outLen );
     }
 }
-if (!is_callable('sodium_crypto_generichash_keygen')) {
+if ( ! is_callable( 'sodium_crypto_generichash_keygen' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_generichash_keygen()
      * @return string
@@ -603,7 +603,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_generichash_keygen();
     }
 }
-if (!is_callable('sodium_crypto_generichash_update')) {
+if ( ! is_callable( 'sodium_crypto_generichash_update' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_generichash_update()
      * @param string|null $ctx
@@ -612,12 +612,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_generichash_update(&$ctx, $message = '')
+    function sodium_crypto_generichash_update( &$ctx, $message = '' )
     {
-        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+        ParagonIE_Sodium_Compat::crypto_generichash_update( $ctx, $message );
     }
 }
-if (!is_callable('sodium_crypto_kdf_keygen')) {
+if ( ! is_callable( 'sodium_crypto_kdf_keygen' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_kdf_keygen()
      * @return string
@@ -628,7 +628,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_kdf_keygen();
     }
 }
-if (!is_callable('sodium_crypto_kdf_derive_from_key')) {
+if ( ! is_callable( 'sodium_crypto_kdf_derive_from_key' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_kdf_derive_from_key()
      * @param int $subkey_len
@@ -638,7 +638,7 @@ 
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_kdf_derive_from_key($subkey_len, $subkey_id, $context, $key)
+    function sodium_crypto_kdf_derive_from_key( $subkey_len, $subkey_id, $context, $key )
     {
         return ParagonIE_Sodium_Compat::crypto_kdf_derive_from_key(
             $subkey_len,
@@ -648,7 +648,7 @@ 
         );
     }
 }
-if (!is_callable('sodium_crypto_kx')) {
+if ( ! is_callable( 'sodium_crypto_kx' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_kx()
      * @param string $my_secret
@@ -659,7 +659,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    function sodium_crypto_kx( $my_secret, $their_public, $client_public, $server_public )
     {
         return ParagonIE_Sodium_Compat::crypto_kx(
             $my_secret,
@@ -669,18 +669,18 @@ 
         );
     }
 }
-if (!is_callable('sodium_crypto_kx_seed_keypair')) {
+if ( ! is_callable( 'sodium_crypto_kx_seed_keypair' ) ) {
     /**
      * @param string $seed
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_kx_seed_keypair($seed)
+    function sodium_crypto_kx_seed_keypair( $seed )
     {
-        return ParagonIE_Sodium_Compat::crypto_kx_seed_keypair($seed);
+        return ParagonIE_Sodium_Compat::crypto_kx_seed_keypair( $seed );
     }
 }
-if (!is_callable('sodium_crypto_kx_keypair')) {
+if ( ! is_callable( 'sodium_crypto_kx_keypair' ) ) {
     /**
      * @return string
      * @throws Exception
@@ -690,53 +690,53 @@ 
         return ParagonIE_Sodium_Compat::crypto_kx_keypair();
     }
 }
-if (!is_callable('sodium_crypto_kx_client_session_keys')) {
+if ( ! is_callable( 'sodium_crypto_kx_client_session_keys' ) ) {
     /**
      * @param string $keypair
      * @param string $serverPublicKey
      * @return array{0: string, 1: string}
      * @throws SodiumException
      */
-    function sodium_crypto_kx_client_session_keys($keypair, $serverPublicKey)
+    function sodium_crypto_kx_client_session_keys( $keypair, $serverPublicKey )
     {
-        return ParagonIE_Sodium_Compat::crypto_kx_client_session_keys($keypair, $serverPublicKey);
+        return ParagonIE_Sodium_Compat::crypto_kx_client_session_keys( $keypair, $serverPublicKey );
     }
 }
-if (!is_callable('sodium_crypto_kx_server_session_keys')) {
+if ( ! is_callable( 'sodium_crypto_kx_server_session_keys' ) ) {
     /**
      * @param string $keypair
      * @param string $clientPublicKey
      * @return array{0: string, 1: string}
      * @throws SodiumException
      */
-    function sodium_crypto_kx_server_session_keys($keypair, $clientPublicKey)
+    function sodium_crypto_kx_server_session_keys( $keypair, $clientPublicKey )
     {
-        return ParagonIE_Sodium_Compat::crypto_kx_server_session_keys($keypair, $clientPublicKey);
+        return ParagonIE_Sodium_Compat::crypto_kx_server_session_keys( $keypair, $clientPublicKey );
     }
 }
-if (!is_callable('sodium_crypto_kx_secretkey')) {
+if ( ! is_callable( 'sodium_crypto_kx_secretkey' ) ) {
     /**
      * @param string $keypair
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_kx_secretkey($keypair)
+    function sodium_crypto_kx_secretkey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_kx_secretkey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_kx_secretkey( $keypair );
     }
 }
-if (!is_callable('sodium_crypto_kx_publickey')) {
+if ( ! is_callable( 'sodium_crypto_kx_publickey' ) ) {
     /**
      * @param string $keypair
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_kx_publickey($keypair)
+    function sodium_crypto_kx_publickey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_kx_publickey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_kx_publickey( $keypair );
     }
 }
-if (!is_callable('sodium_crypto_pwhash')) {
+if ( ! is_callable( 'sodium_crypto_pwhash' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_pwhash()
      * @param int $outlen
@@ -749,12 +749,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit, $algo = null)
+    function sodium_crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit, $algo = null )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit, $algo);
+        return ParagonIE_Sodium_Compat::crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit, $algo );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_str')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_str' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_pwhash_str()
      * @param string $passwd
@@ -764,12 +764,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit)
+    function sodium_crypto_pwhash_str( $passwd, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str( $passwd, $opslimit, $memlimit );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_str_needs_rehash')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_str_needs_rehash' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_pwhash_str_needs_rehash()
      * @param string $hash
@@ -779,12 +779,12 @@ 
      *
      * @throws SodiumException
      */
-    function sodium_crypto_pwhash_str_needs_rehash($hash, $opslimit, $memlimit)
+    function sodium_crypto_pwhash_str_needs_rehash( $hash, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str_needs_rehash($hash, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str_needs_rehash( $hash, $opslimit, $memlimit );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_str_verify')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_str_verify' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_pwhash_str_verify()
      * @param string $passwd
@@ -793,12 +793,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_pwhash_str_verify($passwd, $hash)
+    function sodium_crypto_pwhash_str_verify( $passwd, $hash )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify( $passwd, $hash );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_scryptsalsa208sha256' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256()
      * @param int $outlen
@@ -810,12 +810,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+    function sodium_crypto_pwhash_scryptsalsa208sha256( $outlen, $passwd, $salt, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256( $outlen, $passwd, $salt, $opslimit, $memlimit );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_scryptsalsa208sha256_str' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str()
      * @param string $passwd
@@ -825,12 +825,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+    function sodium_crypto_pwhash_scryptsalsa208sha256_str( $passwd, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str( $passwd, $opslimit, $memlimit );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str_verify')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_scryptsalsa208sha256_str_verify' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify()
      * @param string $passwd
@@ -839,12 +839,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+    function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify( $passwd, $hash )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify( $passwd, $hash );
     }
 }
-if (!is_callable('sodium_crypto_scalarmult')) {
+if ( ! is_callable( 'sodium_crypto_scalarmult' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_scalarmult()
      * @param string $n
@@ -853,12 +853,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_scalarmult($n, $p)
+    function sodium_crypto_scalarmult( $n, $p )
     {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+        return ParagonIE_Sodium_Compat::crypto_scalarmult( $n, $p );
     }
 }
-if (!is_callable('sodium_crypto_scalarmult_base')) {
+if ( ! is_callable( 'sodium_crypto_scalarmult_base' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_scalarmult_base()
      * @param string $n
@@ -866,12 +866,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_scalarmult_base($n)
+    function sodium_crypto_scalarmult_base( $n )
     {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+        return ParagonIE_Sodium_Compat::crypto_scalarmult_base( $n );
     }
 }
-if (!is_callable('sodium_crypto_secretbox')) {
+if ( ! is_callable( 'sodium_crypto_secretbox' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_secretbox()
      * @param string $message
@@ -881,12 +881,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_secretbox($message, $nonce, $key)
+    function sodium_crypto_secretbox( $message, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_secretbox( $message, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_secretbox_keygen')) {
+if ( ! is_callable( 'sodium_crypto_secretbox_keygen' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_secretbox_keygen()
      * @return string
@@ -897,7 +897,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_secretbox_keygen();
     }
 }
-if (!is_callable('sodium_crypto_secretbox_open')) {
+if ( ! is_callable( 'sodium_crypto_secretbox_open' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_secretbox_open()
      * @param string $message
@@ -905,29 +905,29 @@ 
      * @param string $key
      * @return string|bool
      */
-    function sodium_crypto_secretbox_open($message, $nonce, $key)
+    function sodium_crypto_secretbox_open( $message, $nonce, $key )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_secretbox_open( $message, $nonce, $key );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_init_push')) {
+if ( ! is_callable( 'sodium_crypto_secretstream_xchacha20poly1305_init_push' ) ) {
     /**
      * @param string $key
      * @return array<int, string>
      * @throws SodiumException
      */
-    function sodium_crypto_secretstream_xchacha20poly1305_init_push($key)
+    function sodium_crypto_secretstream_xchacha20poly1305_init_push( $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_init_push($key);
+        return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_init_push( $key );
     }
 }
-if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_push')) {
+if ( ! is_callable( 'sodium_crypto_secretstream_xchacha20poly1305_push' ) ) {
     /**
      * @param string $state
      * @param string $msg
@@ -936,24 +936,24 @@ 
      * @return string
      * @throws SodiumException
      */
-    function sodium_crypto_secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0)
+    function sodium_crypto_secretstream_xchacha20poly1305_push( &$state, $msg, $aad = '', $tag = 0 )
     {
-        return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_push($state, $msg, $aad, $tag);
+        return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_push( $state, $msg, $aad, $tag );
     }
 }
-if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_init_pull')) {
+if ( ! is_callable( 'sodium_crypto_secretstream_xchacha20poly1305_init_pull' ) ) {
     /**
      * @param string $header
      * @param string $key
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_secretstream_xchacha20poly1305_init_pull($header, $key)
+    function sodium_crypto_secretstream_xchacha20poly1305_init_pull( $header, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_init_pull($header, $key);
+        return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_init_pull( $header, $key );
     }
 }
-if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_pull')) {
+if ( ! is_callable( 'sodium_crypto_secretstream_xchacha20poly1305_pull' ) ) {
     /**
      * @param string $state
      * @param string $cipher
@@ -961,23 +961,23 @@ 
      * @return bool|array{0: string, 1: int}
      * @throws SodiumException
      */
-    function sodium_crypto_secretstream_xchacha20poly1305_pull(&$state, $cipher, $aad = '')
+    function sodium_crypto_secretstream_xchacha20poly1305_pull( &$state, $cipher, $aad = '' )
     {
-        return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_pull($state, $cipher, $aad);
+        return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_pull( $state, $cipher, $aad );
     }
 }
-if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_rekey')) {
+if ( ! is_callable( 'sodium_crypto_secretstream_xchacha20poly1305_rekey' ) ) {
     /**
      * @param string $state
      * @return void
      * @throws SodiumException
      */
-    function sodium_crypto_secretstream_xchacha20poly1305_rekey(&$state)
+    function sodium_crypto_secretstream_xchacha20poly1305_rekey( &$state )
     {
-        ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_rekey($state);
+        ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_rekey( $state );
     }
 }
-if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_keygen')) {
+if ( ! is_callable( 'sodium_crypto_secretstream_xchacha20poly1305_keygen' ) ) {
     /**
      * @return string
      * @throws Exception
@@ -987,7 +987,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_keygen();
     }
 }
-if (!is_callable('sodium_crypto_shorthash')) {
+if ( ! is_callable( 'sodium_crypto_shorthash' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_shorthash()
      * @param string $message
@@ -996,12 +996,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_shorthash($message, $key = '')
+    function sodium_crypto_shorthash( $message, $key = '' )
     {
-        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+        return ParagonIE_Sodium_Compat::crypto_shorthash( $message, $key );
     }
 }
-if (!is_callable('sodium_crypto_shorthash_keygen')) {
+if ( ! is_callable( 'sodium_crypto_shorthash_keygen' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_shorthash_keygen()
      * @return string
@@ -1012,7 +1012,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_shorthash_keygen();
     }
 }
-if (!is_callable('sodium_crypto_sign')) {
+if ( ! is_callable( 'sodium_crypto_sign' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign()
      * @param string $message
@@ -1021,12 +1021,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign($message, $sk)
+    function sodium_crypto_sign( $message, $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+        return ParagonIE_Sodium_Compat::crypto_sign( $message, $sk );
     }
 }
-if (!is_callable('sodium_crypto_sign_detached')) {
+if ( ! is_callable( 'sodium_crypto_sign_detached' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_detached()
      * @param string $message
@@ -1035,12 +1035,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_detached($message, $sk)
+    function sodium_crypto_sign_detached( $message, $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+        return ParagonIE_Sodium_Compat::crypto_sign_detached( $message, $sk );
     }
 }
-if (!is_callable('sodium_crypto_sign_keypair_from_secretkey_and_publickey')) {
+if ( ! is_callable( 'sodium_crypto_sign_keypair_from_secretkey_and_publickey' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_keypair_from_secretkey_and_publickey()
      * @param string $sk
@@ -1049,12 +1049,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_keypair_from_secretkey_and_publickey($sk, $pk)
+    function sodium_crypto_sign_keypair_from_secretkey_and_publickey( $sk, $pk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_keypair_from_secretkey_and_publickey($sk, $pk);
+        return ParagonIE_Sodium_Compat::crypto_sign_keypair_from_secretkey_and_publickey( $sk, $pk );
     }
 }
-if (!is_callable('sodium_crypto_sign_keypair')) {
+if ( ! is_callable( 'sodium_crypto_sign_keypair' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_keypair()
      * @return string
@@ -1066,25 +1066,25 @@ 
         return ParagonIE_Sodium_Compat::crypto_sign_keypair();
     }
 }
-if (!is_callable('sodium_crypto_sign_open')) {
+if ( ! is_callable( 'sodium_crypto_sign_open' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_open()
      * @param string $signedMessage
      * @param string $pk
      * @return string|bool
      */
-    function sodium_crypto_sign_open($signedMessage, $pk)
+    function sodium_crypto_sign_open( $signedMessage, $pk )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_sign_open( $signedMessage, $pk );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_sign_publickey')) {
+if ( ! is_callable( 'sodium_crypto_sign_publickey' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_publickey()
      * @param string $keypair
@@ -1092,12 +1092,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_publickey($keypair)
+    function sodium_crypto_sign_publickey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey( $keypair );
     }
 }
-if (!is_callable('sodium_crypto_sign_publickey_from_secretkey')) {
+if ( ! is_callable( 'sodium_crypto_sign_publickey_from_secretkey' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey()
      * @param string $sk
@@ -1105,12 +1105,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_publickey_from_secretkey($sk)
+    function sodium_crypto_sign_publickey_from_secretkey( $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey( $sk );
     }
 }
-if (!is_callable('sodium_crypto_sign_secretkey')) {
+if ( ! is_callable( 'sodium_crypto_sign_secretkey' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_secretkey()
      * @param string $keypair
@@ -1118,12 +1118,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_secretkey($keypair)
+    function sodium_crypto_sign_secretkey( $keypair )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+        return ParagonIE_Sodium_Compat::crypto_sign_secretkey( $keypair );
     }
 }
-if (!is_callable('sodium_crypto_sign_seed_keypair')) {
+if ( ! is_callable( 'sodium_crypto_sign_seed_keypair' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_seed_keypair()
      * @param string $seed
@@ -1131,12 +1131,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_seed_keypair($seed)
+    function sodium_crypto_sign_seed_keypair( $seed )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair( $seed );
     }
 }
-if (!is_callable('sodium_crypto_sign_verify_detached')) {
+if ( ! is_callable( 'sodium_crypto_sign_verify_detached' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_verify_detached()
      * @param string $signature
@@ -1146,12 +1146,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_verify_detached($signature, $message, $pk)
+    function sodium_crypto_sign_verify_detached( $signature, $message, $pk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
+        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached( $signature, $message, $pk );
     }
 }
-if (!is_callable('sodium_crypto_sign_ed25519_pk_to_curve25519')) {
+if ( ! is_callable( 'sodium_crypto_sign_ed25519_pk_to_curve25519' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519()
      * @param string $pk
@@ -1159,12 +1159,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_ed25519_pk_to_curve25519($pk)
+    function sodium_crypto_sign_ed25519_pk_to_curve25519( $pk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519($pk);
+        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519( $pk );
     }
 }
-if (!is_callable('sodium_crypto_sign_ed25519_sk_to_curve25519')) {
+if ( ! is_callable( 'sodium_crypto_sign_ed25519_sk_to_curve25519' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519()
      * @param string $sk
@@ -1172,12 +1172,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_ed25519_sk_to_curve25519($sk)
+    function sodium_crypto_sign_ed25519_sk_to_curve25519( $sk )
     {
-        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
+        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519( $sk );
     }
 }
-if (!is_callable('sodium_crypto_stream')) {
+if ( ! is_callable( 'sodium_crypto_stream' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_stream()
      * @param int $len
@@ -1187,12 +1187,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_stream($len, $nonce, $key)
+    function sodium_crypto_stream( $len, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_stream( $len, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_stream_keygen')) {
+if ( ! is_callable( 'sodium_crypto_stream_keygen' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_stream_keygen()
      * @return string
@@ -1203,7 +1203,7 @@ 
         return ParagonIE_Sodium_Compat::crypto_stream_keygen();
     }
 }
-if (!is_callable('sodium_crypto_stream_xor')) {
+if ( ! is_callable( 'sodium_crypto_stream_xor' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_stream_xor()
      * @param string $message
@@ -1213,13 +1213,13 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_stream_xor($message, $nonce, $key)
+    function sodium_crypto_stream_xor( $message, $nonce, $key )
     {
-        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_stream_xor( $message, $nonce, $key );
     }
 }
-require_once dirname(__FILE__) . '/stream-xchacha20.php';
-if (!is_callable('sodium_hex2bin')) {
+require_once dirname( __FILE__ ) . '/stream-xchacha20.php';
+if ( ! is_callable( 'sodium_hex2bin' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::hex2bin()
      * @param string $string
@@ -1227,12 +1227,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_hex2bin($string)
+    function sodium_hex2bin( $string )
     {
-        return ParagonIE_Sodium_Compat::hex2bin($string);
+        return ParagonIE_Sodium_Compat::hex2bin( $string );
     }
 }
-if (!is_callable('sodium_increment')) {
+if ( ! is_callable( 'sodium_increment' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::increment()
      * @param string $string
@@ -1240,12 +1240,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_increment(&$string)
+    function sodium_increment( &$string )
     {
-        ParagonIE_Sodium_Compat::increment($string);
+        ParagonIE_Sodium_Compat::increment( $string );
     }
 }
-if (!is_callable('sodium_library_version_major')) {
+if ( ! is_callable( 'sodium_library_version_major' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::library_version_major()
      * @return int
@@ -1255,7 +1255,7 @@ 
         return ParagonIE_Sodium_Compat::library_version_major();
     }
 }
-if (!is_callable('sodium_library_version_minor')) {
+if ( ! is_callable( 'sodium_library_version_minor' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::library_version_minor()
      * @return int
@@ -1265,7 +1265,7 @@ 
         return ParagonIE_Sodium_Compat::library_version_minor();
     }
 }
-if (!is_callable('sodium_version_string')) {
+if ( ! is_callable( 'sodium_version_string' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::version_string()
      * @return string
@@ -1275,7 +1275,7 @@ 
         return ParagonIE_Sodium_Compat::version_string();
     }
 }
-if (!is_callable('sodium_memcmp')) {
+if ( ! is_callable( 'sodium_memcmp' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::memcmp()
      * @param string $a
@@ -1284,12 +1284,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_memcmp($a, $b)
+    function sodium_memcmp( $a, $b )
     {
-        return ParagonIE_Sodium_Compat::memcmp($a, $b);
+        return ParagonIE_Sodium_Compat::memcmp( $a, $b );
     }
 }
-if (!is_callable('sodium_memzero')) {
+if ( ! is_callable( 'sodium_memzero' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::memzero()
      * @param string $str
@@ -1297,12 +1297,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_memzero(&$str)
+    function sodium_memzero( &$str )
     {
-        ParagonIE_Sodium_Compat::memzero($str);
+        ParagonIE_Sodium_Compat::memzero( $str );
     }
 }
-if (!is_callable('sodium_pad')) {
+if ( ! is_callable( 'sodium_pad' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::pad()
      * @param string $unpadded
@@ -1311,12 +1311,12 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_pad($unpadded, $blockSize)
+    function sodium_pad( $unpadded, $blockSize )
     {
-        return ParagonIE_Sodium_Compat::pad($unpadded, $blockSize, true);
+        return ParagonIE_Sodium_Compat::pad( $unpadded, $blockSize, true );
     }
 }
-if (!is_callable('sodium_unpad')) {
+if ( ! is_callable( 'sodium_unpad' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::pad()
      * @param string $padded
@@ -1325,38 +1325,38 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_unpad($padded, $blockSize)
+    function sodium_unpad( $padded, $blockSize )
     {
-        return ParagonIE_Sodium_Compat::unpad($padded, $blockSize, true);
+        return ParagonIE_Sodium_Compat::unpad( $padded, $blockSize, true );
     }
 }
-if (!is_callable('sodium_randombytes_buf')) {
+if ( ! is_callable( 'sodium_randombytes_buf' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::randombytes_buf()
      * @param int $amount
      * @return string
      * @throws Exception
      */
-    function sodium_randombytes_buf($amount)
+    function sodium_randombytes_buf( $amount )
     {
-        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+        return ParagonIE_Sodium_Compat::randombytes_buf( $amount );
     }
 }
 
-if (!is_callable('sodium_randombytes_uniform')) {
+if ( ! is_callable( 'sodium_randombytes_uniform' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::randombytes_uniform()
      * @param int $upperLimit
      * @return int
      * @throws Exception
      */
-    function sodium_randombytes_uniform($upperLimit)
+    function sodium_randombytes_uniform( $upperLimit )
     {
-        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+        return ParagonIE_Sodium_Compat::randombytes_uniform( $upperLimit );
     }
 }
 
-if (!is_callable('sodium_randombytes_random16')) {
+if ( ! is_callable( 'sodium_randombytes_random16' ) ) {
     /**
      * @see ParagonIE_Sodium_Compat::randombytes_random16()
      * @return int

vendor/paragonie/sodium_compat/autoload-pedantic.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
 require_once 'autoload.php';
-define('DO_PEDANTIC_TEST', true);
+define( 'DO_PEDANTIC_TEST', true );
 
 ParagonIE_Sodium_Compat::$fastMult = true;

vendor/paragonie/sodium_compat/autoload.php

Spacing +27 added lines, -27 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if (PHP_VERSION_ID < 70000) {
-    if (!is_callable('sodiumCompatAutoloader')) {
+if ( PHP_VERSION_ID < 70000 ) {
+    if ( ! is_callable( 'sodiumCompatAutoloader' ) ) {
         /**
          * Sodium_Compat autoloader.
          *
@@ -9,25 +9,25 @@ 
          *
          * @return bool         Stop autoloading?
          */
-        function sodiumCompatAutoloader($class)
+        function sodiumCompatAutoloader( $class )
         {
             $namespace = 'ParagonIE_Sodium_';
             // Does the class use the namespace prefix?
-            $len = strlen($namespace);
-            if (strncmp($namespace, $class, $len) !== 0) {
+            $len = strlen( $namespace );
+            if ( strncmp( $namespace, $class, $len ) !== 0 ) {
                 // no, move to the next registered autoloader
                 return false;
             }
 
             // Get the relative class name
-            $relative_class = substr($class, $len);
+            $relative_class = substr( $class, $len );
 
             // Replace the namespace prefix with the base directory, replace namespace
             // separators with directory separators in the relative class name, append
             // with .php
-            $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
+            $file = dirname( __FILE__ ) . '/src/' . str_replace( '_', '/', $relative_class ) . '.php';
             // if the file exists, require it
-            if (file_exists($file)) {
+            if ( file_exists( $file ) ) {
                 require_once $file;
                 return true;
             }
@@ -35,38 +35,38 @@ 
         }
 
         // Now that we have an autoloader, let's register it!
-        spl_autoload_register('sodiumCompatAutoloader');
+        spl_autoload_register( 'sodiumCompatAutoloader' );
     }
 } else {
-    require_once dirname(__FILE__) . '/autoload-php7.php';
+    require_once dirname( __FILE__ ) . '/autoload-php7.php';
 }
 
 /* Explicitly, always load the Compat class: */
-require_once dirname(__FILE__) . '/src/Compat.php';
+require_once dirname( __FILE__ ) . '/src/Compat.php';
 
-if (!class_exists('SodiumException', false)) {
-    require_once dirname(__FILE__) . '/src/SodiumException.php';
+if ( ! class_exists( 'SodiumException', false ) ) {
+    require_once dirname( __FILE__ ) . '/src/SodiumException.php';
 }
-if (PHP_VERSION_ID >= 50300) {
+if ( PHP_VERSION_ID >= 50300 ) {
     // Namespaces didn't exist before 5.3.0, so don't even try to use this
     // unless PHP >= 5.3.0
-    require_once dirname(__FILE__) . '/lib/namespaced.php';
-    require_once dirname(__FILE__) . '/lib/sodium_compat.php';
+    require_once dirname( __FILE__ ) . '/lib/namespaced.php';
+    require_once dirname( __FILE__ ) . '/lib/sodium_compat.php';
 } else {
-    require_once dirname(__FILE__) . '/src/PHP52/SplFixedArray.php';
+    require_once dirname( __FILE__ ) . '/src/PHP52/SplFixedArray.php';
 }
-if (PHP_VERSION_ID < 70200 || !extension_loaded('sodium')) {
-    if (PHP_VERSION_ID >= 50300 && !defined('SODIUM_CRYPTO_SCALARMULT_BYTES')) {
-        require_once dirname(__FILE__) . '/lib/php72compat_const.php';
+if ( PHP_VERSION_ID < 70200 || ! extension_loaded( 'sodium' ) ) {
+    if ( PHP_VERSION_ID >= 50300 && ! defined( 'SODIUM_CRYPTO_SCALARMULT_BYTES' ) ) {
+        require_once dirname( __FILE__ ) . '/lib/php72compat_const.php';
     }
-    if (PHP_VERSION_ID >= 70000) {
-        assert(class_exists('ParagonIE_Sodium_Compat'), 'Possible filesystem/autoloader bug?');
+    if ( PHP_VERSION_ID >= 70000 ) {
+        assert( class_exists( 'ParagonIE_Sodium_Compat' ), 'Possible filesystem/autoloader bug?' );
     } else {
-        assert(class_exists('ParagonIE_Sodium_Compat'));
+        assert( class_exists( 'ParagonIE_Sodium_Compat' ) );
     }
-    require_once(dirname(__FILE__) . '/lib/php72compat.php');
-} elseif (!function_exists('sodium_crypto_stream_xchacha20_xor')) {
+    require_once( dirname( __FILE__ ) . '/lib/php72compat.php' );
+} elseif ( ! function_exists( 'sodium_crypto_stream_xchacha20_xor' ) ) {
     // Older versions of {PHP, ext/sodium} will not define these
-    require_once(dirname(__FILE__) . '/lib/php72compat.php');
+    require_once( dirname( __FILE__ ) . '/lib/php72compat.php' );
 }
-require_once(dirname(__FILE__) . '/lib/ristretto255.php');
+require_once( dirname( __FILE__ ) . '/lib/ristretto255.php' );

vendor/paragonie/sodium_compat/autoload-php7.php

Spacing +7 added lines, -7 removed lines

@@ -2,28 +2,28 @@
 /*
  This file should only ever be loaded on PHP 7+
  */
-if (PHP_VERSION_ID < 70000) {
+if ( PHP_VERSION_ID < 70000 ) {
     return;
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register( function( $class ) {
     $namespace = 'ParagonIE_Sodium_';
     // Does the class use the namespace prefix?
-    $len = strlen($namespace);
-    if (strncmp($namespace, $class, $len) !== 0) {
+    $len = strlen( $namespace );
+    if ( strncmp( $namespace, $class, $len ) !== 0 ) {
         // no, move to the next registered autoloader
         return false;
     }
 
     // Get the relative class name
-    $relative_class = substr($class, $len);
+    $relative_class = substr( $class, $len );
 
     // Replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
+    $file = dirname( __FILE__ ) . '/src/' . str_replace( '_', '/', $relative_class ) . '.php';
     // if the file exists, require it
-    if (file_exists($file)) {
+    if ( file_exists( $file ) ) {
         require_once $file;
         return true;
     }

vendor/paragonie/sodium_compat/autoload-phpunit.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@
 <?php
 
-require_once (dirname(__FILE__) . '/vendor/autoload.php');
+require_once ( dirname( __FILE__ ) . '/vendor/autoload.php' );
 
-if (PHP_VERSION_ID >= 50300) {
-    require_once (dirname(__FILE__) . '/tests/phpunit-shim.php');
+if ( PHP_VERSION_ID >= 50300 ) {
+    require_once ( dirname( __FILE__ ) . '/tests/phpunit-shim.php' );
 }
-require_once (dirname(__FILE__) . '/autoload.php');
+require_once ( dirname( __FILE__ ) . '/autoload.php' );

vendor/paragonie/sodium_compat/src/Crypto.php

Spacing +290 added lines, -290 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Crypto', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Crypto', false ) ) {
     return;
 }
 
@@ -75,13 +75,13 @@ 
         $key = ''
     ) {
         /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core_Util::strlen( $message );
 
         /** @var int  $clen - Length of ciphertext */
         $clen = $len - self::aead_chacha20poly1305_ABYTES;
 
         /** @var int $adlen - Length of associated data */
-        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core_Util::strlen( $ad );
 
         /** @var string $mac - Message authentication code */
         $mac = ParagonIE_Sodium_Core_Util::substr(
@@ -91,7 +91,7 @@ 
         );
 
         /** @var string $ciphertext - The encrypted message (sans MAC) */
-        $ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 0, $clen);
+        $ciphertext = ParagonIE_Sodium_Core_Util::substr( $message, 0, $clen );
 
         /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
@@ -101,21 +101,21 @@ 
         );
 
         /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( SodiumException $ex ) {
             $block0 = null;
         }
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
+        $state->update( $ad );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $adlen ) );
+        $state->update( $ciphertext );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $clen ) );
         $computed_mac = $state->finish();
 
         /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core_Util::verify_16($computed_mac, $mac)) {
-            throw new SodiumException('Invalid MAC');
+        if ( ! ParagonIE_Sodium_Core_Util::verify_16( $computed_mac, $mac ) ) {
+            throw new SodiumException( 'Invalid MAC' );
         }
 
         // Here, we know that the MAC is valid, so we decrypt and return the plaintext
@@ -123,7 +123,7 @@ 
             $ciphertext,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core_Util::store64_le(1)
+            ParagonIE_Sodium_Core_Util::store64_le( 1 )
         );
     }
 
@@ -147,10 +147,10 @@ 
         $key = ''
     ) {
         /** @var int $len - Length of the plaintext message */
-        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core_Util::strlen( $message );
 
         /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core_Util::strlen( $ad );
 
         /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
@@ -158,10 +158,10 @@ 
             $nonce,
             $key
         );
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( SodiumException $ex ) {
             $block0 = null;
         }
 
@@ -170,13 +170,13 @@ 
             $message,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core_Util::store64_le(1)
+            ParagonIE_Sodium_Core_Util::store64_le( 1 )
         );
 
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($len));
+        $state->update( $ad );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $adlen ) );
+        $state->update( $ciphertext );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $len ) );
         return $ciphertext . $state->finish();
     }
 
@@ -200,10 +200,10 @@ 
         $key = ''
     ) {
         /** @var int $adlen - Length of associated data */
-        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core_Util::strlen( $ad );
 
         /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core_Util::strlen( $message );
 
         /** @var int  $clen - Length of ciphertext */
         $clen = $len - self::aead_chacha20poly1305_IETF_ABYTES;
@@ -230,23 +230,23 @@ 
         );
 
         /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( SodiumException $ex ) {
             $block0 = null;
         }
-        $state->update($ad);
-        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
-        $state->update($ciphertext);
-        $state->update(str_repeat("\x00", (0x10 - $clen) & 0xf));
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
+        $state->update( $ad );
+        $state->update( str_repeat( "\x00", ( ( 0x10 - $adlen ) & 0xf ) ) );
+        $state->update( $ciphertext );
+        $state->update( str_repeat( "\x00", ( 0x10 - $clen ) & 0xf ) );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $adlen ) );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $clen ) );
         $computed_mac = $state->finish();
 
         /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core_Util::verify_16($computed_mac, $mac)) {
-            throw new SodiumException('Invalid MAC');
+        if ( ! ParagonIE_Sodium_Core_Util::verify_16( $computed_mac, $mac ) ) {
+            throw new SodiumException( 'Invalid MAC' );
         }
 
         // Here, we know that the MAC is valid, so we decrypt and return the plaintext
@@ -254,7 +254,7 @@ 
             $ciphertext,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core_Util::store64_le(1)
+            ParagonIE_Sodium_Core_Util::store64_le( 1 )
         );
     }
 
@@ -278,10 +278,10 @@ 
         $key = ''
     ) {
         /** @var int $len - Length of the plaintext message */
-        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+        $len = ParagonIE_Sodium_Core_Util::strlen( $message );
 
         /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+        $adlen = ParagonIE_Sodium_Core_Util::strlen( $ad );
 
         /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::ietfStream(
@@ -289,10 +289,10 @@ 
             $nonce,
             $key
         );
-        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        $state = new ParagonIE_Sodium_Core_Poly1305_State( $block0 );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+        } catch ( SodiumException $ex ) {
             $block0 = null;
         }
 
@@ -301,15 +301,15 @@ 
             $message,
             $nonce,
             $key,
-            ParagonIE_Sodium_Core_Util::store64_le(1)
+            ParagonIE_Sodium_Core_Util::store64_le( 1 )
         );
 
-        $state->update($ad);
-        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
-        $state->update($ciphertext);
-        $state->update(str_repeat("\x00", ((0x10 - $len) & 0xf)));
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core_Util::store64_le($len));
+        $state->update( $ad );
+        $state->update( str_repeat( "\x00", ( ( 0x10 - $adlen ) & 0xf ) ) );
+        $state->update( $ciphertext );
+        $state->update( str_repeat( "\x00", ( ( 0x10 - $len ) & 0xf ) ) );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $adlen ) );
+        $state->update( ParagonIE_Sodium_Core_Util::store64_le( $len ) );
         return $ciphertext . $state->finish();
     }
 
@@ -333,13 +333,13 @@ 
         $key = ''
     ) {
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 0, 16 ),
             $key
         );
         $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 );
 
-        return self::aead_chacha20poly1305_ietf_decrypt($message, $ad, $nonceLast, $subkey);
+        return self::aead_chacha20poly1305_ietf_decrypt( $message, $ad, $nonceLast, $subkey );
     }
 
     /**
@@ -362,13 +362,13 @@ 
         $key = ''
     ) {
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 0, 16 ),
             $key
         );
         $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 );
 
-        return self::aead_chacha20poly1305_ietf_encrypt($message, $ad, $nonceLast, $subkey);
+        return self::aead_chacha20poly1305_ietf_encrypt( $message, $ad, $nonceLast, $subkey );
     }
 
     /**
@@ -381,10 +381,10 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function auth($message, $key)
+    public static function auth( $message, $key )
     {
         return ParagonIE_Sodium_Core_Util::substr(
-            hash_hmac('sha512', $message, $key, true),
+            hash_hmac( 'sha512', $message, $key, true ),
             0,
             32
         );
@@ -402,11 +402,11 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function auth_verify($mac, $message, $key)
+    public static function auth_verify( $mac, $message, $key )
     {
         return ParagonIE_Sodium_Core_Util::hashEquals(
             $mac,
-            self::auth($message, $key)
+            self::auth( $message, $key )
         );
     }
 
@@ -422,14 +422,14 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box($plaintext, $nonce, $keypair)
+    public static function box( $plaintext, $nonce, $keypair )
     {
         $c = self::secretbox(
             $plaintext,
             $nonce,
             self::box_beforenm(
-                self::box_secretkey($keypair),
-                self::box_publickey($keypair)
+                self::box_secretkey( $keypair ),
+                self::box_publickey( $keypair )
             )
         );
         return $c;
@@ -446,16 +446,16 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seal($message, $publicKey)
+    public static function box_seal( $message, $publicKey )
     {
         /** @var string $ephemeralKeypair */
         $ephemeralKeypair = self::box_keypair();
 
         /** @var string $ephemeralSK */
-        $ephemeralSK = self::box_secretkey($ephemeralKeypair);
+        $ephemeralSK = self::box_secretkey( $ephemeralKeypair );
 
         /** @var string $ephemeralPK */
-        $ephemeralPK = self::box_publickey($ephemeralKeypair);
+        $ephemeralPK = self::box_publickey( $ephemeralKeypair );
 
         /** @var string $nonce */
         $nonce = self::generichash(
@@ -465,15 +465,15 @@ 
         );
 
         /** @var string $keypair - The combined keypair used in crypto_box() */
-        $keypair = self::box_keypair_from_secretkey_and_publickey($ephemeralSK, $publicKey);
+        $keypair = self::box_keypair_from_secretkey_and_publickey( $ephemeralSK, $publicKey );
 
         /** @var string $ciphertext Ciphertext + MAC from crypto_box */
-        $ciphertext = self::box($message, $nonce, $keypair);
+        $ciphertext = self::box( $message, $nonce, $keypair );
         try {
-            ParagonIE_Sodium_Compat::memzero($ephemeralKeypair);
-            ParagonIE_Sodium_Compat::memzero($ephemeralSK);
-            ParagonIE_Sodium_Compat::memzero($nonce);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $ephemeralKeypair );
+            ParagonIE_Sodium_Compat::memzero( $ephemeralSK );
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+        } catch ( SodiumException $ex ) {
             $ephemeralKeypair = null;
             $ephemeralSK = null;
             $nonce = null;
@@ -492,19 +492,19 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seal_open($message, $keypair)
+    public static function box_seal_open( $message, $keypair )
     {
         /** @var string $ephemeralPK */
-        $ephemeralPK = ParagonIE_Sodium_Core_Util::substr($message, 0, 32);
+        $ephemeralPK = ParagonIE_Sodium_Core_Util::substr( $message, 0, 32 );
 
         /** @var string $ciphertext (ciphertext + MAC) */
-        $ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 32);
+        $ciphertext = ParagonIE_Sodium_Core_Util::substr( $message, 32 );
 
         /** @var string $secretKey */
-        $secretKey = self::box_secretkey($keypair);
+        $secretKey = self::box_secretkey( $keypair );
 
         /** @var string $publicKey */
-        $publicKey = self::box_publickey($keypair);
+        $publicKey = self::box_publickey( $keypair );
 
         /** @var string $nonce */
         $nonce = self::generichash(
@@ -514,15 +514,15 @@ 
         );
 
         /** @var string $keypair */
-        $keypair = self::box_keypair_from_secretkey_and_publickey($secretKey, $ephemeralPK);
+        $keypair = self::box_keypair_from_secretkey_and_publickey( $secretKey, $ephemeralPK );
 
         /** @var string $m */
-        $m = self::box_open($ciphertext, $nonce, $keypair);
+        $m = self::box_open( $ciphertext, $nonce, $keypair );
         try {
-            ParagonIE_Sodium_Compat::memzero($secretKey);
-            ParagonIE_Sodium_Compat::memzero($ephemeralPK);
-            ParagonIE_Sodium_Compat::memzero($nonce);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $secretKey );
+            ParagonIE_Sodium_Compat::memzero( $ephemeralPK );
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+        } catch ( SodiumException $ex ) {
             $secretKey = null;
             $ephemeralPK = null;
             $nonce = null;
@@ -541,11 +541,11 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_beforenm($sk, $pk)
+    public static function box_beforenm( $sk, $pk )
     {
         return ParagonIE_Sodium_Core_HSalsa20::hsalsa20(
-            str_repeat("\x00", 16),
-            self::scalarmult($sk, $pk)
+            str_repeat( "\x00", 16 ),
+            self::scalarmult( $sk, $pk )
         );
     }
 
@@ -559,8 +559,8 @@ 
      */
     public static function box_keypair()
     {
-        $sKey = random_bytes(32);
-        $pKey = self::scalarmult_base($sKey);
+        $sKey = random_bytes( 32 );
+        $pKey = self::scalarmult_base( $sKey );
         return $sKey . $pKey;
     }
 
@@ -570,14 +570,14 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seed_keypair($seed)
+    public static function box_seed_keypair( $seed )
     {
         $sKey = ParagonIE_Sodium_Core_Util::substr(
-            hash('sha512', $seed, true),
+            hash( 'sha512', $seed, true ),
             0,
             32
         );
-        $pKey = self::scalarmult_base($sKey);
+        $pKey = self::scalarmult_base( $sKey );
         return $sKey . $pKey;
     }
 
@@ -589,10 +589,10 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
+    public static function box_keypair_from_secretkey_and_publickey( $sKey, $pKey )
     {
-        return ParagonIE_Sodium_Core_Util::substr($sKey, 0, 32) .
-            ParagonIE_Sodium_Core_Util::substr($pKey, 0, 32);
+        return ParagonIE_Sodium_Core_Util::substr( $sKey, 0, 32 ) .
+            ParagonIE_Sodium_Core_Util::substr( $pKey, 0, 32 );
     }
 
     /**
@@ -603,14 +603,14 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function box_secretkey($keypair)
+    public static function box_secretkey( $keypair )
     {
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== 64) {
+        if ( ParagonIE_Sodium_Core_Util::strlen( $keypair ) !== 64 ) {
             throw new RangeException(
                 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
             );
         }
-        return ParagonIE_Sodium_Core_Util::substr($keypair, 0, 32);
+        return ParagonIE_Sodium_Core_Util::substr( $keypair, 0, 32 );
     }
 
     /**
@@ -621,14 +621,14 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function box_publickey($keypair)
+    public static function box_publickey( $keypair )
     {
-        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+        if ( ParagonIE_Sodium_Core_Util::strlen( $keypair ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES ) {
             throw new RangeException(
                 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
             );
         }
-        return ParagonIE_Sodium_Core_Util::substr($keypair, 32, 32);
+        return ParagonIE_Sodium_Core_Util::substr( $keypair, 32, 32 );
     }
 
     /**
@@ -640,14 +640,14 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_publickey_from_secretkey($sKey)
+    public static function box_publickey_from_secretkey( $sKey )
     {
-        if (ParagonIE_Sodium_Core_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
+        if ( ParagonIE_Sodium_Core_Util::strlen( $sKey ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES ) {
             throw new RangeException(
                 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.'
             );
         }
-        return self::scalarmult_base($sKey);
+        return self::scalarmult_base( $sKey );
     }
 
     /**
@@ -662,14 +662,14 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_open($ciphertext, $nonce, $keypair)
+    public static function box_open( $ciphertext, $nonce, $keypair )
     {
         return self::secretbox_open(
             $ciphertext,
             $nonce,
             self::box_beforenm(
-                self::box_secretkey($keypair),
-                self::box_publickey($keypair)
+                self::box_secretkey( $keypair ),
+                self::box_publickey( $keypair )
             )
         );
     }
@@ -687,34 +687,34 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash($message, $key = '', $outlen = 32)
+    public static function generichash( $message, $key = '', $outlen = 32 )
     {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
         $k = null;
-        if (!empty($key)) {
+        if ( ! empty( $key ) ) {
             /** @var SplFixedArray $k */
-            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
+            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $key );
+            if ( $k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES ) {
+                throw new RangeException( 'Invalid key size' );
             }
         }
 
         /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
+        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $message );
 
         /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outlen);
-        ParagonIE_Sodium_Core_BLAKE2b::update($ctx, $in, $in->count());
+        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init( $k, $outlen );
+        ParagonIE_Sodium_Core_BLAKE2b::update( $ctx, $in, $in->count() );
 
         /** @var SplFixedArray $out */
-        $out = new SplFixedArray($outlen);
-        $out = ParagonIE_Sodium_Core_BLAKE2b::finish($ctx, $out);
+        $out = new SplFixedArray( $outlen );
+        $out = ParagonIE_Sodium_Core_BLAKE2b::finish( $ctx, $out );
 
         /** @var array<int, int> */
         $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core_Util::intArrayToString($outArray);
+        return ParagonIE_Sodium_Core_Util::intArrayToString( $outArray );
     }
 
     /**
@@ -728,22 +728,22 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash_final($ctx, $outlen = 32)
+    public static function generichash_final( $ctx, $outlen = 32 )
     {
-        if (!is_string($ctx)) {
-            throw new TypeError('Context must be a string');
+        if ( ! is_string( $ctx ) ) {
+            throw new TypeError( 'Context must be a string' );
         }
-        $out = new SplFixedArray($outlen);
+        $out = new SplFixedArray( $outlen );
 
         /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
+        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext( $ctx );
 
         /** @var SplFixedArray $out */
-        $out = ParagonIE_Sodium_Core_BLAKE2b::finish($context, $out);
+        $out = ParagonIE_Sodium_Core_BLAKE2b::finish( $context, $out );
 
         /** @var array<int, int> */
         $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core_Util::intArrayToString($outArray);
+        return ParagonIE_Sodium_Core_Util::intArrayToString( $outArray );
     }
 
     /**
@@ -758,23 +758,23 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash_init($key = '', $outputLength = 32)
+    public static function generichash_init( $key = '', $outputLength = 32 )
     {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
         $k = null;
-        if (!empty($key)) {
-            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
+        if ( ! empty( $key ) ) {
+            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $key );
+            if ( $k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES ) {
+                throw new RangeException( 'Invalid key size' );
             }
         }
 
         /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outputLength);
+        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init( $k, $outputLength );
 
-        return ParagonIE_Sodium_Core_BLAKE2b::contextToString($ctx);
+        return ParagonIE_Sodium_Core_BLAKE2b::contextToString( $ctx );
     }
 
     /**
@@ -801,27 +801,27 @@ 
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
         $k = null;
-        if (!empty($key)) {
-            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
+        if ( ! empty( $key ) ) {
+            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $key );
+            if ( $k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES ) {
+                throw new RangeException( 'Invalid key size' );
             }
         }
-        if (!empty($salt)) {
-            $s = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($salt);
+        if ( ! empty( $salt ) ) {
+            $s = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $salt );
         } else {
             $s = null;
         }
-        if (!empty($salt)) {
-            $p = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($personal);
+        if ( ! empty( $salt ) ) {
+            $p = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $personal );
         } else {
             $p = null;
         }
 
         /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outputLength, $s, $p);
+        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init( $k, $outputLength, $s, $p );
 
-        return ParagonIE_Sodium_Core_BLAKE2b::contextToString($ctx);
+        return ParagonIE_Sodium_Core_BLAKE2b::contextToString( $ctx );
     }
 
     /**
@@ -835,20 +835,20 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash_update($ctx, $message)
+    public static function generichash_update( $ctx, $message )
     {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
         /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
+        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext( $ctx );
 
         /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
+        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray( $message );
 
-        ParagonIE_Sodium_Core_BLAKE2b::update($context, $in, $in->count());
+        ParagonIE_Sodium_Core_BLAKE2b::update( $context, $in, $in->count() );
 
-        return ParagonIE_Sodium_Core_BLAKE2b::contextToString($context);
+        return ParagonIE_Sodium_Core_BLAKE2b::contextToString( $context );
     }
 
     /**
@@ -864,10 +864,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
+    public static function keyExchange( $my_sk, $their_pk, $client_pk, $server_pk )
     {
         return ParagonIE_Sodium_Compat::crypto_generichash(
-            ParagonIE_Sodium_Compat::crypto_scalarmult($my_sk, $their_pk) .
+            ParagonIE_Sodium_Compat::crypto_scalarmult( $my_sk, $their_pk ) .
             $client_pk .
             $server_pk
         );
@@ -885,10 +885,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function scalarmult($sKey, $pKey)
+    public static function scalarmult( $sKey, $pKey )
     {
-        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
-        self::scalarmult_throw_if_zero($q);
+        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10( $sKey, $pKey );
+        self::scalarmult_throw_if_zero( $q );
         return $q;
     }
 
@@ -902,10 +902,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function scalarmult_base($secret)
+    public static function scalarmult_base( $secret )
     {
-        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
-        self::scalarmult_throw_if_zero($q);
+        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10_base( $secret );
+        self::scalarmult_throw_if_zero( $q );
         return $q;
     }
 
@@ -917,16 +917,16 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function scalarmult_throw_if_zero($q)
+    protected static function scalarmult_throw_if_zero( $q )
     {
         $d = 0;
-        for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
-            $d |= ParagonIE_Sodium_Core_Util::chrToInt($q[$i]);
+        for ( $i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i ) {
+            $d |= ParagonIE_Sodium_Core_Util::chrToInt( $q[ $i ] );
         }
 
         /* branch-free variant of === 0 */
-        if (-(1 & (($d - 1) >> 8))) {
-            throw new SodiumException('Zero public key is not allowed');
+        if (-( 1 & ( ( $d - 1 ) >> 8 ) )) {
+            throw new SodiumException( 'Zero public key is not allowed' );
         }
     }
 
@@ -942,26 +942,26 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox($plaintext, $nonce, $key)
+    public static function secretbox( $plaintext, $nonce, $key )
     {
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
+        $block0 = str_repeat( "\x00", 32 );
 
         /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
+        $mlen = ParagonIE_Sodium_Core_Util::strlen( $plaintext );
         $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+        if ( $mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES ) {
             $mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
         }
-        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+        $block0 .= ParagonIE_Sodium_Core_Util::substr( $plaintext, 0, $mlen0 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
             $block0,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
 
@@ -970,13 +970,13 @@ 
             $block0,
             self::secretbox_xsalsa20poly1305_ZEROBYTES
         );
-        if ($mlen > $mlen0) {
+        if ( $mlen > $mlen0 ) {
             $c .= ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
                 ParagonIE_Sodium_Core_Util::substr(
                     $plaintext,
                     self::secretbox_xsalsa20poly1305_ZEROBYTES
                 ),
-                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
                 1,
                 $subkey
             );
@@ -989,18 +989,18 @@ 
             )
         );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+            ParagonIE_Sodium_Compat::memzero( $subkey );
+        } catch ( SodiumException $ex ) {
             $block0 = null;
             $subkey = null;
         }
 
-        $state->update($c);
+        $state->update( $c );
 
         /** @var string $c - MAC || ciphertext */
         $c = $state->finish() . $c;
-        unset($state);
+        unset( $state );
 
         return $c;
     }
@@ -1017,7 +1017,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox_open($ciphertext, $nonce, $key)
+    public static function secretbox_open( $ciphertext, $nonce, $key )
     {
         /** @var string $mac */
         $mac = ParagonIE_Sodium_Core_Util::substr(
@@ -1033,46 +1033,46 @@ 
         );
 
         /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core_Util::strlen($c);
+        $clen = ParagonIE_Sodium_Core_Util::strlen( $c );
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
             64,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
         $verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
             $mac,
             $c,
-            ParagonIE_Sodium_Core_Util::substr($block0, 0, 32)
+            ParagonIE_Sodium_Core_Util::substr( $block0, 0, 32 )
         );
-        if (!$verified) {
+        if ( ! $verified ) {
             try {
-                ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (SodiumException $ex) {
+                ParagonIE_Sodium_Compat::memzero( $subkey );
+            } catch ( SodiumException $ex ) {
                 $subkey = null;
             }
-            throw new SodiumException('Invalid MAC');
+            throw new SodiumException( 'Invalid MAC' );
         }
 
         /** @var string $m - Decrypted message */
         $m = ParagonIE_Sodium_Core_Util::xorStrings(
-            ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core_Util::substr($c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES)
+            ParagonIE_Sodium_Core_Util::substr( $block0, self::secretbox_xsalsa20poly1305_ZEROBYTES ),
+            ParagonIE_Sodium_Core_Util::substr( $c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES )
         );
-        if ($clen > self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+        if ( $clen > self::secretbox_xsalsa20poly1305_ZEROBYTES ) {
             // We had more than 1 block, so let's continue to decrypt the rest.
             $m .= ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
                 ParagonIE_Sodium_Core_Util::substr(
                     $c,
                     self::secretbox_xsalsa20poly1305_ZEROBYTES
                 ),
-                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
                 1,
-                (string) $subkey
+                (string)$subkey
             );
         }
         return $m;
@@ -1090,25 +1090,25 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
+    public static function secretbox_xchacha20poly1305( $plaintext, $nonce, $key )
     {
         /** @var string $subkey */
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 0, 16 ),
             $key
         );
-        $nonceLast = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+        $nonceLast = ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 );
 
         /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
+        $block0 = str_repeat( "\x00", 32 );
 
         /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
+        $mlen = ParagonIE_Sodium_Core_Util::strlen( $plaintext );
         $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
+        if ( $mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES ) {
             $mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
         }
-        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+        $block0 .= ParagonIE_Sodium_Core_Util::substr( $plaintext, 0, $mlen0 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
@@ -1122,7 +1122,7 @@ 
             $block0,
             self::secretbox_xchacha20poly1305_ZEROBYTES
         );
-        if ($mlen > $mlen0) {
+        if ( $mlen > $mlen0 ) {
             $c .= ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
                 ParagonIE_Sodium_Core_Util::substr(
                     $plaintext,
@@ -1130,7 +1130,7 @@ 
                 ),
                 $nonceLast,
                 $subkey,
-                ParagonIE_Sodium_Core_Util::store64_le(1)
+                ParagonIE_Sodium_Core_Util::store64_le( 1 )
             );
         }
         $state = new ParagonIE_Sodium_Core_Poly1305_State(
@@ -1141,18 +1141,18 @@ 
             )
         );
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+            ParagonIE_Sodium_Compat::memzero( $subkey );
+        } catch ( SodiumException $ex ) {
             $block0 = null;
             $subkey = null;
         }
 
-        $state->update($c);
+        $state->update( $c );
 
         /** @var string $c - MAC || ciphertext */
         $c = $state->finish() . $c;
-        unset($state);
+        unset( $state );
 
         return $c;
     }
@@ -1169,7 +1169,7 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
+    public static function secretbox_xchacha20poly1305_open( $ciphertext, $nonce, $key )
     {
         /** @var string $mac */
         $mac = ParagonIE_Sodium_Core_Util::substr(
@@ -1185,48 +1185,48 @@ 
         );
 
         /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core_Util::strlen($c);
+        $clen = ParagonIE_Sodium_Core_Util::strlen( $c );
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HChaCha20::hchacha20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hchacha20( $nonce, $key );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
             64,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
         $verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
             $mac,
             $c,
-            ParagonIE_Sodium_Core_Util::substr($block0, 0, 32)
+            ParagonIE_Sodium_Core_Util::substr( $block0, 0, 32 )
         );
 
-        if (!$verified) {
+        if ( ! $verified ) {
             try {
-                ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (SodiumException $ex) {
+                ParagonIE_Sodium_Compat::memzero( $subkey );
+            } catch ( SodiumException $ex ) {
                 $subkey = null;
             }
-            throw new SodiumException('Invalid MAC');
+            throw new SodiumException( 'Invalid MAC' );
         }
 
         /** @var string $m - Decrypted message */
         $m = ParagonIE_Sodium_Core_Util::xorStrings(
-            ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core_Util::substr($c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES)
+            ParagonIE_Sodium_Core_Util::substr( $block0, self::secretbox_xchacha20poly1305_ZEROBYTES ),
+            ParagonIE_Sodium_Core_Util::substr( $c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES )
         );
 
-        if ($clen > self::secretbox_xchacha20poly1305_ZEROBYTES) {
+        if ( $clen > self::secretbox_xchacha20poly1305_ZEROBYTES ) {
             // We had more than 1 block, so let's continue to decrypt the rest.
             $m .= ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
                 ParagonIE_Sodium_Core_Util::substr(
                     $c,
                     self::secretbox_xchacha20poly1305_ZEROBYTES
                 ),
-                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
-                (string) $subkey,
-                ParagonIE_Sodium_Core_Util::store64_le(1)
+                ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
+                (string)$subkey,
+                ParagonIE_Sodium_Core_Util::store64_le( 1 )
             );
         }
         return $m;
@@ -1238,16 +1238,16 @@ 
      * @throws Exception
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_init_push($key)
+    public static function secretstream_xchacha20poly1305_init_push( $key )
     {
         # randombytes_buf(out, crypto_secretstream_xchacha20poly1305_HEADERBYTES);
-        $out = random_bytes(24);
+        $out = random_bytes( 24 );
 
         # crypto_core_hchacha20(state->k, out, k, NULL);
-        $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20($out, $key);
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20( $out, $key );
         $state = new ParagonIE_Sodium_Core_SecretStream_State(
             $subkey,
-            ParagonIE_Sodium_Core_Util::substr($out, 16, 8) . str_repeat("\0", 4)
+            ParagonIE_Sodium_Core_Util::substr( $out, 16, 8 ) . str_repeat( "\0", 4 )
         );
 
         # _crypto_secretstream_xchacha20poly1305_counter_reset(state);
@@ -1268,16 +1268,16 @@ 
      * @return string Returns a state.
      * @throws Exception
      */
-    public static function secretstream_xchacha20poly1305_init_pull($key, $header)
+    public static function secretstream_xchacha20poly1305_init_pull( $key, $header )
     {
         # crypto_core_hchacha20(state->k, in, k, NULL);
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core_Util::substr($header, 0, 16),
+            ParagonIE_Sodium_Core_Util::substr( $header, 0, 16 ),
             $key
         );
         $state = new ParagonIE_Sodium_Core_SecretStream_State(
             $subkey,
-            ParagonIE_Sodium_Core_Util::substr($header, 16)
+            ParagonIE_Sodium_Core_Util::substr( $header, 16 )
         );
         $state->counterReset();
         # memcpy(STATE_INONCE(state), in + crypto_core_hchacha20_INPUTBYTES,
@@ -1295,19 +1295,19 @@ 
      * @return string
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0)
+    public static function secretstream_xchacha20poly1305_push( &$state, $msg, $aad = '', $tag = 0 )
     {
-        $st = ParagonIE_Sodium_Core_SecretStream_State::fromString($state);
+        $st = ParagonIE_Sodium_Core_SecretStream_State::fromString( $state );
         # crypto_onetimeauth_poly1305_state poly1305_state;
         # unsigned char                     block[64U];
         # unsigned char                     slen[8U];
         # unsigned char                    *c;
         # unsigned char                    *mac;
 
-        $msglen = ParagonIE_Sodium_Core_Util::strlen($msg);
-        $aadlen = ParagonIE_Sodium_Core_Util::strlen($aad);
+        $msglen = ParagonIE_Sodium_Core_Util::strlen( $msg );
+        $aadlen = ParagonIE_Sodium_Core_Util::strlen( $aad );
 
-        if ((($msglen + 63) >> 6) > 0xfffffffe) {
+        if ( ( ( $msglen + 63 ) >> 6 ) > 0xfffffffe ) {
             throw new SodiumException(
                 'message cannot be larger than SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_MESSAGEBYTES_MAX bytes'
             );
@@ -1324,62 +1324,62 @@ 
         # crypto_onetimeauth_poly1305_init(&poly1305_state, block);
         # sodium_memzero(block, sizeof block);
         $auth = new ParagonIE_Sodium_Core_Poly1305_State(
-            ParagonIE_Sodium_Core_ChaCha20::ietfStream(32, $st->getCombinedNonce(), $st->getKey())
+            ParagonIE_Sodium_Core_ChaCha20::ietfStream( 32, $st->getCombinedNonce(), $st->getKey() )
         );
 
         # crypto_onetimeauth_poly1305_update(&poly1305_state, ad, adlen);
-        $auth->update($aad);
+        $auth->update( $aad );
 
         # crypto_onetimeauth_poly1305_update(&poly1305_state, _pad0,
         #     (0x10 - adlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - $aadlen) & 0xf)));
+        $auth->update( str_repeat( "\0", ( ( 0x10 - $aadlen ) & 0xf ) ) );
 
         # memset(block, 0, sizeof block);
         # block[0] = tag;
         # crypto_stream_chacha20_ietf_xor_ic(block, block, sizeof block,
         #                                    state->nonce, 1U, state->k);
         $block = ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
-            ParagonIE_Sodium_Core_Util::intToChr($tag) . str_repeat("\0", 63),
+            ParagonIE_Sodium_Core_Util::intToChr( $tag ) . str_repeat( "\0", 63 ),
             $st->getCombinedNonce(),
             $st->getKey(),
-            ParagonIE_Sodium_Core_Util::store64_le(1)
+            ParagonIE_Sodium_Core_Util::store64_le( 1 )
         );
 
         # crypto_onetimeauth_poly1305_update(&poly1305_state, block, sizeof block);
-        $auth->update($block);
+        $auth->update( $block );
 
         # out[0] = block[0];
-        $out = $block[0];
+        $out = $block[ 0 ];
         # c = out + (sizeof tag);
         # crypto_stream_chacha20_ietf_xor_ic(c, m, mlen, state->nonce, 2U, state->k);
         $cipher = ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
             $msg,
             $st->getCombinedNonce(),
             $st->getKey(),
-            ParagonIE_Sodium_Core_Util::store64_le(2)
+            ParagonIE_Sodium_Core_Util::store64_le( 2 )
         );
 
         # crypto_onetimeauth_poly1305_update(&poly1305_state, c, mlen);
-        $auth->update($cipher);
+        $auth->update( $cipher );
 
         $out .= $cipher;
-        unset($cipher);
+        unset( $cipher );
 
         # crypto_onetimeauth_poly1305_update
         # (&poly1305_state, _pad0, (0x10 - (sizeof block) + mlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - 64 + $msglen) & 0xf)));
+        $auth->update( str_repeat( "\0", ( ( 0x10 - 64 + $msglen ) & 0xf ) ) );
 
         # STORE64_LE(slen, (uint64_t) adlen);
-        $slen = ParagonIE_Sodium_Core_Util::store64_le($aadlen);
+        $slen = ParagonIE_Sodium_Core_Util::store64_le( $aadlen );
 
         # crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $auth->update($slen);
+        $auth->update( $slen );
 
         # STORE64_LE(slen, (sizeof block) + mlen);
-        $slen = ParagonIE_Sodium_Core_Util::store64_le(64 + $msglen);
+        $slen = ParagonIE_Sodium_Core_Util::store64_le( 64 + $msglen );
 
         # crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $auth->update($slen);
+        $auth->update( $slen );
 
         # mac = c + mlen;
         # crypto_onetimeauth_poly1305_final(&poly1305_state, mac);
@@ -1387,12 +1387,12 @@ 
         $out .= $mac;
 
         # sodium_memzero(&poly1305_state, sizeof poly1305_state);
-        unset($auth);
+        unset( $auth );
 
 
         # XOR_BUF(STATE_INONCE(state), mac,
         #     crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-        $st->xorNonce($mac);
+        $st->xorNonce( $mac );
 
         # sodium_increment(STATE_COUNTER(state),
         #     crypto_secretstream_xchacha20poly1305_COUNTERBYTES);
@@ -1401,15 +1401,15 @@ 
         $state = $st->toString();
 
         /** @var bool $rekey */
-        $rekey = ($tag & ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY) !== 0;
+        $rekey = ( $tag & ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY ) !== 0;
         # if ((tag & crypto_secretstream_xchacha20poly1305_TAG_REKEY) != 0 ||
         #     sodium_is_zero(STATE_COUNTER(state),
         #         crypto_secretstream_xchacha20poly1305_COUNTERBYTES)) {
         #     crypto_secretstream_xchacha20poly1305_rekey(state);
         # }
-        if ($rekey || $st->needsRekey()) {
+        if ( $rekey || $st->needsRekey() ) {
             // DO REKEY
-            self::secretstream_xchacha20poly1305_rekey($state);
+            self::secretstream_xchacha20poly1305_rekey( $state );
         }
         # if (outlen_p != NULL) {
         #     *outlen_p = crypto_secretstream_xchacha20poly1305_ABYTES + mlen;
@@ -1424,19 +1424,19 @@ 
      * @return bool|array{0: string, 1: int}
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_pull(&$state, $cipher, $aad = '')
+    public static function secretstream_xchacha20poly1305_pull( &$state, $cipher, $aad = '' )
     {
-        $st = ParagonIE_Sodium_Core_SecretStream_State::fromString($state);
+        $st = ParagonIE_Sodium_Core_SecretStream_State::fromString( $state );
 
-        $cipherlen = ParagonIE_Sodium_Core_Util::strlen($cipher);
+        $cipherlen = ParagonIE_Sodium_Core_Util::strlen( $cipher );
         #     mlen = inlen - crypto_secretstream_xchacha20poly1305_ABYTES;
         $msglen = $cipherlen - ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES;
-        $aadlen = ParagonIE_Sodium_Core_Util::strlen($aad);
+        $aadlen = ParagonIE_Sodium_Core_Util::strlen( $aad );
 
         #     if (mlen > crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX) {
         #         sodium_misuse();
         #     }
-        if ((($msglen + 63) >> 6) > 0xfffffffe) {
+        if ( ( ( $msglen + 63 ) >> 6 ) > 0xfffffffe ) {
             throw new SodiumException(
                 'message cannot be larger than SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_MESSAGEBYTES_MAX bytes'
             );
@@ -1446,15 +1446,15 @@ 
         #     crypto_onetimeauth_poly1305_init(&poly1305_state, block);
         #     sodium_memzero(block, sizeof block);
         $auth = new ParagonIE_Sodium_Core_Poly1305_State(
-            ParagonIE_Sodium_Core_ChaCha20::ietfStream(32, $st->getCombinedNonce(), $st->getKey())
+            ParagonIE_Sodium_Core_ChaCha20::ietfStream( 32, $st->getCombinedNonce(), $st->getKey() )
         );
 
         #     crypto_onetimeauth_poly1305_update(&poly1305_state, ad, adlen);
-        $auth->update($aad);
+        $auth->update( $aad );
 
         #     crypto_onetimeauth_poly1305_update(&poly1305_state, _pad0,
         #         (0x10 - adlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - $aadlen) & 0xf)));
+        $auth->update( str_repeat( "\0", ( ( 0x10 - $aadlen ) & 0xf ) ) );
 
 
         #     memset(block, 0, sizeof block);
@@ -1462,36 +1462,36 @@ 
         #     crypto_stream_chacha20_ietf_xor_ic(block, block, sizeof block,
         #                                        state->nonce, 1U, state->k);
         $block = ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
-            $cipher[0] . str_repeat("\0", 63),
+            $cipher[ 0 ] . str_repeat( "\0", 63 ),
             $st->getCombinedNonce(),
             $st->getKey(),
-            ParagonIE_Sodium_Core_Util::store64_le(1)
+            ParagonIE_Sodium_Core_Util::store64_le( 1 )
         );
         #     tag = block[0];
         #     block[0] = in[0];
         #     crypto_onetimeauth_poly1305_update(&poly1305_state, block, sizeof block);
-        $tag = ParagonIE_Sodium_Core_Util::chrToInt($block[0]);
-        $block[0] = $cipher[0];
-        $auth->update($block);
+        $tag = ParagonIE_Sodium_Core_Util::chrToInt( $block[ 0 ] );
+        $block[ 0 ] = $cipher[ 0 ];
+        $auth->update( $block );
 
 
         #     c = in + (sizeof tag);
         #     crypto_onetimeauth_poly1305_update(&poly1305_state, c, mlen);
-        $auth->update(ParagonIE_Sodium_Core_Util::substr($cipher, 1, $msglen));
+        $auth->update( ParagonIE_Sodium_Core_Util::substr( $cipher, 1, $msglen ) );
 
         #     crypto_onetimeauth_poly1305_update
         #     (&poly1305_state, _pad0, (0x10 - (sizeof block) + mlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - 64 + $msglen) & 0xf)));
+        $auth->update( str_repeat( "\0", ( ( 0x10 - 64 + $msglen ) & 0xf ) ) );
 
         #     STORE64_LE(slen, (uint64_t) adlen);
         #     crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $slen = ParagonIE_Sodium_Core_Util::store64_le($aadlen);
-        $auth->update($slen);
+        $slen = ParagonIE_Sodium_Core_Util::store64_le( $aadlen );
+        $auth->update( $slen );
 
         #     STORE64_LE(slen, (sizeof block) + mlen);
         #     crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $slen = ParagonIE_Sodium_Core_Util::store64_le(64 + $msglen);
-        $auth->update($slen);
+        $slen = ParagonIE_Sodium_Core_Util::store64_le( 64 + $msglen );
+        $auth->update( $slen );
 
         #     crypto_onetimeauth_poly1305_final(&poly1305_state, mac);
         #     sodium_memzero(&poly1305_state, sizeof poly1305_state);
@@ -1503,22 +1503,22 @@ 
         #         return -1;
         #     }
 
-        $stored = ParagonIE_Sodium_Core_Util::substr($cipher, $msglen + 1, 16);
-        if (!ParagonIE_Sodium_Core_Util::hashEquals($mac, $stored)) {
+        $stored = ParagonIE_Sodium_Core_Util::substr( $cipher, $msglen + 1, 16 );
+        if ( ! ParagonIE_Sodium_Core_Util::hashEquals( $mac, $stored ) ) {
             return false;
         }
 
         #     crypto_stream_chacha20_ietf_xor_ic(m, c, mlen, state->nonce, 2U, state->k);
         $out = ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
-            ParagonIE_Sodium_Core_Util::substr($cipher, 1, $msglen),
+            ParagonIE_Sodium_Core_Util::substr( $cipher, 1, $msglen ),
             $st->getCombinedNonce(),
             $st->getKey(),
-            ParagonIE_Sodium_Core_Util::store64_le(2)
+            ParagonIE_Sodium_Core_Util::store64_le( 2 )
         );
 
         #     XOR_BUF(STATE_INONCE(state), mac,
         #         crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-        $st->xorNonce($mac);
+        $st->xorNonce( $mac );
 
         #     sodium_increment(STATE_COUNTER(state),
         #         crypto_secretstream_xchacha20poly1305_COUNTERBYTES);
@@ -1534,12 +1534,12 @@ 
         $state = $st->toString();
 
         /** @var bool $rekey */
-        $rekey = ($tag & ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY) !== 0;
-        if ($rekey || $st->needsRekey()) {
+        $rekey = ( $tag & ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY ) !== 0;
+        if ( $rekey || $st->needsRekey() ) {
             // DO REKEY
-            self::secretstream_xchacha20poly1305_rekey($state);
+            self::secretstream_xchacha20poly1305_rekey( $state );
         }
-        return array($out, $tag);
+        return array( $out, $tag );
     }
 
     /**
@@ -1547,9 +1547,9 @@ 
      * @return void
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_rekey(&$state)
+    public static function secretstream_xchacha20poly1305_rekey( &$state )
     {
-        $st = ParagonIE_Sodium_Core_SecretStream_State::fromString($state);
+        $st = ParagonIE_Sodium_Core_SecretStream_State::fromString( $state );
         # unsigned char new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES +
         # crypto_secretstream_xchacha20poly1305_INONCEBYTES];
         # size_t        i;
@@ -1562,18 +1562,18 @@ 
         #     new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i] =
         #         STATE_INONCE(state)[i];
         # }
-        $new_key_and_inonce .= ParagonIE_Sodium_Core_Util::substR($st->getNonce(), 0, 8);
+        $new_key_and_inonce .= ParagonIE_Sodium_Core_Util::substR( $st->getNonce(), 0, 8 );
 
         # crypto_stream_chacha20_ietf_xor(new_key_and_inonce, new_key_and_inonce,
         #                                 sizeof new_key_and_inonce,
         #                                 state->nonce, state->k);
 
-        $st->rekey(ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
+        $st->rekey( ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
             $new_key_and_inonce,
             $st->getCombinedNonce(),
             $st->getKey(),
-            ParagonIE_Sodium_Core_Util::store64_le(0)
-        ));
+            ParagonIE_Sodium_Core_Util::store64_le( 0 )
+        ) );
 
         # for (i = 0U; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) {
         #     state->k[i] = new_key_and_inonce[i];
@@ -1599,9 +1599,9 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_detached($message, $sk)
+    public static function sign_detached( $message, $sk )
     {
-        return ParagonIE_Sodium_Core_Ed25519::sign_detached($message, $sk);
+        return ParagonIE_Sodium_Core_Ed25519::sign_detached( $message, $sk );
     }
 
     /**
@@ -1615,9 +1615,9 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign($message, $sk)
+    public static function sign( $message, $sk )
     {
-        return ParagonIE_Sodium_Core_Ed25519::sign($message, $sk);
+        return ParagonIE_Sodium_Core_Ed25519::sign( $message, $sk );
     }
 
     /**
@@ -1631,9 +1631,9 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_open($signedMessage, $pk)
+    public static function sign_open( $signedMessage, $pk )
     {
-        return ParagonIE_Sodium_Core_Ed25519::sign_open($signedMessage, $pk);
+        return ParagonIE_Sodium_Core_Ed25519::sign_open( $signedMessage, $pk );
     }
 
     /**
@@ -1648,8 +1648,8 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_verify_detached($signature, $message, $pk)
+    public static function sign_verify_detached( $signature, $message, $pk )
     {
-        return ParagonIE_Sodium_Core_Ed25519::verify_detached($signature, $message, $pk);
+        return ParagonIE_Sodium_Core_Ed25519::verify_detached( $signature, $message, $pk );
     }
 }

vendor/paragonie/sodium_compat/src/File.php

Spacing +513 added lines, -513 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_File', false)) {
+if ( class_exists( 'ParagonIE_Sodium_File', false ) ) {
     return;
 }
 /**
@@ -25,52 +25,52 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box($inputFile, $outputFile, $nonce, $keyPair)
+    public static function box( $inputFile, $outputFile, $nonce, $keyPair )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given.' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        if ( ! is_string( $nonce ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $nonce ) . ' given.' );
         }
 
         /* Input validation: */
-        if (!is_string($keyPair)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($keyPair) . ' given.');
+        if ( ! is_string( $keyPair ) ) {
+            throw new TypeError( 'Argument 4 must be a string, ' . gettype( $keyPair ) . ' given.' );
         }
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_BOX_NONCEBYTES bytes');
+        if ( self::strlen( $nonce ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES ) {
+            throw new TypeError( 'Argument 3 must be CRYPTO_BOX_NONCEBYTES bytes' );
         }
-        if (self::strlen($keyPair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        if ( self::strlen( $keyPair ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new SodiumException('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new SodiumException( 'Could not open output file for writing' );
         }
 
-        $res = self::box_encrypt($ifp, $ofp, $size, $nonce, $keyPair);
-        fclose($ifp);
-        fclose($ofp);
+        $res = self::box_encrypt( $ifp, $ofp, $size, $nonce, $keyPair );
+        fclose( $ifp );
+        fclose( $ofp );
         return $res;
     }
 
@@ -91,58 +91,58 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_open($inputFile, $outputFile, $nonce, $keypair)
+    public static function box_open( $inputFile, $outputFile, $nonce, $keypair )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given.' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        if ( ! is_string( $nonce ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $nonce ) . ' given.' );
         }
-        if (!is_string($keypair)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($keypair) . ' given.');
+        if ( ! is_string( $keypair ) ) {
+            throw new TypeError( 'Argument 4 must be a string, ' . gettype( $keypair ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_BOX_NONCEBYTES bytes');
+        if ( self::strlen( $nonce ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_BOX_NONCEBYTES bytes' );
         }
-        if (self::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        if ( self::strlen( $keypair ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new SodiumException('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new SodiumException( 'Could not open output file for writing' );
         }
 
-        $res = self::box_decrypt($ifp, $ofp, $size, $nonce, $keypair);
-        fclose($ifp);
-        fclose($ofp);
+        $res = self::box_decrypt( $ifp, $ofp, $size, $nonce, $keypair );
+        fclose( $ifp );
+        fclose( $ofp );
         try {
-            ParagonIE_Sodium_Compat::memzero($nonce);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (SodiumException $ex) {
-            if (isset($ephKeypair)) {
-                unset($ephKeypair);
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+            ParagonIE_Sodium_Compat::memzero( $ephKeypair );
+        } catch ( SodiumException $ex ) {
+            if ( isset( $ephKeypair ) ) {
+                unset( $ephKeypair );
             }
         }
         return $res;
@@ -161,41 +161,41 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seal($inputFile, $outputFile, $publicKey)
+    public static function box_seal( $inputFile, $outputFile, $publicKey )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given.' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($publicKey)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+        if ( ! is_string( $publicKey ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $publicKey ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES bytes');
+        if ( self::strlen( $publicKey ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            throw new TypeError( 'Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new SodiumException('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new SodiumException( 'Could not open output file for writing' );
         }
 
         /** @var string $ephKeypair */
@@ -203,12 +203,12 @@ 
 
         /** @var string $msgKeypair */
         $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
-            ParagonIE_Sodium_Compat::crypto_box_secretkey($ephKeypair),
+            ParagonIE_Sodium_Compat::crypto_box_secretkey( $ephKeypair ),
             $publicKey
         );
 
         /** @var string $ephemeralPK */
-        $ephemeralPK = ParagonIE_Sodium_Compat::crypto_box_publickey($ephKeypair);
+        $ephemeralPK = ParagonIE_Sodium_Compat::crypto_box_publickey( $ephKeypair );
 
         /** @var string $nonce */
         $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
@@ -223,28 +223,28 @@ 
             $ephemeralPK,
             ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES
         );
-        if (!is_int($firstWrite)) {
-            fclose($ifp);
-            fclose($ofp);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-            throw new SodiumException('Could not write to output file');
-        }
-        if ($firstWrite !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-            fclose($ifp);
-            fclose($ofp);
-            throw new SodiumException('Error writing public key to output file');
-        }
-
-        $res = self::box_encrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
-        fclose($ifp);
-        fclose($ofp);
+        if ( ! is_int( $firstWrite ) ) {
+            fclose( $ifp );
+            fclose( $ofp );
+            ParagonIE_Sodium_Compat::memzero( $ephKeypair );
+            throw new SodiumException( 'Could not write to output file' );
+        }
+        if ( $firstWrite !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            ParagonIE_Sodium_Compat::memzero( $ephKeypair );
+            fclose( $ifp );
+            fclose( $ofp );
+            throw new SodiumException( 'Error writing public key to output file' );
+        }
+
+        $res = self::box_encrypt( $ifp, $ofp, $size, $nonce, $msgKeypair );
+        fclose( $ifp );
+        fclose( $ofp );
         try {
-            ParagonIE_Sodium_Compat::memzero($nonce);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+            ParagonIE_Sodium_Compat::memzero( $ephKeypair );
+        } catch ( SodiumException $ex ) {
             /** @psalm-suppress PossiblyUndefinedVariable */
-            unset($ephKeypair);
+            unset( $ephKeypair );
         }
         return $res;
     }
@@ -265,53 +265,53 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seal_open($inputFile, $outputFile, $ecdhKeypair)
+    public static function box_seal_open( $inputFile, $outputFile, $ecdhKeypair )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given.' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($ecdhKeypair)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($ecdhKeypair) . ' given.');
+        if ( ! is_string( $ecdhKeypair ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $ecdhKeypair ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($ecdhKeypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        if ( self::strlen( $ecdhKeypair ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES ) {
+            throw new TypeError( 'Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES bytes' );
         }
 
-        $publicKey = ParagonIE_Sodium_Compat::crypto_box_publickey($ecdhKeypair);
+        $publicKey = ParagonIE_Sodium_Compat::crypto_box_publickey( $ecdhKeypair );
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new SodiumException('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new SodiumException( 'Could not open output file for writing' );
         }
 
-        $ephemeralPK = fread($ifp, ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES);
-        if (!is_string($ephemeralPK)) {
-            throw new SodiumException('Could not read input file');
+        $ephemeralPK = fread( $ifp, ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES );
+        if ( ! is_string( $ephemeralPK ) ) {
+            throw new SodiumException( 'Could not read input file' );
         }
-        if (self::strlen($ephemeralPK) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
-            fclose($ifp);
-            fclose($ofp);
-            throw new SodiumException('Could not read public key from sealed file');
+        if ( self::strlen( $ephemeralPK ) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES ) {
+            fclose( $ifp );
+            fclose( $ofp );
+            throw new SodiumException( 'Could not read public key from sealed file' );
         }
 
         $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
@@ -320,19 +320,19 @@ 
             24
         );
         $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
-            ParagonIE_Sodium_Compat::crypto_box_secretkey($ecdhKeypair),
+            ParagonIE_Sodium_Compat::crypto_box_secretkey( $ecdhKeypair ),
             $ephemeralPK
         );
 
-        $res = self::box_decrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
-        fclose($ifp);
-        fclose($ofp);
+        $res = self::box_decrypt( $ifp, $ofp, $size, $nonce, $msgKeypair );
+        fclose( $ifp );
+        fclose( $ofp );
         try {
-            ParagonIE_Sodium_Compat::memzero($nonce);
-            ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (SodiumException $ex) {
-            if (isset($ephKeypair)) {
-                unset($ephKeypair);
+            ParagonIE_Sodium_Compat::memzero( $nonce );
+            ParagonIE_Sodium_Compat::memzero( $ephKeypair );
+        } catch ( SodiumException $ex ) {
+            if ( isset( $ephKeypair ) ) {
+                unset( $ephKeypair );
             }
         }
         return $res;
@@ -350,68 +350,68 @@ 
      * @throws TypeError
      * @psalm-suppress FailedTypeResolution
      */
-    public static function generichash($filePath, $key = '', $outputLength = 32)
+    public static function generichash( $filePath, $key = '', $outputLength = 32 )
     {
         /* Type checks: */
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
+        if ( ! is_string( $filePath ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $filePath ) . ' given.' );
         }
-        if (!is_string($key)) {
-            if (is_null($key)) {
+        if ( ! is_string( $key ) ) {
+            if ( is_null( $key ) ) {
                 $key = '';
             } else {
-                throw new TypeError('Argument 2 must be a string, ' . gettype($key) . ' given.');
+                throw new TypeError( 'Argument 2 must be a string, ' . gettype( $key ) . ' given.' );
             }
         }
-        if (!is_int($outputLength)) {
-            if (!is_numeric($outputLength)) {
-                throw new TypeError('Argument 3 must be an integer, ' . gettype($outputLength) . ' given.');
+        if ( ! is_int( $outputLength ) ) {
+            if ( ! is_numeric( $outputLength ) ) {
+                throw new TypeError( 'Argument 3 must be an integer, ' . gettype( $outputLength ) . ' given.' );
             }
-            $outputLength = (int) $outputLength;
+            $outputLength = (int)$outputLength;
         }
 
         /* Input validation: */
-        if (!empty($key)) {
-            if (self::strlen($key) < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
-                throw new TypeError('Argument 2 must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes');
+        if ( ! empty( $key ) ) {
+            if ( self::strlen( $key ) < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN ) {
+                throw new TypeError( 'Argument 2 must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes' );
             }
-            if (self::strlen($key) > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
-                throw new TypeError('Argument 2 must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes');
+            if ( self::strlen( $key ) > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX ) {
+                throw new TypeError( 'Argument 2 must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes' );
             }
         }
-        if ($outputLength < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN) {
-            throw new SodiumException('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MIN');
+        if ( $outputLength < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN ) {
+            throw new SodiumException( 'Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MIN' );
         }
-        if ($outputLength > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX) {
-            throw new SodiumException('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MAX');
+        if ( $outputLength > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX ) {
+            throw new SodiumException( 'Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MAX' );
         }
 
         /** @var int $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $filePath );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
 
         /** @var resource $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $fp = fopen( $filePath, 'rb' );
+        if ( ! is_resource( $fp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
-        $ctx = ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outputLength);
-        while ($size > 0) {
+        $ctx = ParagonIE_Sodium_Compat::crypto_generichash_init( $key, $outputLength );
+        while ( $size > 0 ) {
             $blockSize = $size > 64
                 ? 64
                 : $size;
-            $read = fread($fp, $blockSize);
-            if (!is_string($read)) {
-                throw new SodiumException('Could not read input file');
+            $read = fread( $fp, $blockSize );
+            if ( ! is_string( $read ) ) {
+                throw new SodiumException( 'Could not read input file' );
             }
-            ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $read);
+            ParagonIE_Sodium_Compat::crypto_generichash_update( $ctx, $read );
             $size -= $blockSize;
         }
 
-        fclose($fp);
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+        fclose( $fp );
+        return ParagonIE_Sodium_Compat::crypto_generichash_final( $ctx, $outputLength );
     }
 
     /**
@@ -428,52 +428,52 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox($inputFile, $outputFile, $nonce, $key)
+    public static function secretbox( $inputFile, $outputFile, $nonce, $key )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given..');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given..' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        if ( ! is_string( $nonce ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $nonce ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
+        if ( self::strlen( $nonce ) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES ) {
+            throw new TypeError( 'Argument 3 must be CRYPTO_SECRETBOX_NONCEBYTES bytes' );
         }
-        if (!is_string($key)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        if ( ! is_string( $key ) ) {
+            throw new TypeError( 'Argument 4 must be a string, ' . gettype( $key ) . ' given.' );
         }
-        if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_KEYBYTES bytes');
+        if ( self::strlen( $key ) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_SECRETBOX_KEYBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new SodiumException('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new SodiumException( 'Could not open output file for writing' );
         }
 
-        $res = self::secretbox_encrypt($ifp, $ofp, $size, $nonce, $key);
-        fclose($ifp);
-        fclose($ofp);
+        $res = self::secretbox_encrypt( $ifp, $ofp, $size, $nonce, $key );
+        fclose( $ifp );
+        fclose( $ofp );
         return $res;
     }
     /**
@@ -493,57 +493,57 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox_open($inputFile, $outputFile, $nonce, $key)
+    public static function secretbox_open( $inputFile, $outputFile, $nonce, $key )
     {
         /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        if ( ! is_string( $inputFile ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $inputFile ) . ' given.' );
         }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        if ( ! is_string( $outputFile ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $outputFile ) . ' given.' );
         }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        if ( ! is_string( $nonce ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $nonce ) . ' given.' );
         }
-        if (!is_string($key)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        if ( ! is_string( $key ) ) {
+            throw new TypeError( 'Argument 4 must be a string, ' . gettype( $key ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
+        if ( self::strlen( $nonce ) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_SECRETBOX_NONCEBYTES bytes' );
         }
-        if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOXBOX_KEYBYTES bytes');
+        if ( self::strlen( $key ) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES ) {
+            throw new TypeError( 'Argument 4 must be CRYPTO_SECRETBOXBOX_KEYBYTES bytes' );
         }
 
         /** @var int $size */
-        $size = filesize($inputFile);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $inputFile );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
 
         /** @var resource $ifp */
-        $ifp = fopen($inputFile, 'rb');
-        if (!is_resource($ifp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $ifp = fopen( $inputFile, 'rb' );
+        if ( ! is_resource( $ifp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
 
         /** @var resource $ofp */
-        $ofp = fopen($outputFile, 'wb');
-        if (!is_resource($ofp)) {
-            fclose($ifp);
-            throw new SodiumException('Could not open output file for writing');
+        $ofp = fopen( $outputFile, 'wb' );
+        if ( ! is_resource( $ofp ) ) {
+            fclose( $ifp );
+            throw new SodiumException( 'Could not open output file for writing' );
         }
 
-        $res = self::secretbox_decrypt($ifp, $ofp, $size, $nonce, $key);
-        fclose($ifp);
-        fclose($ofp);
+        $res = self::secretbox_decrypt( $ifp, $ofp, $size, $nonce, $key );
+        fclose( $ifp );
+        fclose( $ofp );
         try {
-            ParagonIE_Sodium_Compat::memzero($key);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $key );
+        } catch ( SodiumException $ex ) {
             /** @psalm-suppress PossiblyUndefinedVariable */
-            unset($key);
+            unset( $key );
         }
         return $res;
     }
@@ -560,85 +560,85 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign($filePath, $secretKey)
+    public static function sign( $filePath, $secretKey )
     {
         /* Type checks: */
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
+        if ( ! is_string( $filePath ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $filePath ) . ' given.' );
         }
-        if (!is_string($secretKey)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($secretKey) . ' given.');
+        if ( ! is_string( $secretKey ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $secretKey ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($secretKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES) {
-            throw new TypeError('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES bytes');
+        if ( self::strlen( $secretKey ) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES ) {
+            throw new TypeError( 'Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES bytes' );
         }
-        if (PHP_INT_SIZE === 4) {
-            return self::sign_core32($filePath, $secretKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return self::sign_core32( $filePath, $secretKey );
         }
 
         /** @var int $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $filePath );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
 
         /** @var resource $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $fp = fopen( $filePath, 'rb' );
+        if ( ! is_resource( $fp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
 
         /** @var string $az */
-        $az = hash('sha512', self::substr($secretKey, 0, 32), true);
+        $az = hash( 'sha512', self::substr( $secretKey, 0, 32 ), true );
 
-        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
-        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+        $az[ 0 ] = self::intToChr( self::chrToInt( $az[ 0 ] ) & 248 );
+        $az[ 31 ] = self::intToChr( ( self::chrToInt( $az[ 31 ] ) & 63 ) | 64 );
 
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($az, 32, 32));
+        $hs = hash_init( 'sha512' );
+        self::hash_update( $hs, self::substr( $az, 32, 32 ) );
         /** @var resource $hs */
-        $hs = self::updateHashWithFile($hs, $fp, $size);
+        $hs = self::updateHashWithFile( $hs, $fp, $size );
 
         /** @var string $nonceHash */
-        $nonceHash = hash_final($hs, true);
+        $nonceHash = hash_final( $hs, true );
 
         /** @var string $pk */
-        $pk = self::substr($secretKey, 32, 32);
+        $pk = self::substr( $secretKey, 32, 32 );
 
         /** @var string $nonce */
-        $nonce = ParagonIE_Sodium_Core_Ed25519::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+        $nonce = ParagonIE_Sodium_Core_Ed25519::sc_reduce( $nonceHash ) . self::substr( $nonceHash, 32 );
 
         /** @var string $sig */
         $sig = ParagonIE_Sodium_Core_Ed25519::ge_p3_tobytes(
-            ParagonIE_Sodium_Core_Ed25519::ge_scalarmult_base($nonce)
+            ParagonIE_Sodium_Core_Ed25519::ge_scalarmult_base( $nonce )
         );
 
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($sig, 0, 32));
-        self::hash_update($hs, self::substr($pk, 0, 32));
+        $hs = hash_init( 'sha512' );
+        self::hash_update( $hs, self::substr( $sig, 0, 32 ) );
+        self::hash_update( $hs, self::substr( $pk, 0, 32 ) );
         /** @var resource $hs */
-        $hs = self::updateHashWithFile($hs, $fp, $size);
+        $hs = self::updateHashWithFile( $hs, $fp, $size );
 
         /** @var string $hramHash */
-        $hramHash = hash_final($hs, true);
+        $hramHash = hash_final( $hs, true );
 
         /** @var string $hram */
-        $hram = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hramHash);
+        $hram = ParagonIE_Sodium_Core_Ed25519::sc_reduce( $hramHash );
 
         /** @var string $sigAfter */
-        $sigAfter = ParagonIE_Sodium_Core_Ed25519::sc_muladd($hram, $az, $nonce);
+        $sigAfter = ParagonIE_Sodium_Core_Ed25519::sc_muladd( $hram, $az, $nonce );
 
         /** @var string $sig */
-        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+        $sig = self::substr( $sig, 0, 32 ) . self::substr( $sigAfter, 0, 32 );
 
         try {
-            ParagonIE_Sodium_Compat::memzero($az);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $az );
+        } catch ( SodiumException $ex ) {
             $az = null;
         }
-        fclose($fp);
+        fclose( $fp );
         return $sig;
     }
 
@@ -656,66 +656,66 @@ 
      * @throws TypeError
      * @throws Exception
      */
-    public static function verify($sig, $filePath, $publicKey)
+    public static function verify( $sig, $filePath, $publicKey )
     {
         /* Type checks: */
-        if (!is_string($sig)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($sig) . ' given.');
+        if ( ! is_string( $sig ) ) {
+            throw new TypeError( 'Argument 1 must be a string, ' . gettype( $sig ) . ' given.' );
         }
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($filePath) . ' given.');
+        if ( ! is_string( $filePath ) ) {
+            throw new TypeError( 'Argument 2 must be a string, ' . gettype( $filePath ) . ' given.' );
         }
-        if (!is_string($publicKey)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+        if ( ! is_string( $publicKey ) ) {
+            throw new TypeError( 'Argument 3 must be a string, ' . gettype( $publicKey ) . ' given.' );
         }
 
         /* Input validation: */
-        if (self::strlen($sig) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES) {
-            throw new TypeError('Argument 1 must be CRYPTO_SIGN_BYTES bytes');
+        if ( self::strlen( $sig ) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES ) {
+            throw new TypeError( 'Argument 1 must be CRYPTO_SIGN_BYTES bytes' );
         }
-        if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES) {
-            throw new TypeError('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES bytes');
+        if ( self::strlen( $publicKey ) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES ) {
+            throw new TypeError( 'Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES bytes' );
         }
-        if (self::strlen($sig) < 64) {
-            throw new SodiumException('Signature is too short');
+        if ( self::strlen( $sig ) < 64 ) {
+            throw new SodiumException( 'Signature is too short' );
         }
 
-        if (PHP_INT_SIZE === 4) {
-            return self::verify_core32($sig, $filePath, $publicKey);
+        if ( PHP_INT_SIZE === 4 ) {
+            return self::verify_core32( $sig, $filePath, $publicKey );
         }
 
         /* Security checks */
         if (
-            (ParagonIE_Sodium_Core_Ed25519::chrToInt($sig[63]) & 240)
+            ( ParagonIE_Sodium_Core_Ed25519::chrToInt( $sig[ 63 ] ) & 240 )
                 &&
-            ParagonIE_Sodium_Core_Ed25519::check_S_lt_L(self::substr($sig, 32, 32))
+            ParagonIE_Sodium_Core_Ed25519::check_S_lt_L( self::substr( $sig, 32, 32 ) )
         ) {
-            throw new SodiumException('S < L - Invalid signature');
+            throw new SodiumException( 'S < L - Invalid signature' );
         }
-        if (ParagonIE_Sodium_Core_Ed25519::small_order($sig)) {
-            throw new SodiumException('Signature is on too small of an order');
+        if ( ParagonIE_Sodium_Core_Ed25519::small_order( $sig ) ) {
+            throw new SodiumException( 'Signature is on too small of an order' );
         }
-        if ((self::chrToInt($sig[63]) & 224) !== 0) {
-            throw new SodiumException('Invalid signature');
+        if ( ( self::chrToInt( $sig[ 63 ] ) & 224 ) !== 0 ) {
+            throw new SodiumException( 'Invalid signature' );
         }
         $d = 0;
-        for ($i = 0; $i < 32; ++$i) {
-            $d |= self::chrToInt($publicKey[$i]);
+        for ( $i = 0; $i < 32; ++$i ) {
+            $d |= self::chrToInt( $publicKey[ $i ] );
         }
-        if ($d === 0) {
-            throw new SodiumException('All zero public key');
+        if ( $d === 0 ) {
+            throw new SodiumException( 'All zero public key' );
         }
 
         /** @var int $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $filePath );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
 
         /** @var resource $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $fp = fopen( $filePath, 'rb' );
+        if ( ! is_resource( $fp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
 
         /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
@@ -725,35 +725,35 @@ 
         ParagonIE_Sodium_Compat::$fastMult = true;
 
         /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A */
-        $A = ParagonIE_Sodium_Core_Ed25519::ge_frombytes_negate_vartime($publicKey);
+        $A = ParagonIE_Sodium_Core_Ed25519::ge_frombytes_negate_vartime( $publicKey );
 
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($sig, 0, 32));
-        self::hash_update($hs, self::substr($publicKey, 0, 32));
+        $hs = hash_init( 'sha512' );
+        self::hash_update( $hs, self::substr( $sig, 0, 32 ) );
+        self::hash_update( $hs, self::substr( $publicKey, 0, 32 ) );
         /** @var resource $hs */
-        $hs = self::updateHashWithFile($hs, $fp, $size);
+        $hs = self::updateHashWithFile( $hs, $fp, $size );
         /** @var string $hDigest */
-        $hDigest = hash_final($hs, true);
+        $hDigest = hash_final( $hs, true );
 
         /** @var string $h */
-        $h = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hDigest) . self::substr($hDigest, 32);
+        $h = ParagonIE_Sodium_Core_Ed25519::sc_reduce( $hDigest ) . self::substr( $hDigest, 32 );
 
         /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
         $R = ParagonIE_Sodium_Core_Ed25519::ge_double_scalarmult_vartime(
             $h,
             $A,
-            self::substr($sig, 32)
+            self::substr( $sig, 32 )
         );
 
         /** @var string $rcheck */
-        $rcheck = ParagonIE_Sodium_Core_Ed25519::ge_tobytes($R);
+        $rcheck = ParagonIE_Sodium_Core_Ed25519::ge_tobytes( $R );
 
         // Close the file handle
-        fclose($fp);
+        fclose( $fp );
 
         // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
         ParagonIE_Sodium_Compat::$fastMult = $orig;
-        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+        return self::verify_32( $rcheck, self::substr( $sig, 0, 32 ) );
     }
 
     /**
@@ -766,17 +766,17 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function box_encrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
+    protected static function box_encrypt( $ifp, $ofp, $mlen, $nonce, $boxKeypair )
     {
-        if (PHP_INT_SIZE === 4) {
+        if ( PHP_INT_SIZE === 4 ) {
             return self::secretbox_encrypt(
                 $ifp,
                 $ofp,
                 $mlen,
                 $nonce,
                 ParagonIE_Sodium_Crypto32::box_beforenm(
-                    ParagonIE_Sodium_Crypto32::box_secretkey($boxKeypair),
-                    ParagonIE_Sodium_Crypto32::box_publickey($boxKeypair)
+                    ParagonIE_Sodium_Crypto32::box_secretkey( $boxKeypair ),
+                    ParagonIE_Sodium_Crypto32::box_publickey( $boxKeypair )
                 )
             );
         }
@@ -786,8 +786,8 @@ 
             $mlen,
             $nonce,
             ParagonIE_Sodium_Crypto::box_beforenm(
-                ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
-                ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
+                ParagonIE_Sodium_Crypto::box_secretkey( $boxKeypair ),
+                ParagonIE_Sodium_Crypto::box_publickey( $boxKeypair )
             )
         );
     }
@@ -803,17 +803,17 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function box_decrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
+    protected static function box_decrypt( $ifp, $ofp, $mlen, $nonce, $boxKeypair )
     {
-        if (PHP_INT_SIZE === 4) {
+        if ( PHP_INT_SIZE === 4 ) {
             return self::secretbox_decrypt(
                 $ifp,
                 $ofp,
                 $mlen,
                 $nonce,
                 ParagonIE_Sodium_Crypto32::box_beforenm(
-                    ParagonIE_Sodium_Crypto32::box_secretkey($boxKeypair),
-                    ParagonIE_Sodium_Crypto32::box_publickey($boxKeypair)
+                    ParagonIE_Sodium_Crypto32::box_secretkey( $boxKeypair ),
+                    ParagonIE_Sodium_Crypto32::box_publickey( $boxKeypair )
                 )
             );
         }
@@ -823,8 +823,8 @@ 
             $mlen,
             $nonce,
             ParagonIE_Sodium_Crypto::box_beforenm(
-                ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
-                ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
+                ParagonIE_Sodium_Crypto::box_secretkey( $boxKeypair ),
+                ParagonIE_Sodium_Crypto::box_publickey( $boxKeypair )
             )
         );
     }
@@ -841,33 +841,33 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function secretbox_encrypt($ifp, $ofp, $mlen, $nonce, $key)
+    protected static function secretbox_encrypt( $ifp, $ofp, $mlen, $nonce, $key )
     {
-        if (PHP_INT_SIZE === 4) {
-            return self::secretbox_encrypt_core32($ifp, $ofp, $mlen, $nonce, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return self::secretbox_encrypt_core32( $ifp, $ofp, $mlen, $nonce, $key );
         }
 
-        $plaintext = fread($ifp, 32);
-        if (!is_string($plaintext)) {
-            throw new SodiumException('Could not read input file');
+        $plaintext = fread( $ifp, 32 );
+        if ( ! is_string( $plaintext ) ) {
+            throw new SodiumException( 'Could not read input file' );
         }
-        $first32 = self::ftell($ifp);
+        $first32 = self::ftell( $ifp );
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $realNonce */
-        $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+        $realNonce = ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 );
 
         /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
+        $block0 = str_repeat( "\x00", 32 );
 
         /** @var int $mlen - Length of the plaintext message */
         $mlen0 = $mlen;
-        if ($mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES) {
+        if ( $mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES ) {
             $mlen0 = 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES;
         }
-        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+        $block0 .= ParagonIE_Sodium_Core_Util::substr( $plaintext, 0, $mlen0 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
@@ -885,16 +885,16 @@ 
         );
 
         // Pre-write 16 blank bytes for the Poly1305 tag
-        $start = self::ftell($ofp);
-        fwrite($ofp, str_repeat("\x00", 16));
+        $start = self::ftell( $ofp );
+        fwrite( $ofp, str_repeat( "\x00", 16 ) );
 
         /** @var string $c */
         $cBlock = ParagonIE_Sodium_Core_Util::substr(
             $block0,
             ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES
         );
-        $state->update($cBlock);
-        fwrite($ofp, $cBlock);
+        $state->update( $cBlock );
+        fwrite( $ofp, $cBlock );
         $mlen -= 32;
 
         /** @var int $iter */
@@ -907,15 +907,15 @@ 
          * Set the cursor to the end of the first half-block. All future bytes will
          * generated from salsa20_xor_ic, starting from 1 (second block).
          */
-        fseek($ifp, $first32, SEEK_SET);
+        fseek( $ifp, $first32, SEEK_SET );
 
-        while ($mlen > 0) {
+        while ( $mlen > 0 ) {
             $blockSize = $mlen > self::BUFFER_SIZE
                 ? self::BUFFER_SIZE
                 : $mlen;
-            $plaintext = fread($ifp, $blockSize);
-            if (!is_string($plaintext)) {
-                throw new SodiumException('Could not read input file');
+            $plaintext = fread( $ifp, $blockSize );
+            if ( ! is_string( $plaintext ) ) {
+                throw new SodiumException( 'Could not read input file' );
             }
             $cBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
                 $plaintext,
@@ -923,29 +923,29 @@ 
                 $iter,
                 $subkey
             );
-            fwrite($ofp, $cBlock, $blockSize);
-            $state->update($cBlock);
+            fwrite( $ofp, $cBlock, $blockSize );
+            $state->update( $cBlock );
 
             $mlen -= $blockSize;
             $iter += $incr;
         }
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+            ParagonIE_Sodium_Compat::memzero( $subkey );
+        } catch ( SodiumException $ex ) {
             $block0 = null;
             $subkey = null;
         }
-        $end = self::ftell($ofp);
+        $end = self::ftell( $ofp );
 
         /*
          * Write the Poly1305 authentication tag that provides integrity
          * over the ciphertext (encrypt-then-MAC)
          */
-        fseek($ofp, $start, SEEK_SET);
-        fwrite($ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES);
-        fseek($ofp, $end, SEEK_SET);
-        unset($state);
+        fseek( $ofp, $start, SEEK_SET );
+        fwrite( $ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES );
+        fseek( $ofp, $end, SEEK_SET );
+        unset( $state );
 
         return true;
     }
@@ -962,49 +962,49 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function secretbox_decrypt($ifp, $ofp, $mlen, $nonce, $key)
+    protected static function secretbox_decrypt( $ifp, $ofp, $mlen, $nonce, $key )
     {
-        if (PHP_INT_SIZE === 4) {
-            return self::secretbox_decrypt_core32($ifp, $ofp, $mlen, $nonce, $key);
+        if ( PHP_INT_SIZE === 4 ) {
+            return self::secretbox_decrypt_core32( $ifp, $ofp, $mlen, $nonce, $key );
         }
-        $tag = fread($ifp, 16);
-        if (!is_string($tag)) {
-            throw new SodiumException('Could not read input file');
+        $tag = fread( $ifp, 16 );
+        if ( ! is_string( $tag ) ) {
+            throw new SodiumException( 'Could not read input file' );
         }
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $realNonce */
-        $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+        $realNonce = ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
             64,
-            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
 
         /* Verify the Poly1305 MAC -before- attempting to decrypt! */
-        $state = new ParagonIE_Sodium_Core_Poly1305_State(self::substr($block0, 0, 32));
-        if (!self::onetimeauth_verify($state, $ifp, $tag, $mlen)) {
-            throw new SodiumException('Invalid MAC');
+        $state = new ParagonIE_Sodium_Core_Poly1305_State( self::substr( $block0, 0, 32 ) );
+        if ( ! self::onetimeauth_verify( $state, $ifp, $tag, $mlen ) ) {
+            throw new SodiumException( 'Invalid MAC' );
         }
 
         /*
          * Set the cursor to the end of the first half-block. All future bytes will
          * generated from salsa20_xor_ic, starting from 1 (second block).
          */
-        $first32 = fread($ifp, 32);
-        if (!is_string($first32)) {
-            throw new SodiumException('Could not read input file');
+        $first32 = fread( $ifp, 32 );
+        if ( ! is_string( $first32 ) ) {
+            throw new SodiumException( 'Could not read input file' );
         }
-        $first32len = self::strlen($first32);
+        $first32len = self::strlen( $first32 );
         fwrite(
             $ofp,
             self::xorStrings(
-                self::substr($block0, 32, $first32len),
-                self::substr($first32, 0, $first32len)
+                self::substr( $block0, 32, $first32len ),
+                self::substr( $first32, 0, $first32len )
             )
         );
         $mlen -= 32;
@@ -1016,13 +1016,13 @@ 
         $incr = self::BUFFER_SIZE >> 6;
 
         /* Decrypts ciphertext, writes to output file. */
-        while ($mlen > 0) {
+        while ( $mlen > 0 ) {
             $blockSize = $mlen > self::BUFFER_SIZE
                 ? self::BUFFER_SIZE
                 : $mlen;
-            $ciphertext = fread($ifp, $blockSize);
-            if (!is_string($ciphertext)) {
-                throw new SodiumException('Could not read input file');
+            $ciphertext = fread( $ifp, $blockSize );
+            if ( ! is_string( $ciphertext ) ) {
+                throw new SodiumException( 'Could not read input file' );
             }
             $pBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
                 $ciphertext,
@@ -1030,7 +1030,7 @@ 
                 $iter,
                 $subkey
             );
-            fwrite($ofp, $pBlock, $blockSize);
+            fwrite( $ofp, $pBlock, $blockSize );
             $mlen -= $blockSize;
             $iter += $incr;
         }
@@ -1053,7 +1053,7 @@ 
         $mlen = 0
     ) {
         /** @var int $pos */
-        $pos = self::ftell($ifp);
+        $pos = self::ftell( $ifp );
 
         /** @var int $iter */
         $iter = 1;
@@ -1061,21 +1061,21 @@ 
         /** @var int $incr */
         $incr = self::BUFFER_SIZE >> 6;
 
-        while ($mlen > 0) {
+        while ( $mlen > 0 ) {
             $blockSize = $mlen > self::BUFFER_SIZE
                 ? self::BUFFER_SIZE
                 : $mlen;
-            $ciphertext = fread($ifp, $blockSize);
-            if (!is_string($ciphertext)) {
-                throw new SodiumException('Could not read input file');
+            $ciphertext = fread( $ifp, $blockSize );
+            if ( ! is_string( $ciphertext ) ) {
+                throw new SodiumException( 'Could not read input file' );
             }
-            $state->update($ciphertext);
+            $state->update( $ciphertext );
             $mlen -= $blockSize;
             $iter += $incr;
         }
-        $res = ParagonIE_Sodium_Core_Util::verify_16($tag, $state->finish());
+        $res = ParagonIE_Sodium_Core_Util::verify_16( $tag, $state->finish() );
 
-        fseek($ifp, $pos, SEEK_SET);
+        fseek( $ifp, $pos, SEEK_SET );
         return $res;
     }
 
@@ -1095,48 +1095,48 @@ 
      * @psalm-suppress TypeCoercion
      *                 Ditto.
      */
-    public static function updateHashWithFile($hash, $fp, $size = 0)
+    public static function updateHashWithFile( $hash, $fp, $size = 0 )
     {
         /* Type checks: */
-        if (PHP_VERSION_ID < 70200) {
-            if (!is_resource($hash)) {
-                throw new TypeError('Argument 1 must be a resource, ' . gettype($hash) . ' given.');
+        if ( PHP_VERSION_ID < 70200 ) {
+            if ( ! is_resource( $hash ) ) {
+                throw new TypeError( 'Argument 1 must be a resource, ' . gettype( $hash ) . ' given.' );
             }
         } else {
-            if (!is_object($hash)) {
-                throw new TypeError('Argument 1 must be an object (PHP 7.2+), ' . gettype($hash) . ' given.');
+            if ( ! is_object( $hash ) ) {
+                throw new TypeError( 'Argument 1 must be an object (PHP 7.2+), ' . gettype( $hash ) . ' given.' );
             }
         }
 
-        if (!is_resource($fp)) {
-            throw new TypeError('Argument 2 must be a resource, ' . gettype($fp) . ' given.');
+        if ( ! is_resource( $fp ) ) {
+            throw new TypeError( 'Argument 2 must be a resource, ' . gettype( $fp ) . ' given.' );
         }
-        if (!is_int($size)) {
-            throw new TypeError('Argument 3 must be an integer, ' . gettype($size) . ' given.');
+        if ( ! is_int( $size ) ) {
+            throw new TypeError( 'Argument 3 must be an integer, ' . gettype( $size ) . ' given.' );
         }
 
         /** @var int $originalPosition */
-        $originalPosition = self::ftell($fp);
+        $originalPosition = self::ftell( $fp );
 
         // Move file pointer to beginning of file
-        fseek($fp, 0, SEEK_SET);
-        for ($i = 0; $i < $size; $i += self::BUFFER_SIZE) {
+        fseek( $fp, 0, SEEK_SET );
+        for ( $i = 0; $i < $size; $i += self::BUFFER_SIZE ) {
             /** @var string|bool $message */
             $message = fread(
                 $fp,
-                ($size - $i) > self::BUFFER_SIZE
+                ( $size - $i ) > self::BUFFER_SIZE
                     ? $size - $i
                     : self::BUFFER_SIZE
             );
-            if (!is_string($message)) {
-                throw new SodiumException('Unexpected error reading from file.');
+            if ( ! is_string( $message ) ) {
+                throw new SodiumException( 'Unexpected error reading from file.' );
             }
             /** @var string $message */
             /** @psalm-suppress InvalidArgument */
-            self::hash_update($hash, $message);
+            self::hash_update( $hash, $message );
         }
         // Reset file pointer's position
-        fseek($fp, $originalPosition, SEEK_SET);
+        fseek( $fp, $originalPosition, SEEK_SET );
         return $hash;
     }
 
@@ -1152,71 +1152,71 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    private static function sign_core32($filePath, $secretKey)
+    private static function sign_core32( $filePath, $secretKey )
     {
         /** @var int|bool $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $filePath );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
         /** @var int $size */
 
         /** @var resource|bool $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $fp = fopen( $filePath, 'rb' );
+        if ( ! is_resource( $fp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
         /** @var resource $fp */
 
         /** @var string $az */
-        $az = hash('sha512', self::substr($secretKey, 0, 32), true);
+        $az = hash( 'sha512', self::substr( $secretKey, 0, 32 ), true );
 
-        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
-        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+        $az[ 0 ] = self::intToChr( self::chrToInt( $az[ 0 ] ) & 248 );
+        $az[ 31 ] = self::intToChr( ( self::chrToInt( $az[ 31 ] ) & 63 ) | 64 );
 
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($az, 32, 32));
+        $hs = hash_init( 'sha512' );
+        self::hash_update( $hs, self::substr( $az, 32, 32 ) );
         /** @var resource $hs */
-        $hs = self::updateHashWithFile($hs, $fp, $size);
+        $hs = self::updateHashWithFile( $hs, $fp, $size );
 
         /** @var string $nonceHash */
-        $nonceHash = hash_final($hs, true);
+        $nonceHash = hash_final( $hs, true );
 
         /** @var string $pk */
-        $pk = self::substr($secretKey, 32, 32);
+        $pk = self::substr( $secretKey, 32, 32 );
 
         /** @var string $nonce */
-        $nonce = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+        $nonce = ParagonIE_Sodium_Core32_Ed25519::sc_reduce( $nonceHash ) . self::substr( $nonceHash, 32 );
 
         /** @var string $sig */
         $sig = ParagonIE_Sodium_Core32_Ed25519::ge_p3_tobytes(
-            ParagonIE_Sodium_Core32_Ed25519::ge_scalarmult_base($nonce)
+            ParagonIE_Sodium_Core32_Ed25519::ge_scalarmult_base( $nonce )
         );
 
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($sig, 0, 32));
-        self::hash_update($hs, self::substr($pk, 0, 32));
+        $hs = hash_init( 'sha512' );
+        self::hash_update( $hs, self::substr( $sig, 0, 32 ) );
+        self::hash_update( $hs, self::substr( $pk, 0, 32 ) );
         /** @var resource $hs */
-        $hs = self::updateHashWithFile($hs, $fp, $size);
+        $hs = self::updateHashWithFile( $hs, $fp, $size );
 
         /** @var string $hramHash */
-        $hramHash = hash_final($hs, true);
+        $hramHash = hash_final( $hs, true );
 
         /** @var string $hram */
-        $hram = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($hramHash);
+        $hram = ParagonIE_Sodium_Core32_Ed25519::sc_reduce( $hramHash );
 
         /** @var string $sigAfter */
-        $sigAfter = ParagonIE_Sodium_Core32_Ed25519::sc_muladd($hram, $az, $nonce);
+        $sigAfter = ParagonIE_Sodium_Core32_Ed25519::sc_muladd( $hram, $az, $nonce );
 
         /** @var string $sig */
-        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+        $sig = self::substr( $sig, 0, 32 ) . self::substr( $sigAfter, 0, 32 );
 
         try {
-            ParagonIE_Sodium_Compat::memzero($az);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $az );
+        } catch ( SodiumException $ex ) {
             $az = null;
         }
-        fclose($fp);
+        fclose( $fp );
         return $sig;
     }
 
@@ -1234,37 +1234,37 @@ 
      * @throws SodiumException
      * @throws Exception
      */
-    public static function verify_core32($sig, $filePath, $publicKey)
+    public static function verify_core32( $sig, $filePath, $publicKey )
     {
         /* Security checks */
-        if (ParagonIE_Sodium_Core32_Ed25519::check_S_lt_L(self::substr($sig, 32, 32))) {
-            throw new SodiumException('S < L - Invalid signature');
+        if ( ParagonIE_Sodium_Core32_Ed25519::check_S_lt_L( self::substr( $sig, 32, 32 ) ) ) {
+            throw new SodiumException( 'S < L - Invalid signature' );
         }
-        if (ParagonIE_Sodium_Core32_Ed25519::small_order($sig)) {
-            throw new SodiumException('Signature is on too small of an order');
+        if ( ParagonIE_Sodium_Core32_Ed25519::small_order( $sig ) ) {
+            throw new SodiumException( 'Signature is on too small of an order' );
         }
-        if ((self::chrToInt($sig[63]) & 224) !== 0) {
-            throw new SodiumException('Invalid signature');
+        if ( ( self::chrToInt( $sig[ 63 ] ) & 224 ) !== 0 ) {
+            throw new SodiumException( 'Invalid signature' );
         }
         $d = 0;
-        for ($i = 0; $i < 32; ++$i) {
-            $d |= self::chrToInt($publicKey[$i]);
+        for ( $i = 0; $i < 32; ++$i ) {
+            $d |= self::chrToInt( $publicKey[ $i ] );
         }
-        if ($d === 0) {
-            throw new SodiumException('All zero public key');
+        if ( $d === 0 ) {
+            throw new SodiumException( 'All zero public key' );
         }
 
         /** @var int|bool $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
+        $size = filesize( $filePath );
+        if ( ! is_int( $size ) ) {
+            throw new SodiumException( 'Could not obtain the file size' );
         }
         /** @var int $size */
 
         /** @var resource|bool $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new SodiumException('Could not open input file for reading');
+        $fp = fopen( $filePath, 'rb' );
+        if ( ! is_resource( $fp ) ) {
+            throw new SodiumException( 'Could not open input file for reading' );
         }
         /** @var resource $fp */
 
@@ -1275,35 +1275,35 @@ 
         ParagonIE_Sodium_Compat::$fastMult = true;
 
         /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A */
-        $A = ParagonIE_Sodium_Core32_Ed25519::ge_frombytes_negate_vartime($publicKey);
+        $A = ParagonIE_Sodium_Core32_Ed25519::ge_frombytes_negate_vartime( $publicKey );
 
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($sig, 0, 32));
-        self::hash_update($hs, self::substr($publicKey, 0, 32));
+        $hs = hash_init( 'sha512' );
+        self::hash_update( $hs, self::substr( $sig, 0, 32 ) );
+        self::hash_update( $hs, self::substr( $publicKey, 0, 32 ) );
         /** @var resource $hs */
-        $hs = self::updateHashWithFile($hs, $fp, $size);
+        $hs = self::updateHashWithFile( $hs, $fp, $size );
         /** @var string $hDigest */
-        $hDigest = hash_final($hs, true);
+        $hDigest = hash_final( $hs, true );
 
         /** @var string $h */
-        $h = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($hDigest) . self::substr($hDigest, 32);
+        $h = ParagonIE_Sodium_Core32_Ed25519::sc_reduce( $hDigest ) . self::substr( $hDigest, 32 );
 
         /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $R */
         $R = ParagonIE_Sodium_Core32_Ed25519::ge_double_scalarmult_vartime(
             $h,
             $A,
-            self::substr($sig, 32)
+            self::substr( $sig, 32 )
         );
 
         /** @var string $rcheck */
-        $rcheck = ParagonIE_Sodium_Core32_Ed25519::ge_tobytes($R);
+        $rcheck = ParagonIE_Sodium_Core32_Ed25519::ge_tobytes( $R );
 
         // Close the file handle
-        fclose($fp);
+        fclose( $fp );
 
         // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
         ParagonIE_Sodium_Compat::$fastMult = $orig;
-        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+        return self::verify_32( $rcheck, self::substr( $sig, 0, 32 ) );
     }
 
     /**
@@ -1318,29 +1318,29 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function secretbox_encrypt_core32($ifp, $ofp, $mlen, $nonce, $key)
+    protected static function secretbox_encrypt_core32( $ifp, $ofp, $mlen, $nonce, $key )
     {
-        $plaintext = fread($ifp, 32);
-        if (!is_string($plaintext)) {
-            throw new SodiumException('Could not read input file');
+        $plaintext = fread( $ifp, 32 );
+        if ( ! is_string( $plaintext ) ) {
+            throw new SodiumException( 'Could not read input file' );
         }
-        $first32 = self::ftell($ifp);
+        $first32 = self::ftell( $ifp );
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $realNonce */
-        $realNonce = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+        $realNonce = ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 );
 
         /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
+        $block0 = str_repeat( "\x00", 32 );
 
         /** @var int $mlen - Length of the plaintext message */
         $mlen0 = $mlen;
-        if ($mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES) {
+        if ( $mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES ) {
             $mlen0 = 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES;
         }
-        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
+        $block0 .= ParagonIE_Sodium_Core32_Util::substr( $plaintext, 0, $mlen0 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor(
@@ -1358,16 +1358,16 @@ 
         );
 
         // Pre-write 16 blank bytes for the Poly1305 tag
-        $start = self::ftell($ofp);
-        fwrite($ofp, str_repeat("\x00", 16));
+        $start = self::ftell( $ofp );
+        fwrite( $ofp, str_repeat( "\x00", 16 ) );
 
         /** @var string $c */
         $cBlock = ParagonIE_Sodium_Core32_Util::substr(
             $block0,
             ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES
         );
-        $state->update($cBlock);
-        fwrite($ofp, $cBlock);
+        $state->update( $cBlock );
+        fwrite( $ofp, $cBlock );
         $mlen -= 32;
 
         /** @var int $iter */
@@ -1380,15 +1380,15 @@ 
          * Set the cursor to the end of the first half-block. All future bytes will
          * generated from salsa20_xor_ic, starting from 1 (second block).
          */
-        fseek($ifp, $first32, SEEK_SET);
+        fseek( $ifp, $first32, SEEK_SET );
 
-        while ($mlen > 0) {
+        while ( $mlen > 0 ) {
             $blockSize = $mlen > self::BUFFER_SIZE
                 ? self::BUFFER_SIZE
                 : $mlen;
-            $plaintext = fread($ifp, $blockSize);
-            if (!is_string($plaintext)) {
-                throw new SodiumException('Could not read input file');
+            $plaintext = fread( $ifp, $blockSize );
+            if ( ! is_string( $plaintext ) ) {
+                throw new SodiumException( 'Could not read input file' );
             }
             $cBlock = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
                 $plaintext,
@@ -1396,29 +1396,29 @@ 
                 $iter,
                 $subkey
             );
-            fwrite($ofp, $cBlock, $blockSize);
-            $state->update($cBlock);
+            fwrite( $ofp, $cBlock, $blockSize );
+            $state->update( $cBlock );
 
             $mlen -= $blockSize;
             $iter += $incr;
         }
         try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
+            ParagonIE_Sodium_Compat::memzero( $block0 );
+            ParagonIE_Sodium_Compat::memzero( $subkey );
+        } catch ( SodiumException $ex ) {
             $block0 = null;
             $subkey = null;
         }
-        $end = self::ftell($ofp);
+        $end = self::ftell( $ofp );
 
         /*
          * Write the Poly1305 authentication tag that provides integrity
          * over the ciphertext (encrypt-then-MAC)
          */
-        fseek($ofp, $start, SEEK_SET);
-        fwrite($ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES);
-        fseek($ofp, $end, SEEK_SET);
-        unset($state);
+        fseek( $ofp, $start, SEEK_SET );
+        fwrite( $ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES );
+        fseek( $ofp, $end, SEEK_SET );
+        unset( $state );
 
         return true;
     }
@@ -1435,46 +1435,46 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function secretbox_decrypt_core32($ifp, $ofp, $mlen, $nonce, $key)
+    protected static function secretbox_decrypt_core32( $ifp, $ofp, $mlen, $nonce, $key )
     {
-        $tag = fread($ifp, 16);
-        if (!is_string($tag)) {
-            throw new SodiumException('Could not read input file');
+        $tag = fread( $ifp, 16 );
+        if ( ! is_string( $tag ) ) {
+            throw new SodiumException( 'Could not read input file' );
         }
 
         /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
+        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20( $nonce, $key );
 
         /** @var string $realNonce */
-        $realNonce = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+        $realNonce = ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 );
 
         /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20(
             64,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+            ParagonIE_Sodium_Core32_Util::substr( $nonce, 16, 8 ),
             $subkey
         );
 
         /* Verify the Poly1305 MAC -before- attempting to decrypt! */
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(self::substr($block0, 0, 32));
-        if (!self::onetimeauth_verify_core32($state, $ifp, $tag, $mlen)) {
-            throw new SodiumException('Invalid MAC');
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State( self::substr( $block0, 0, 32 ) );
+        if ( ! self::onetimeauth_verify_core32( $state, $ifp, $tag, $mlen ) ) {
+            throw new SodiumException( 'Invalid MAC' );
         }
 
         /*
          * Set the cursor to the end of the first half-block. All future bytes will
          * generated from salsa20_xor_ic, starting from 1 (second block).
          */
-        $first32 = fread($ifp, 32);
-        if (!is_string($first32)) {
-            throw new SodiumException('Could not read input file');
+        $first32 = fread( $ifp, 32 );
+        if ( ! is_string( $first32 ) ) {
+            throw new SodiumException( 'Could not read input file' );
         }
-        $first32len = self::strlen($first32);
+        $first32len = self::strlen( $first32 );
         fwrite(
             $ofp,
             self::xorStrings(
-                self::substr($block0, 32, $first32len),
-                self::substr($first32, 0, $first32len)
+                self::substr( $block0, 32, $first32len ),
+                self::substr( $first32, 0, $first32len )
             )
         );
         $mlen -= 32;
@@ -1486,13 +1486,13 @@ 
         $incr = self::BUFFER_SIZE >> 6;
 
         /* Decrypts ciphertext, writes to output file. */
-        while ($mlen > 0) {
+        while ( $mlen > 0 ) {
             $blockSize = $mlen > self::BUFFER_SIZE
                 ? self::BUFFER_SIZE
                 : $mlen;
-            $ciphertext = fread($ifp, $blockSize);
-            if (!is_string($ciphertext)) {
-                throw new SodiumException('Could not read input file');
+            $ciphertext = fread( $ifp, $blockSize );
+            if ( ! is_string( $ciphertext ) ) {
+                throw new SodiumException( 'Could not read input file' );
             }
             $pBlock = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
                 $ciphertext,
@@ -1500,7 +1500,7 @@ 
                 $iter,
                 $subkey
             );
-            fwrite($ofp, $pBlock, $blockSize);
+            fwrite( $ofp, $pBlock, $blockSize );
             $mlen -= $blockSize;
             $iter += $incr;
         }
@@ -1525,22 +1525,22 @@ 
         $mlen = 0
     ) {
         /** @var int $pos */
-        $pos = self::ftell($ifp);
+        $pos = self::ftell( $ifp );
 
-        while ($mlen > 0) {
+        while ( $mlen > 0 ) {
             $blockSize = $mlen > self::BUFFER_SIZE
                 ? self::BUFFER_SIZE
                 : $mlen;
-            $ciphertext = fread($ifp, $blockSize);
-            if (!is_string($ciphertext)) {
-                throw new SodiumException('Could not read input file');
+            $ciphertext = fread( $ifp, $blockSize );
+            if ( ! is_string( $ciphertext ) ) {
+                throw new SodiumException( 'Could not read input file' );
             }
-            $state->update($ciphertext);
+            $state->update( $ciphertext );
             $mlen -= $blockSize;
         }
-        $res = ParagonIE_Sodium_Core32_Util::verify_16($tag, $state->finish());
+        $res = ParagonIE_Sodium_Core32_Util::verify_16( $tag, $state->finish() );
 
-        fseek($ifp, $pos, SEEK_SET);
+        fseek( $ifp, $pos, SEEK_SET );
         return $res;
     }
 
@@ -1549,12 +1549,12 @@ 
      * @return int
      * @throws SodiumException
      */
-    private static function ftell($resource)
+    private static function ftell( $resource )
     {
-        $return = ftell($resource);
-        if (!is_int($return)) {
-            throw new SodiumException('ftell() returned false');
+        $return = ftell( $resource );
+        if ( ! is_int( $return ) ) {
+            throw new SodiumException( 'ftell() returned false' );
         }
-        return (int) $return;
+        return (int)$return;
     }
 }