WordPoints / wordpoints

src/classes/uninstaller/factory.php

Spacing +2 added lines, -2 removed lines

@@ -76,11 +76,11 @@
 
 		$routines = array();
 
-		if ( empty( $this->uninstallers[ $context ] ) ) {
+		if ( empty( $this->uninstallers[$context] ) ) {
 			return $routines;
 		}
 
-		foreach ( $this->uninstallers[ $context ] as $data ) {
+		foreach ( $this->uninstallers[$context] as $data ) {
 
 			if ( is_string( $data ) ) {
 				$class = $data;

src/classes/updater.php

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
 		// So we get all of the per-site versions.
 		foreach ( $this->installable->get_installed_site_ids() as $site_id ) {
 			switch_to_blog( $site_id );
-			$versions[ $site_id ] = $this->installable->get_db_version();
+			$versions[$site_id] = $this->installable->get_db_version();
 		}
 
 		$ms_switched_state->restore();

src/classes/components.php

Spacing +14 added lines, -14 removed lines

@@ -194,11 +194,11 @@ 
 	 */
 	public function get_component( $slug ) {
 
-		if ( ! isset( $this->registered[ $slug ] ) ) {
+		if ( ! isset( $this->registered[$slug] ) ) {
 			return false;
 		}
 
-		return $this->registered[ $slug ];
+		return $this->registered[$slug];
 	}
 
 	/**
@@ -228,7 +228,7 @@ 
 	 */
 	public function is_registered( $slug ) {
 
-		return isset( $this->registered[ $slug ] );
+		return isset( $this->registered[$slug] );
 	}
 
 	/**
@@ -284,7 +284,7 @@ 
 			return false;
 		}
 
-		$this->registered[ $component['slug'] ] = array_intersect_key( $component, $defaults );
+		$this->registered[$component['slug']] = array_intersect_key( $component, $defaults );
 
 		if (
 			! isset( $component['installable'] )
@@ -315,7 +315,7 @@ 
 	 */
 	public function deregister( $slug ) {
 
-		if ( isset( $this->registered[ $slug ] ) ) {
+		if ( isset( $this->registered[$slug] ) ) {
 
 			/**
 			 * Component being deregistered.
@@ -324,7 +324,7 @@ 
 			 */
 			do_action( "wordpoints_component_deregister-{$slug}" );
 
-			unset( $this->registered[ $slug ] );
+			unset( $this->registered[$slug] );
 		}
 
 		return true;
@@ -356,17 +356,17 @@ 
 		// If this component isn't already active, activate it.
 		if ( ! $this->is_active( $slug ) ) {
 
-			$this->active[ $slug ] = 1;
+			$this->active[$slug] = 1;
 
 			if ( ! wordpoints_update_maybe_network_option( 'wordpoints_active_components', $this->active ) ) {
 				return false;
 			}
 
-			require_once $this->registered[ $slug ]['file'];
+			require_once $this->registered[$slug]['file'];
 
-			if ( isset( $this->registered[ $slug ]['installable'] ) ) {
+			if ( isset( $this->registered[$slug]['installable'] ) ) {
 
-				$installable = $this->registered[ $slug ]['installable'];
+				$installable = $this->registered[$slug]['installable'];
 				$installable = new $installable( $slug );
 
 				$installer = new WordPoints_Installer(
@@ -381,8 +381,8 @@ 
 				WordPoints_Installables::get_installer(
 					'component'
 					, $slug
-					, $this->registered[ $slug ]['version']
-					, $this->registered[ $slug ]['un_installer']
+					, $this->registered[$slug]['version']
+					, $this->registered[$slug]['un_installer']
 				)
 					->install( is_wordpoints_network_active() );
 			}
@@ -420,7 +420,7 @@ 
 
 		if ( $this->is_active( $slug ) ) {
 
-			unset( $this->active[ $slug ] );
+			unset( $this->active[$slug] );
 
 			if ( ! wordpoints_update_maybe_network_option( 'wordpoints_active_components', $this->active ) ) {
 				return false;
@@ -453,7 +453,7 @@ 
 
 		$this->get_active();
 
-		$is_active = isset( $this->active[ $slug ] );
+		$is_active = isset( $this->active[$slug] );
 
 		/**
 		 * Is a component active?

src/includes/apps.php

Spacing +1 added lines, -1 removed lines

@@ -602,7 +602,7 @@
 			return false;
 		}
 
-		$current_context[ $slug ] = $id;
+		$current_context[$slug] = $id;
 
 		$slug = $context->get_parent_slug();
 	}

src/includes/hooks.php

Spacing +1 added lines, -1 removed lines

@@ -454,7 +454,7 @@
 		$the_guid = $entity->get_the_guid();
 
 		if ( $the_guid ) {
-			$the_guids[ $arg_slug ] = $the_guid;
+			$the_guids[$arg_slug] = $the_guid;
 		}
 	}
 

src/includes/modules.php

Spacing +15 added lines, -15 removed lines

@@ -62,7 +62,7 @@ 
 
 	$modules = wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' );
 
-	if ( isset( $modules[ $module ] ) ) {
+	if ( isset( $modules[$module] ) ) {
 		return true;
 	}
 
@@ -496,7 +496,7 @@ 
 
 				foreach ( array( 'name', 'uri', 'module_uri', 'description', 'author', 'author_uri', 'version' ) as $field ) {
 
-					$module_data[ $field ] = translate( $module_data[ $field ], $textdomain ); // @codingStandardsIgnoreLine
+					$module_data[$field] = translate( $module_data[$field], $textdomain ); // @codingStandardsIgnoreLine
 				}
 			}
 		}
@@ -514,11 +514,11 @@ 
 		$allowed_tags['a'] = array( 'href' => true, 'title' => true );
 
 		// Name and author ar marked up inside <a> tags. Don't allow these.
-		$module_data['name']   = wp_kses( $module_data['name']  , $allowed_tags_in_links );
+		$module_data['name']   = wp_kses( $module_data['name'], $allowed_tags_in_links );
 		$module_data['author'] = wp_kses( $module_data['author'], $allowed_tags_in_links );
 
 		$module_data['description'] = wp_kses( $module_data['description'], $allowed_tags );
-		$module_data['version']     = wp_kses( $module_data['version']    , $allowed_tags );
+		$module_data['version']     = wp_kses( $module_data['version'], $allowed_tags );
 
 		$module_data['uri']        = esc_url( $module_data['uri'] );
 		$module_data['module_uri'] = esc_url( $module_data['module_uri'] );
@@ -683,8 +683,8 @@ 
 		$cache_modules = array();
 	}
 
-	if ( isset( $cache_modules[ $module_folder ] ) ) {
-		return $cache_modules[ $module_folder ];
+	if ( isset( $cache_modules[$module_folder] ) ) {
+		return $cache_modules[$module_folder];
 	}
 
 	$modules     = array();
@@ -738,12 +738,12 @@ 
 			$module_file = basename( $module_file );
 		}
 
-		$modules[ $module_file ] = $module_data;
+		$modules[$module_file] = $module_data;
 	}
 
 	uasort( $modules, '_wordpoints_sort_uname_callback' );
 
-	$cache_modules[ $module_folder ] = $modules;
+	$cache_modules[$module_folder] = $modules;
 	wp_cache_set( 'wordpoints_modules', $cache_modules, 'wordpoints_modules' );
 
 	return $modules;
@@ -770,7 +770,7 @@ 
 
 	$installed_modules = wordpoints_get_modules();
 
-	if ( ! isset( $installed_modules[ $module ] ) ) {
+	if ( ! isset( $installed_modules[$module] ) ) {
 		return new WP_Error( 'no_module_header', __( 'The extension does not have a valid header.', 'wordpoints' ) );
 	}
 
@@ -807,7 +807,7 @@ 
 		$result = wordpoints_validate_module( $module );
 
 		if ( is_wp_error( $result ) ) {
-			$invalid[ $module ] = $result;
+			$invalid[$module] = $result;
 			wordpoints_deactivate_modules( $module, true );
 		}
 	}
@@ -946,7 +946,7 @@ 
 
 	if ( $network_wide ) {
 
-		$network_current[ $module ] = time();
+		$network_current[$module] = time();
 		update_site_option( 'wordpoints_sitewide_active_modules', $network_current );
 
 	} else {
@@ -1035,7 +1035,7 @@ 
 			if ( is_wordpoints_module_active_for_network( $module ) ) {
 
 				$do_network = true;
-				unset( $network_current[ $module ] );
+				unset( $network_current[$module] );
 
 			} elseif ( $network_wide ) {
 
@@ -1050,7 +1050,7 @@ 
 			if ( false !== $key ) {
 
 				$do_blog = true;
-				unset( $current[ $key ] );
+				unset( $current[$key] );
 			}
 		}
 
@@ -1616,10 +1616,10 @@ 
 	if (
 		empty( $data['ID'] )
 		&& ( 'J.D. Grimes' === $data['author'] || 'WordPoints' === $data['author'] )
-		&& isset( $missing_headers[ $data['name'] ] )
+		&& isset( $missing_headers[$data['name']] )
 	) {
 		$data['server'] = 'wordpoints.org';
-		$data['ID']     = $missing_headers[ $data['name'] ];
+		$data['ID']     = $missing_headers[$data['name']];
 	}
 
 	return $data;

Braces +4 added lines, -2 removed lines

@@ -84,7 +84,8 @@ 
  *
  * @return bool True if the module is network only, false otherwise.
  */
-function is_network_only_wordpoints_module( $module ) { // @codingStandardsIgnoreLine
+function is_network_only_wordpoints_module( $module ) {
+// @codingStandardsIgnoreLine
 
 	$module_data = wordpoints_get_module_data( wordpoints_extensions_dir() . '/' . $module );
 
@@ -100,7 +101,8 @@ 
  *
  * @return bool True if the module has an uninstall script, false otherwise.
  */
-function is_uninstallable_wordpoints_module( $module ) { // @codingStandardsIgnoreLine
+function is_uninstallable_wordpoints_module( $module ) {
+// @codingStandardsIgnoreLine
 
 	return ( file_exists( wordpoints_extensions_dir() . '/' . dirname( wordpoints_module_basename( $module ) ) . '/uninstall.php' ) );
 }

src/classes/updater/factory.php

Spacing +2 added lines, -2 removed lines

@@ -90,11 +90,11 @@
 
 		$routines = array();
 
-		if ( empty( $this->updates[ $context ] ) ) {
+		if ( empty( $this->updates[$context] ) ) {
 			return $routines;
 		}
 
-		foreach ( $this->updates[ $context ] as $data ) {
+		foreach ( $this->updates[$context] as $data ) {
 
 			if ( $data instanceof WordPoints_RoutineI ) {
 				$routines[] = $data;

src/library/sodium_compat/lib/php72compat.php

Doc Comments +4 added lines, -4 removed lines

@@ -240,7 +240,7 @@ 
      * @param string $message
      * @param string $nonce
      * @param string $kp
-     * @return string|bool
+     * @return string|false
      */
     function sodium_crypto_box_open($message, $nonce, $kp)
     {
@@ -288,7 +288,7 @@ 
     /**
      * @param string $message
      * @param string $kp
-     * @return string|bool
+     * @return string|false
      */
     function sodium_crypto_box_seal_open($message, $kp)
     {
@@ -496,7 +496,7 @@ 
      * @param string $message
      * @param string $nonce
      * @param string $key
-     * @return string|bool
+     * @return string|false
      */
     function sodium_crypto_secretbox_open($message, $nonce, $key)
     {
@@ -555,7 +555,7 @@ 
     /**
      * @param string $signedMessage
      * @param string $pk
-     * @return string|bool
+     * @return string|false
      */
     function sodium_crypto_sign_open($signedMessage, $pk)
     {

Indentation +616 added lines, -616 removed lines

@@ -8,738 +8,738 @@
  * ParagonIE_Sodium_Compat method or class constant, respectively.
  */
 foreach (array(
-    'CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_ABYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES',
-    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES',
-    'CRYPTO_AUTH_BYTES',
-    'CRYPTO_AUTH_KEYBYTES',
-    'CRYPTO_BOX_SEALBYTES',
-    'CRYPTO_BOX_SECRETKEYBYTES',
-    'CRYPTO_BOX_PUBLICKEYBYTES',
-    'CRYPTO_BOX_KEYPAIRBYTES',
-    'CRYPTO_BOX_MACBYTES',
-    'CRYPTO_BOX_NONCEBYTES',
-    'CRYPTO_BOX_SEEDBYTES',
-    'CRYPTO_KX_BYTES',
-    'CRYPTO_KX_PUBLICKEYBYTES',
-    'CRYPTO_KX_SECRETKEYBYTES',
-    'CRYPTO_GENERICHASH_BYTES',
-    'CRYPTO_GENERICHASH_BYTES_MIN',
-    'CRYPTO_GENERICHASH_BYTES_MAX',
-    'CRYPTO_GENERICHASH_KEYBYTES',
-    'CRYPTO_GENERICHASH_KEYBYTES_MIN',
-    'CRYPTO_GENERICHASH_KEYBYTES_MAX',
-    'CRYPTO_PWHASH_SALTBYTES',
-    'CRYPTO_PWHASH_STRPREFIX',
-    'CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE',
-    'CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE',
-    'CRYPTO_PWHASH_MEMLIMIT_MODERATE',
-    'CRYPTO_PWHASH_OPSLIMIT_MODERATE',
-    'CRYPTO_PWHASH_MEMLIMIT_SENSITIVE',
-    'CRYPTO_PWHASH_OPSLIMIT_SENSITIVE',
-    'CRYPTO_SCALARMULT_BYTES',
-    'CRYPTO_SCALARMULT_SCALARBYTES',
-    'CRYPTO_SHORTHASH_BYTES',
-    'CRYPTO_SHORTHASH_KEYBYTES',
-    'CRYPTO_SECRETBOX_KEYBYTES',
-    'CRYPTO_SECRETBOX_MACBYTES',
-    'CRYPTO_SECRETBOX_NONCEBYTES',
-    'CRYPTO_SIGN_BYTES',
-    'CRYPTO_SIGN_SEEDBYTES',
-    'CRYPTO_SIGN_PUBLICKEYBYTES',
-    'CRYPTO_SIGN_SECRETKEYBYTES',
-    'CRYPTO_SIGN_KEYPAIRBYTES',
-    'CRYPTO_STREAM_KEYBYTES',
-    'CRYPTO_STREAM_NONCEBYTES',
-    ) as $constant
+	'CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_ABYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES',
+	'CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES',
+	'CRYPTO_AUTH_BYTES',
+	'CRYPTO_AUTH_KEYBYTES',
+	'CRYPTO_BOX_SEALBYTES',
+	'CRYPTO_BOX_SECRETKEYBYTES',
+	'CRYPTO_BOX_PUBLICKEYBYTES',
+	'CRYPTO_BOX_KEYPAIRBYTES',
+	'CRYPTO_BOX_MACBYTES',
+	'CRYPTO_BOX_NONCEBYTES',
+	'CRYPTO_BOX_SEEDBYTES',
+	'CRYPTO_KX_BYTES',
+	'CRYPTO_KX_PUBLICKEYBYTES',
+	'CRYPTO_KX_SECRETKEYBYTES',
+	'CRYPTO_GENERICHASH_BYTES',
+	'CRYPTO_GENERICHASH_BYTES_MIN',
+	'CRYPTO_GENERICHASH_BYTES_MAX',
+	'CRYPTO_GENERICHASH_KEYBYTES',
+	'CRYPTO_GENERICHASH_KEYBYTES_MIN',
+	'CRYPTO_GENERICHASH_KEYBYTES_MAX',
+	'CRYPTO_PWHASH_SALTBYTES',
+	'CRYPTO_PWHASH_STRPREFIX',
+	'CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE',
+	'CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE',
+	'CRYPTO_PWHASH_MEMLIMIT_MODERATE',
+	'CRYPTO_PWHASH_OPSLIMIT_MODERATE',
+	'CRYPTO_PWHASH_MEMLIMIT_SENSITIVE',
+	'CRYPTO_PWHASH_OPSLIMIT_SENSITIVE',
+	'CRYPTO_SCALARMULT_BYTES',
+	'CRYPTO_SCALARMULT_SCALARBYTES',
+	'CRYPTO_SHORTHASH_BYTES',
+	'CRYPTO_SHORTHASH_KEYBYTES',
+	'CRYPTO_SECRETBOX_KEYBYTES',
+	'CRYPTO_SECRETBOX_MACBYTES',
+	'CRYPTO_SECRETBOX_NONCEBYTES',
+	'CRYPTO_SIGN_BYTES',
+	'CRYPTO_SIGN_SEEDBYTES',
+	'CRYPTO_SIGN_PUBLICKEYBYTES',
+	'CRYPTO_SIGN_SECRETKEYBYTES',
+	'CRYPTO_SIGN_KEYPAIRBYTES',
+	'CRYPTO_STREAM_KEYBYTES',
+	'CRYPTO_STREAM_NONCEBYTES',
+	) as $constant
 ) {
-    if (!defined("SODIUM_$constant")) {
-        define("SODIUM_$constant", constant("ParagonIE_Sodium_Compat::$constant"));
-    }
+	if (!defined("SODIUM_$constant")) {
+		define("SODIUM_$constant", constant("ParagonIE_Sodium_Compat::$constant"));
+	}
 }
 
 if (!is_callable('sodium_bin2hex')) {
-    /**
-     * @param string $string
-     * @return string
-     */
-    function sodium_bin2hex($string)
-    {
-        return ParagonIE_Sodium_Compat::bin2hex($string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	function sodium_bin2hex($string)
+	{
+		return ParagonIE_Sodium_Compat::bin2hex($string);
+	}
 }
 if (!is_callable('sodium_compare')) {
-    /**
-     * @param string $a
-     * @param string $b
-     * @return int
-     */
-    function sodium_compare($a, $b)
-    {
-        return ParagonIE_Sodium_Compat::compare($a, $b);
-    }
+	/**
+	 * @param string $a
+	 * @param string $b
+	 * @return int
+	 */
+	function sodium_compare($a, $b)
+	{
+		return ParagonIE_Sodium_Compat::compare($a, $b);
+	}
 }
 if (!is_callable('sodium_crypto_aead_chacha20poly1305_decrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    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 false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	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 false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_aead_chacha20poly1305_encrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_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_ietf_decrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    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 false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	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 false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_encrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_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_xchacha20poly1305_ietf_decrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    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);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	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);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+	}
 }
 if (!is_callable('sodium_crypto_auth')) {
-    /**
-     * @param string $message
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_auth($message, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_auth($message, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+	}
 }
 if (!is_callable('sodium_crypto_auth_verify')) {
-    /**
-     * @param string $mac
-     * @param string $message
-     * @param string $key
-     * @return bool
-     */
-    function sodium_crypto_auth_verify($mac, $message, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
-    }
+	/**
+	 * @param string $mac
+	 * @param string $message
+	 * @param string $key
+	 * @return bool
+	 */
+	function sodium_crypto_auth_verify($mac, $message, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+	}
 }
 if (!is_callable('sodium_crypto_box')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $kp
-     * @return string
-     */
-    function sodium_crypto_box($message, $nonce, $kp)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $kp
+	 * @return string
+	 */
+	function sodium_crypto_box($message, $nonce, $kp)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+	}
 }
 if (!is_callable('sodium_crypto_box_keypair')) {
-    /**
-     * @return string
-     */
-    function sodium_crypto_box_keypair()
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair();
-    }
+	/**
+	 * @return string
+	 */
+	function sodium_crypto_box_keypair()
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_keypair();
+	}
 }
 if (!is_callable('sodium_crypto_box_keypair_from_secretkey_and_publickey')) {
-    /**
-     * @param string $sk
-     * @param string $pk
-     * @return string
-     */
-    function sodium_crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
-    }
+	/**
+	 * @param string $sk
+	 * @param string $pk
+	 * @return string
+	 */
+	function sodium_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')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $kp
-     * @return string|bool
-     */
-    function sodium_crypto_box_open($message, $nonce, $kp)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $kp
+	 * @return string|bool
+	 */
+	function sodium_crypto_box_open($message, $nonce, $kp)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_box_publickey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function sodium_crypto_box_publickey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function sodium_crypto_box_publickey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+	}
 }
 if (!is_callable('sodium_crypto_box_publickey_from_secretkey')) {
-    /**
-     * @param string $sk
-     * @return string
-     */
-    function sodium_crypto_box_publickey_from_secretkey($sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
-    }
+	/**
+	 * @param string $sk
+	 * @return string
+	 */
+	function sodium_crypto_box_publickey_from_secretkey($sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+	}
 }
 if (!is_callable('sodium_crypto_box_seal')) {
-    /**
-     * @param string $message
-     * @param string $publicKey
-     * @return string
-     */
-    function sodium_crypto_box_seal($message, $publicKey)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
-    }
+	/**
+	 * @param string $message
+	 * @param string $publicKey
+	 * @return string
+	 */
+	function sodium_crypto_box_seal($message, $publicKey)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+	}
 }
 if (!is_callable('sodium_crypto_box_seal_open')) {
-    /**
-     * @param string $message
-     * @param string $kp
-     * @return string|bool
-     */
-    function sodium_crypto_box_seal_open($message, $kp)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $kp
+	 * @return string|bool
+	 */
+	function sodium_crypto_box_seal_open($message, $kp)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_box_secretkey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function sodium_crypto_box_secretkey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function sodium_crypto_box_secretkey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+	}
 }
 if (!is_callable('sodium_crypto_box_seed_keypair')) {
-    /**
-     * @param string $seed
-     * @return string
-     */
-    function sodium_crypto_box_seed_keypair($seed)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_seed_keypair($seed);
-    }
+	/**
+	 * @param string $seed
+	 * @return string
+	 */
+	function sodium_crypto_box_seed_keypair($seed)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_seed_keypair($seed);
+	}
 }
 if (!is_callable('sodium_crypto_generichash')) {
-    /**
-     * @param string $message
-     * @param string|null $key
-     * @param int $outLen
-     * @return string
-     */
-    function sodium_crypto_generichash($message, $key = null, $outLen = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
-    }
+	/**
+	 * @param string $message
+	 * @param string|null $key
+	 * @param int $outLen
+	 * @return string
+	 */
+	function sodium_crypto_generichash($message, $key = null, $outLen = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+	}
 }
 if (!is_callable('sodium_crypto_generichash_final')) {
-    /**
-     * @param string|null $ctx
-     * @param int $outputLength
-     * @return string
-     */
-    function sodium_crypto_generichash_final(&$ctx, $outputLength = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
-    }
+	/**
+	 * @param string|null $ctx
+	 * @param int $outputLength
+	 * @return string
+	 */
+	function sodium_crypto_generichash_final(&$ctx, $outputLength = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+	}
 }
 if (!is_callable('sodium_crypto_generichash_init')) {
-    /**
-     * @param string|null $key
-     * @param int $outLen
-     * @return string
-     */
-    function sodium_crypto_generichash_init($key = null, $outLen = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
-    }
+	/**
+	 * @param string|null $key
+	 * @param int $outLen
+	 * @return string
+	 */
+	function sodium_crypto_generichash_init($key = null, $outLen = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+	}
 }
 if (!is_callable('sodium_crypto_generichash_update')) {
-    /**
-     * @param string|null $ctx
-     * @param string $message
-     * @return void
-     */
-    function sodium_crypto_generichash_update(&$ctx, $message = '')
-    {
-        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
-    }
+	/**
+	 * @param string|null $ctx
+	 * @param string $message
+	 * @return void
+	 */
+	function sodium_crypto_generichash_update(&$ctx, $message = '')
+	{
+		ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+	}
 }
 if (!is_callable('sodium_crypto_kx')) {
-    /**
-     * @param string $my_secret
-     * @param string $their_public
-     * @param string $client_public
-     * @param string $server_public
-     * @return string
-     */
-    function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_public)
-    {
-        return ParagonIE_Sodium_Compat::crypto_kx(
-            $my_secret,
-            $their_public,
-            $client_public,
-            $server_public
-        );
-    }
+	/**
+	 * @param string $my_secret
+	 * @param string $their_public
+	 * @param string $client_public
+	 * @param string $server_public
+	 * @return string
+	 */
+	function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_public)
+	{
+		return ParagonIE_Sodium_Compat::crypto_kx(
+			$my_secret,
+			$their_public,
+			$client_public,
+			$server_public
+		);
+	}
 }
 if (!is_callable('sodium_crypto_pwhash')) {
-    /**
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
-    }
+	/**
+	 * @param int $outlen
+	 * @param string $passwd
+	 * @param string $salt
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('sodium_crypto_pwhash_str')) {
-    /**
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
-    }
+	/**
+	 * @param string $passwd
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('sodium_crypto_pwhash_str_verify')) {
-    /**
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     */
-    function sodium_crypto_pwhash_str_verify($passwd, $hash)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
-    }
+	/**
+	 * @param string $passwd
+	 * @param string $hash
+	 * @return bool
+	 */
+	function sodium_crypto_pwhash_str_verify($passwd, $hash)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+	}
 }
 if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256')) {
-    /**
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
-    }
+	/**
+	 * @param int $outlen
+	 * @param string $passwd
+	 * @param string $salt
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function sodium_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')) {
-    /**
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
-    }
+	/**
+	 * @param string $passwd
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function sodium_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')) {
-    /**
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     */
-    function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
-    }
+	/**
+	 * @param string $passwd
+	 * @param string $hash
+	 * @return bool
+	 */
+	function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+	}
 }
 if (!is_callable('sodium_crypto_scalarmult')) {
-    /**
-     * @param string $n
-     * @param string $p
-     * @return string
-     */
-    function sodium_crypto_scalarmult($n, $p)
-    {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
-    }
+	/**
+	 * @param string $n
+	 * @param string $p
+	 * @return string
+	 */
+	function sodium_crypto_scalarmult($n, $p)
+	{
+		return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+	}
 }
 if (!is_callable('sodium_crypto_scalarmult_base')) {
-    /**
-     * @param string $n
-     * @return string
-     */
-    function sodium_crypto_scalarmult_base($n)
-    {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
-    }
+	/**
+	 * @param string $n
+	 * @return string
+	 */
+	function sodium_crypto_scalarmult_base($n)
+	{
+		return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+	}
 }
 if (!is_callable('sodium_crypto_secretbox')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_secretbox($message, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_secretbox($message, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+	}
 }
 if (!is_callable('sodium_crypto_secretbox_open')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function sodium_crypto_secretbox_open($message, $nonce, $key)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string|bool
+	 */
+	function sodium_crypto_secretbox_open($message, $nonce, $key)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_shorthash')) {
-    /**
-     * @param string $message
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_shorthash($message, $key = '')
-    {
-        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_shorthash($message, $key = '')
+	{
+		return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+	}
 }
 if (!is_callable('sodium_crypto_sign')) {
-    /**
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    function sodium_crypto_sign($message, $sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
-    }
+	/**
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	function sodium_crypto_sign($message, $sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+	}
 }
 if (!is_callable('sodium_crypto_sign_detached')) {
-    /**
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    function sodium_crypto_sign_detached($message, $sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
-    }
+	/**
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	function sodium_crypto_sign_detached($message, $sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+	}
 }
 if (!is_callable('sodium_crypto_sign_keypair')) {
-    /**
-     * @return string
-     */
-    function sodium_crypto_sign_keypair()
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_keypair();
-    }
+	/**
+	 * @return string
+	 */
+	function sodium_crypto_sign_keypair()
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_keypair();
+	}
 }
 if (!is_callable('sodium_crypto_sign_open')) {
-    /**
-     * @param string $signedMessage
-     * @param string $pk
-     * @return string|bool
-     */
-    function sodium_crypto_sign_open($signedMessage, $pk)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $signedMessage
+	 * @param string $pk
+	 * @return string|bool
+	 */
+	function sodium_crypto_sign_open($signedMessage, $pk)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('sodium_crypto_sign_publickey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function sodium_crypto_sign_publickey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function sodium_crypto_sign_publickey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+	}
 }
 if (!is_callable('sodium_crypto_sign_publickey_from_secretkey')) {
-    /**
-     * @param string $sk
-     * @return string
-     */
-    function sodium_crypto_sign_publickey_from_secretkey($sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
-    }
+	/**
+	 * @param string $sk
+	 * @return string
+	 */
+	function sodium_crypto_sign_publickey_from_secretkey($sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+	}
 }
 if (!is_callable('sodium_crypto_sign_secretkey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function sodium_crypto_sign_secretkey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function sodium_crypto_sign_secretkey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+	}
 }
 if (!is_callable('sodium_crypto_sign_seed_keypair')) {
-    /**
-     * @param string $seed
-     * @return string
-     */
-    function sodium_crypto_sign_seed_keypair($seed)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
-    }
+	/**
+	 * @param string $seed
+	 * @return string
+	 */
+	function sodium_crypto_sign_seed_keypair($seed)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+	}
 }
 if (!is_callable('sodium_crypto_sign_verify_detached')) {
-    /**
-     * @param string $signature
-     * @param string $message
-     * @param string $pk
-     * @return bool
-     */
-    function sodium_crypto_sign_verify_detached($signature, $message, $pk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
-    }
+	/**
+	 * @param string $signature
+	 * @param string $message
+	 * @param string $pk
+	 * @return bool
+	 */
+	function sodium_crypto_sign_verify_detached($signature, $message, $pk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
+	}
 }
 if (!is_callable('sodium_crypto_stream')) {
-    /**
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_stream($len, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
-    }
+	/**
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_stream($len, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+	}
 }
 if (!is_callable('sodium_crypto_stream_xor')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function sodium_crypto_stream_xor($message, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function sodium_crypto_stream_xor($message, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+	}
 }
 if (!is_callable('sodium_hex2bin')) {
-    /**
-     * @param string $string
-     * @return string
-     */
-    function sodium_hex2bin($string)
-    {
-        return ParagonIE_Sodium_Compat::hex2bin($string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	function sodium_hex2bin($string)
+	{
+		return ParagonIE_Sodium_Compat::hex2bin($string);
+	}
 }
 if (!is_callable('sodium_increment')) {
-    /**
-     * @param &string $string
-     * @return void
-     */
-    function sodium_increment(&$string)
-    {
-        ParagonIE_Sodium_Compat::increment($string);
-    }
+	/**
+	 * @param &string $string
+	 * @return void
+	 */
+	function sodium_increment(&$string)
+	{
+		ParagonIE_Sodium_Compat::increment($string);
+	}
 }
 if (!is_callable('sodium_library_version_major')) {
-    /**
-     * @return int
-     */
-    function sodium_library_version_major()
-    {
-        return ParagonIE_Sodium_Compat::library_version_major();
-    }
+	/**
+	 * @return int
+	 */
+	function sodium_library_version_major()
+	{
+		return ParagonIE_Sodium_Compat::library_version_major();
+	}
 }
 if (!is_callable('sodium_library_version_minor')) {
-    /**
-     * @return int
-     */
-    function sodium_library_version_minor()
-    {
-        return ParagonIE_Sodium_Compat::library_version_minor();
-    }
+	/**
+	 * @return int
+	 */
+	function sodium_library_version_minor()
+	{
+		return ParagonIE_Sodium_Compat::library_version_minor();
+	}
 }
 if (!is_callable('sodium_version_string')) {
-    /**
-     * @return string
-     */
-    function sodium_version_string()
-    {
-        return ParagonIE_Sodium_Compat::version_string();
-    }
+	/**
+	 * @return string
+	 */
+	function sodium_version_string()
+	{
+		return ParagonIE_Sodium_Compat::version_string();
+	}
 }
 if (!is_callable('sodium_memcmp')) {
-    /**
-     * @param string $a
-     * @param string $b
-     * @return int
-     */
-    function sodium_memcmp($a, $b)
-    {
-        return ParagonIE_Sodium_Compat::memcmp($a, $b);
-    }
+	/**
+	 * @param string $a
+	 * @param string $b
+	 * @return int
+	 */
+	function sodium_memcmp($a, $b)
+	{
+		return ParagonIE_Sodium_Compat::memcmp($a, $b);
+	}
 }
 if (!is_callable('sodium_memzero')) {
-    /**
-     * @param string &$str
-     * @return void
-     */
-    function sodium_memzero(&$str)
-    {
-        ParagonIE_Sodium_Compat::memzero($str);
-    }
+	/**
+	 * @param string &$str
+	 * @return void
+	 */
+	function sodium_memzero(&$str)
+	{
+		ParagonIE_Sodium_Compat::memzero($str);
+	}
 }
 if (!is_callable('sodium_randombytes_buf')) {
-    /**
-     * @param int $amount
-     * @return string
-     */
-    function sodium_randombytes_buf($amount)
-    {
-        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
-    }
+	/**
+	 * @param int $amount
+	 * @return string
+	 */
+	function sodium_randombytes_buf($amount)
+	{
+		return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+	}
 }
 
 if (!is_callable('sodium_randombytes_uniform')) {
-    /**
-     * @param int $upperLimit
-     * @return int
-     */
-    function sodium_randombytes_uniform($upperLimit)
-    {
-        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
-    }
+	/**
+	 * @param int $upperLimit
+	 * @return int
+	 */
+	function sodium_randombytes_uniform($upperLimit)
+	{
+		return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+	}
 }
 
 if (!is_callable('sodium_randombytes_random16')) {
-    /**
-     * @return int
-     */
-    function sodium_randombytes_random16()
-    {
-        return ParagonIE_Sodium_Compat::randombytes_random16();
-    }
+	/**
+	 * @return int
+	 */
+	function sodium_randombytes_random16()
+	{
+		return ParagonIE_Sodium_Compat::randombytes_random16();
+	}
 }

Spacing +175 added lines, -175 removed lines

@@ -7,7 +7,7 @@ 
  * Thus, the functions or constants just proxy to the appropriate
  * ParagonIE_Sodium_Compat method or class constant, respectively.
  */
-foreach (array(
+foreach ( array(
     'CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES',
     'CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES',
     'CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES',
@@ -58,33 +58,33 @@ 
     'CRYPTO_STREAM_NONCEBYTES',
     ) as $constant
 ) {
-    if (!defined("SODIUM_$constant")) {
-        define("SODIUM_$constant", constant("ParagonIE_Sodium_Compat::$constant"));
+    if ( ! defined( "SODIUM_$constant" ) ) {
+        define( "SODIUM_$constant", constant( "ParagonIE_Sodium_Compat::$constant" ) );
     }
 }
 
-if (!is_callable('sodium_bin2hex')) {
+if ( ! is_callable( 'sodium_bin2hex' ) ) {
     /**
      * @param string $string
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $a
      * @param string $b
      * @return int
      */
-    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_chacha20poly1305_decrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_decrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -92,18 +92,18 @@ 
      * @param string $key
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -111,12 +111,12 @@ 
      * @param string $key
      * @return string
      */
-    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_ietf_decrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_chacha20poly1305_ietf_decrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -124,18 +124,18 @@ 
      * @param string $key
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -143,12 +143,12 @@ 
      * @param string $key
      * @return string
      */
-    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_xchacha20poly1305_ietf_decrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_xchacha20poly1305_ietf_decrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -156,18 +156,18 @@ 
      * @param string $key
      * @return string
      */
-    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);
-        } catch (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_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_xchacha20poly1305_ietf_encrypt')) {
+if ( ! is_callable( 'sodium_crypto_aead_xchacha20poly1305_ietf_encrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -175,47 +175,47 @@ 
      * @param string $key
      * @return string
      */
-    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);
+        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt( $message, $assocData, $nonce, $key );
     }
 }
-if (!is_callable('sodium_crypto_auth')) {
+if ( ! is_callable( 'sodium_crypto_auth' ) ) {
     /**
      * @param string $message
      * @param string $key
      * @return string
      */
-    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_verify')) {
+if ( ! is_callable( 'sodium_crypto_auth_verify' ) ) {
     /**
      * @param string $mac
      * @param string $message
      * @param string $key
      * @return bool
      */
-    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' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $kp
      * @return string
      */
-    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' ) ) {
     /**
      * @return string
      */
@@ -224,149 +224,149 @@ 
         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' ) ) {
     /**
      * @param string $sk
      * @param string $pk
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @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' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $sk
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $message
      * @param string $publicKey
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $message
      * @param string $kp
      * @return string|bool
      */
-    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 (Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_box_seal_open( $message, $kp );
+        } catch ( Error $ex ) {
             return false;
-        } catch (Exception $ex) {
+        } catch ( Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('sodium_crypto_box_secretkey')) {
+if ( ! is_callable( 'sodium_crypto_box_secretkey' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $seed
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $message
      * @param string|null $key
      * @param int $outLen
      * @return string
      */
-    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' ) ) {
     /**
      * @param string|null $ctx
      * @param int $outputLength
      * @return string
      */
-    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' ) ) {
     /**
      * @param string|null $key
      * @param int $outLen
      * @return string
      */
-    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_update')) {
+if ( ! is_callable( 'sodium_crypto_generichash_update' ) ) {
     /**
      * @param string|null $ctx
      * @param string $message
      * @return void
      */
-    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_kx')) {
+if ( ! is_callable( 'sodium_crypto_kx' ) ) {
     /**
      * @param string $my_secret
      * @param string $their_public
@@ -374,7 +374,7 @@ 
      * @param string $server_public
      * @return string
      */
-    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,
@@ -384,7 +384,7 @@ 
         );
     }
 }
-if (!is_callable('sodium_crypto_pwhash')) {
+if ( ! is_callable( 'sodium_crypto_pwhash' ) ) {
     /**
      * @param int $outlen
      * @param string $passwd
@@ -393,35 +393,35 @@ 
      * @param int $memlimit
      * @return string
      */
-    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+    function sodium_crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit );
     }
 }
-if (!is_callable('sodium_crypto_pwhash_str')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_str' ) ) {
     /**
      * @param string $passwd
      * @param int $opslimit
      * @param int $memlimit
      * @return string
      */
-    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_verify')) {
+if ( ! is_callable( 'sodium_crypto_pwhash_str_verify' ) ) {
     /**
      * @param string $passwd
      * @param string $hash
      * @return bool
      */
-    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' ) ) {
     /**
      * @param int $outlen
      * @param string $passwd
@@ -430,119 +430,119 @@ 
      * @param int $memlimit
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $passwd
      * @param int $opslimit
      * @param int $memlimit
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $passwd
      * @param string $hash
      * @return bool
      */
-    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' ) ) {
     /**
      * @param string $n
      * @param string $p
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $n
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    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_open')) {
+if ( ! is_callable( 'sodium_crypto_secretbox_open' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @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_shorthash')) {
+if ( ! is_callable( 'sodium_crypto_shorthash' ) ) {
     /**
      * @param string $message
      * @param string $key
      * @return string
      */
-    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_sign')) {
+if ( ! is_callable( 'sodium_crypto_sign' ) ) {
     /**
      * @param string $message
      * @param string $sk
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $message
      * @param string $sk
      * @return string
      */
-    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')) {
+if ( ! is_callable( 'sodium_crypto_sign_keypair' ) ) {
     /**
      * @return string
      */
@@ -551,120 +551,120 @@ 
         return ParagonIE_Sodium_Compat::crypto_sign_keypair();
     }
 }
-if (!is_callable('sodium_crypto_sign_open')) {
+if ( ! is_callable( 'sodium_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' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $sk
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $seed
      * @return string
      */
-    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' ) ) {
     /**
      * @param string $signature
      * @param string $message
      * @param string $pk
      * @return bool
      */
-    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_stream')) {
+if ( ! is_callable( 'sodium_crypto_stream' ) ) {
     /**
      * @param int $len
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    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_xor')) {
+if ( ! is_callable( 'sodium_crypto_stream_xor' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    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 );
     }
 }
-if (!is_callable('sodium_hex2bin')) {
+if ( ! is_callable( 'sodium_hex2bin' ) ) {
     /**
      * @param string $string
      * @return string
      */
-    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' ) ) {
     /**
      * @param &string $string
      * @return void
      */
-    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' ) ) {
     /**
      * @return int
      */
@@ -673,7 +673,7 @@ 
         return ParagonIE_Sodium_Compat::library_version_major();
     }
 }
-if (!is_callable('sodium_library_version_minor')) {
+if ( ! is_callable( 'sodium_library_version_minor' ) ) {
     /**
      * @return int
      */
@@ -682,7 +682,7 @@ 
         return ParagonIE_Sodium_Compat::library_version_minor();
     }
 }
-if (!is_callable('sodium_version_string')) {
+if ( ! is_callable( 'sodium_version_string' ) ) {
     /**
      * @return string
      */
@@ -691,50 +691,50 @@ 
         return ParagonIE_Sodium_Compat::version_string();
     }
 }
-if (!is_callable('sodium_memcmp')) {
+if ( ! is_callable( 'sodium_memcmp' ) ) {
     /**
      * @param string $a
      * @param string $b
      * @return int
      */
-    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' ) ) {
     /**
      * @param string &$str
      * @return void
      */
-    function sodium_memzero(&$str)
+    function sodium_memzero( &$str )
     {
-        ParagonIE_Sodium_Compat::memzero($str);
+        ParagonIE_Sodium_Compat::memzero( $str );
     }
 }
-if (!is_callable('sodium_randombytes_buf')) {
+if ( ! is_callable( 'sodium_randombytes_buf' ) ) {
     /**
      * @param int $amount
      * @return string
      */
-    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' ) ) {
     /**
      * @param int $upperLimit
      * @return int
      */
-    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' ) ) {
     /**
      * @return int
      */

Braces +57 added lines, -114 removed lines

@@ -68,8 +68,7 @@ 
      * @param string $string
      * @return string
      */
-    function sodium_bin2hex($string)
-    {
+    function sodium_bin2hex($string) {
         return ParagonIE_Sodium_Compat::bin2hex($string);
     }
 }
@@ -79,8 +78,7 @@ 
      * @param string $b
      * @return int
      */
-    function sodium_compare($a, $b)
-    {
+    function sodium_compare($a, $b) {
         return ParagonIE_Sodium_Compat::compare($a, $b);
     }
 }
@@ -92,8 +90,7 @@ 
      * @param string $key
      * @return string
      */
-    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) {
@@ -111,8 +108,7 @@ 
      * @param string $key
      * @return string
      */
-    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);
     }
 }
@@ -124,8 +120,7 @@ 
      * @param string $key
      * @return string
      */
-    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) {
@@ -143,8 +138,7 @@ 
      * @param string $key
      * @return string
      */
-    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);
     }
 }
@@ -156,8 +150,7 @@ 
      * @param string $key
      * @return string
      */
-    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);
         } catch (Error $ex) {
@@ -175,8 +168,7 @@ 
      * @param string $key
      * @return string
      */
-    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);
     }
 }
@@ -186,8 +178,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_auth($message, $key)
-    {
+    function sodium_crypto_auth($message, $key) {
         return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
     }
 }
@@ -198,8 +189,7 @@ 
      * @param string $key
      * @return bool
      */
-    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);
     }
 }
@@ -210,8 +200,7 @@ 
      * @param string $kp
      * @return string
      */
-    function sodium_crypto_box($message, $nonce, $kp)
-    {
+    function sodium_crypto_box($message, $nonce, $kp) {
         return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
     }
 }
@@ -219,8 +208,7 @@ 
     /**
      * @return string
      */
-    function sodium_crypto_box_keypair()
-    {
+    function sodium_crypto_box_keypair() {
         return ParagonIE_Sodium_Compat::crypto_box_keypair();
     }
 }
@@ -230,8 +218,7 @@ 
      * @param string $pk
      * @return string
      */
-    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);
     }
 }
@@ -242,8 +229,7 @@ 
      * @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) {
@@ -258,8 +244,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_box_publickey($keypair)
-    {
+    function sodium_crypto_box_publickey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
     }
 }
@@ -268,8 +253,7 @@ 
      * @param string $sk
      * @return string
      */
-    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);
     }
 }
@@ -279,8 +263,7 @@ 
      * @param string $publicKey
      * @return string
      */
-    function sodium_crypto_box_seal($message, $publicKey)
-    {
+    function sodium_crypto_box_seal($message, $publicKey) {
         return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
     }
 }
@@ -290,8 +273,7 @@ 
      * @param string $kp
      * @return string|bool
      */
-    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 (Error $ex) {
@@ -306,8 +288,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_box_secretkey($keypair)
-    {
+    function sodium_crypto_box_secretkey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
     }
 }
@@ -316,8 +297,7 @@ 
      * @param string $seed
      * @return string
      */
-    function sodium_crypto_box_seed_keypair($seed)
-    {
+    function sodium_crypto_box_seed_keypair($seed) {
         return ParagonIE_Sodium_Compat::crypto_box_seed_keypair($seed);
     }
 }
@@ -328,8 +308,7 @@ 
      * @param int $outLen
      * @return string
      */
-    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);
     }
 }
@@ -339,8 +318,7 @@ 
      * @param int $outputLength
      * @return string
      */
-    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);
     }
 }
@@ -350,8 +328,7 @@ 
      * @param int $outLen
      * @return string
      */
-    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);
     }
 }
@@ -361,8 +338,7 @@ 
      * @param string $message
      * @return void
      */
-    function sodium_crypto_generichash_update(&$ctx, $message = '')
-    {
+    function sodium_crypto_generichash_update(&$ctx, $message = '') {
         ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
     }
 }
@@ -374,8 +350,7 @@ 
      * @param string $server_public
      * @return string
      */
-    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,
             $their_public,
@@ -393,8 +368,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
+    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
     }
 }
@@ -405,8 +379,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    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);
     }
 }
@@ -416,8 +389,7 @@ 
      * @param string $hash
      * @return bool
      */
-    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);
     }
 }
@@ -430,8 +402,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    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);
     }
 }
@@ -442,8 +413,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    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);
     }
 }
@@ -453,8 +423,7 @@ 
      * @param string $hash
      * @return bool
      */
-    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);
     }
 }
@@ -464,8 +433,7 @@ 
      * @param string $p
      * @return string
      */
-    function sodium_crypto_scalarmult($n, $p)
-    {
+    function sodium_crypto_scalarmult($n, $p) {
         return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
     }
 }
@@ -474,8 +442,7 @@ 
      * @param string $n
      * @return string
      */
-    function sodium_crypto_scalarmult_base($n)
-    {
+    function sodium_crypto_scalarmult_base($n) {
         return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
     }
 }
@@ -486,8 +453,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_secretbox($message, $nonce, $key)
-    {
+    function sodium_crypto_secretbox($message, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
     }
 }
@@ -498,8 +464,7 @@ 
      * @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) {
@@ -515,8 +480,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_shorthash($message, $key = '')
-    {
+    function sodium_crypto_shorthash($message, $key = '') {
         return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
     }
 }
@@ -526,8 +490,7 @@ 
      * @param string $sk
      * @return string
      */
-    function sodium_crypto_sign($message, $sk)
-    {
+    function sodium_crypto_sign($message, $sk) {
         return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
     }
 }
@@ -537,8 +500,7 @@ 
      * @param string $sk
      * @return string
      */
-    function sodium_crypto_sign_detached($message, $sk)
-    {
+    function sodium_crypto_sign_detached($message, $sk) {
         return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
     }
 }
@@ -546,8 +508,7 @@ 
     /**
      * @return string
      */
-    function sodium_crypto_sign_keypair()
-    {
+    function sodium_crypto_sign_keypair() {
         return ParagonIE_Sodium_Compat::crypto_sign_keypair();
     }
 }
@@ -557,8 +518,7 @@ 
      * @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) {
@@ -573,8 +533,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_sign_publickey($keypair)
-    {
+    function sodium_crypto_sign_publickey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
     }
 }
@@ -583,8 +542,7 @@ 
      * @param string $sk
      * @return string
      */
-    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);
     }
 }
@@ -593,8 +551,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function sodium_crypto_sign_secretkey($keypair)
-    {
+    function sodium_crypto_sign_secretkey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
     }
 }
@@ -603,8 +560,7 @@ 
      * @param string $seed
      * @return string
      */
-    function sodium_crypto_sign_seed_keypair($seed)
-    {
+    function sodium_crypto_sign_seed_keypair($seed) {
         return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
     }
 }
@@ -615,8 +571,7 @@ 
      * @param string $pk
      * @return bool
      */
-    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);
     }
 }
@@ -627,8 +582,7 @@ 
      * @param string $key
      * @return string
      */
-    function sodium_crypto_stream($len, $nonce, $key)
-    {
+    function sodium_crypto_stream($len, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
     }
 }
@@ -639,8 +593,7 @@ 
      * @param string $key
      * @return string
      */
-    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);
     }
 }
@@ -649,8 +602,7 @@ 
      * @param string $string
      * @return string
      */
-    function sodium_hex2bin($string)
-    {
+    function sodium_hex2bin($string) {
         return ParagonIE_Sodium_Compat::hex2bin($string);
     }
 }
@@ -659,8 +611,7 @@ 
      * @param &string $string
      * @return void
      */
-    function sodium_increment(&$string)
-    {
+    function sodium_increment(&$string) {
         ParagonIE_Sodium_Compat::increment($string);
     }
 }
@@ -668,8 +619,7 @@ 
     /**
      * @return int
      */
-    function sodium_library_version_major()
-    {
+    function sodium_library_version_major() {
         return ParagonIE_Sodium_Compat::library_version_major();
     }
 }
@@ -677,8 +627,7 @@ 
     /**
      * @return int
      */
-    function sodium_library_version_minor()
-    {
+    function sodium_library_version_minor() {
         return ParagonIE_Sodium_Compat::library_version_minor();
     }
 }
@@ -686,8 +635,7 @@ 
     /**
      * @return string
      */
-    function sodium_version_string()
-    {
+    function sodium_version_string() {
         return ParagonIE_Sodium_Compat::version_string();
     }
 }
@@ -697,8 +645,7 @@ 
      * @param string $b
      * @return int
      */
-    function sodium_memcmp($a, $b)
-    {
+    function sodium_memcmp($a, $b) {
         return ParagonIE_Sodium_Compat::memcmp($a, $b);
     }
 }
@@ -707,8 +654,7 @@ 
      * @param string &$str
      * @return void
      */
-    function sodium_memzero(&$str)
-    {
+    function sodium_memzero(&$str) {
         ParagonIE_Sodium_Compat::memzero($str);
     }
 }
@@ -717,8 +663,7 @@ 
      * @param int $amount
      * @return string
      */
-    function sodium_randombytes_buf($amount)
-    {
+    function sodium_randombytes_buf($amount) {
         return ParagonIE_Sodium_Compat::randombytes_buf($amount);
     }
 }
@@ -728,8 +673,7 @@ 
      * @param int $upperLimit
      * @return int
      */
-    function sodium_randombytes_uniform($upperLimit)
-    {
+    function sodium_randombytes_uniform($upperLimit) {
         return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
     }
 }
@@ -738,8 +682,7 @@ 
     /**
      * @return int
      */
-    function sodium_randombytes_random16()
-    {
+    function sodium_randombytes_random16() {
         return ParagonIE_Sodium_Compat::randombytes_random16();
     }
 }

src/library/sodium_compat/lib/sodium_compat.php

Doc Comments +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
      * @param string $assocData
      * @param string $nonce
      * @param string $key
-     * @return string|bool
+     * @return string|false
      */
     function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
     {
@@ -69,7 +69,7 @@ 
      * @param string $assocData
      * @param string $nonce
      * @param string $key
-     * @return string|bool
+     * @return string|false
      */
     function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
     {
@@ -155,7 +155,7 @@ 
      * @param string $message
      * @param string $nonce
      * @param string $kp
-     * @return string|bool
+     * @return string|false
      */
     function crypto_box_open($message, $nonce, $kp)
     {
@@ -203,7 +203,7 @@ 
     /**
      * @param string $message
      * @param string $kp
-     * @return string|bool
+     * @return string|false
      */
     function crypto_box_seal_open($message, $kp)
     {
@@ -401,7 +401,7 @@ 
      * @param string $message
      * @param string $nonce
      * @param string $key
-     * @return string|bool
+     * @return string|false
      */
     function crypto_secretbox_open($message, $nonce, $key)
     {
@@ -460,7 +460,7 @@ 
     /**
      * @param string $signedMessage
      * @param string $pk
-     * @return string|bool
+     * @return string|false
      */
     function crypto_sign_open($signedMessage, $pk)
     {

Indentation +508 added lines, -508 removed lines

@@ -11,617 +11,617 @@
  * method.
  */
 if (!is_callable('\\Sodium\\bin2hex')) {
-    /**
-     * @param string $string
-     * @return string
-     */
-    function bin2hex($string)
-    {
-        return ParagonIE_Sodium_Compat::bin2hex($string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	function bin2hex($string)
+	{
+		return ParagonIE_Sodium_Compat::bin2hex($string);
+	}
 }
 if (!is_callable('\\Sodium\\compare')) {
-    /**
-     * @param string $a
-     * @param string $b
-     * @return int
-     */
-    function compare($a, $b)
-    {
-        return ParagonIE_Sodium_Compat::compare($a, $b);
-    }
+	/**
+	 * @param string $a
+	 * @param string $b
+	 * @return int
+	 */
+	function compare($a, $b)
+	{
+		return ParagonIE_Sodium_Compat::compare($a, $b);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_decrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function 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 false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string|bool
+	 */
+	function 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 false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_encrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function 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_ietf_decrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function 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 false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string|bool
+	 */
+	function 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 false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt')) {
-    /**
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $assocData
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function 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_auth')) {
-    /**
-     * @param string $message
-     * @param string $key
-     * @return string
-     */
-    function crypto_auth($message, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_auth($message, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_auth_verify')) {
-    /**
-     * @param string $mac
-     * @param string $message
-     * @param string $key
-     * @return bool
-     */
-    function crypto_auth_verify($mac, $message, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
-    }
+	/**
+	 * @param string $mac
+	 * @param string $message
+	 * @param string $key
+	 * @return bool
+	 */
+	function crypto_auth_verify($mac, $message, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $kp
-     * @return string
-     */
-    function crypto_box($message, $nonce, $kp)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $kp
+	 * @return string
+	 */
+	function crypto_box($message, $nonce, $kp)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_keypair')) {
-    /**
-     * @return string
-     */
-    function crypto_box_keypair()
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair();
-    }
+	/**
+	 * @return string
+	 */
+	function crypto_box_keypair()
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_keypair();
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey')) {
-    /**
-     * @param string $sk
-     * @param string $pk
-     * @return string
-     */
-    function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
-    }
+	/**
+	 * @param string $sk
+	 * @param string $pk
+	 * @return string
+	 */
+	function 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')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $kp
-     * @return string|bool
-     */
-    function crypto_box_open($message, $nonce, $kp)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $kp
+	 * @return string|bool
+	 */
+	function crypto_box_open($message, $nonce, $kp)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_publickey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function crypto_box_publickey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function crypto_box_publickey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_publickey_from_secretkey')) {
-    /**
-     * @param string $sk
-     * @return string
-     */
-    function crypto_box_publickey_from_secretkey($sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
-    }
+	/**
+	 * @param string $sk
+	 * @return string
+	 */
+	function crypto_box_publickey_from_secretkey($sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_seal')) {
-    /**
-     * @param string $message
-     * @param string $publicKey
-     * @return string
-     */
-    function crypto_box_seal($message, $publicKey)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
-    }
+	/**
+	 * @param string $message
+	 * @param string $publicKey
+	 * @return string
+	 */
+	function crypto_box_seal($message, $publicKey)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_seal_open')) {
-    /**
-     * @param string $message
-     * @param string $kp
-     * @return string|bool
-     */
-    function crypto_box_seal_open($message, $kp)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
-        } catch (\Error $ex) {
-            return false;
-        } catch (\Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $kp
+	 * @return string|bool
+	 */
+	function crypto_box_seal_open($message, $kp)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
+		} catch (\Error $ex) {
+			return false;
+		} catch (\Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_box_secretkey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function crypto_box_secretkey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function crypto_box_secretkey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_generichash')) {
-    /**
-     * @param string $message
-     * @param string|null $key
-     * @param int $outLen
-     * @return string
-     */
-    function crypto_generichash($message, $key = null, $outLen = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
-    }
+	/**
+	 * @param string $message
+	 * @param string|null $key
+	 * @param int $outLen
+	 * @return string
+	 */
+	function crypto_generichash($message, $key = null, $outLen = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_generichash_final')) {
-    /**
-     * @param string|null $ctx
-     * @param int $outputLength
-     * @return string
-     */
-    function crypto_generichash_final(&$ctx, $outputLength = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
-    }
+	/**
+	 * @param string|null $ctx
+	 * @param int $outputLength
+	 * @return string
+	 */
+	function crypto_generichash_final(&$ctx, $outputLength = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_generichash_init')) {
-    /**
-     * @param string|null $key
-     * @param int $outLen
-     * @return string
-     */
-    function crypto_generichash_init($key = null, $outLen = 32)
-    {
-        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
-    }
+	/**
+	 * @param string|null $key
+	 * @param int $outLen
+	 * @return string
+	 */
+	function crypto_generichash_init($key = null, $outLen = 32)
+	{
+		return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_generichash_update')) {
-    /**
-     * @param string|null $ctx
-     * @param string $message
-     * @return void
-     */
-    function crypto_generichash_update(&$ctx, $message = '')
-    {
-        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
-    }
+	/**
+	 * @param string|null $ctx
+	 * @param string $message
+	 * @return void
+	 */
+	function crypto_generichash_update(&$ctx, $message = '')
+	{
+		ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_kx')) {
-    /**
-     * @param string $my_secret
-     * @param string $their_public
-     * @param string $client_public
-     * @param string $server_public
-     * @return string
-     */
-    function crypto_kx($my_secret, $their_public, $client_public, $server_public)
-    {
-        return ParagonIE_Sodium_Compat::crypto_kx(
-            $my_secret,
-            $their_public,
-            $client_public,
-            $server_public
-        );
-    }
+	/**
+	 * @param string $my_secret
+	 * @param string $their_public
+	 * @param string $client_public
+	 * @param string $server_public
+	 * @return string
+	 */
+	function crypto_kx($my_secret, $their_public, $client_public, $server_public)
+	{
+		return ParagonIE_Sodium_Compat::crypto_kx(
+			$my_secret,
+			$their_public,
+			$client_public,
+			$server_public
+		);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_pwhash')) {
-    /**
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
-    }
+	/**
+	 * @param int $outlen
+	 * @param string $passwd
+	 * @param string $salt
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_pwhash_str')) {
-    /**
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function crypto_pwhash_str($passwd, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
-    }
+	/**
+	 * @param string $passwd
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function crypto_pwhash_str($passwd, $opslimit, $memlimit)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_pwhash_str_verify')) {
-    /**
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     */
-    function crypto_pwhash_str_verify($passwd, $hash)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
-    }
+	/**
+	 * @param string $passwd
+	 * @param string $hash
+	 * @return bool
+	 */
+	function crypto_pwhash_str_verify($passwd, $hash)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256')) {
-    /**
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
-    }
+	/**
+	 * @param int $outlen
+	 * @param string $passwd
+	 * @param string $salt
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function 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')) {
-    /**
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     */
-    function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
-    }
+	/**
+	 * @param string $passwd
+	 * @param int $opslimit
+	 * @param int $memlimit
+	 * @return string
+	 */
+	function 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')) {
-    /**
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     */
-    function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
-    {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
-    }
+	/**
+	 * @param string $passwd
+	 * @param string $hash
+	 * @return bool
+	 */
+	function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+	{
+		return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_scalarmult')) {
-    /**
-     * @param string $n
-     * @param string $p
-     * @return string
-     */
-    function crypto_scalarmult($n, $p)
-    {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
-    }
+	/**
+	 * @param string $n
+	 * @param string $p
+	 * @return string
+	 */
+	function crypto_scalarmult($n, $p)
+	{
+		return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_scalarmult_base')) {
-    /**
-     * @param string $n
-     * @return string
-     */
-    function crypto_scalarmult_base($n)
-    {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
-    }
+	/**
+	 * @param string $n
+	 * @return string
+	 */
+	function crypto_scalarmult_base($n)
+	{
+		return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_secretbox')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function crypto_secretbox($message, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_secretbox($message, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_secretbox_open')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function crypto_secretbox_open($message, $nonce, $key)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string|bool
+	 */
+	function crypto_secretbox_open($message, $nonce, $key)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
+		} catch (Error $ex) {
+			return false;
+		} catch (Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_shorthash')) {
-    /**
-     * @param string $message
-     * @param string $key
-     * @return string
-     */
-    function crypto_shorthash($message, $key = '')
-    {
-        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_shorthash($message, $key = '')
+	{
+		return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign')) {
-    /**
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    function crypto_sign($message, $sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
-    }
+	/**
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	function crypto_sign($message, $sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_detached')) {
-    /**
-     * @param string $message
-     * @param string $sk
-     * @return string
-     */
-    function crypto_sign_detached($message, $sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
-    }
+	/**
+	 * @param string $message
+	 * @param string $sk
+	 * @return string
+	 */
+	function crypto_sign_detached($message, $sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_keypair')) {
-    /**
-     * @return string
-     */
-    function crypto_sign_keypair()
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_keypair();
-    }
+	/**
+	 * @return string
+	 */
+	function crypto_sign_keypair()
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_keypair();
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_open')) {
-    /**
-     * @param string $signedMessage
-     * @param string $pk
-     * @return string|bool
-     */
-    function crypto_sign_open($signedMessage, $pk)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
-        } catch (\Error $ex) {
-            return false;
-        } catch (\Exception $ex) {
-            return false;
-        }
-    }
+	/**
+	 * @param string $signedMessage
+	 * @param string $pk
+	 * @return string|bool
+	 */
+	function crypto_sign_open($signedMessage, $pk)
+	{
+		try {
+			return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
+		} catch (\Error $ex) {
+			return false;
+		} catch (\Exception $ex) {
+			return false;
+		}
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_publickey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function crypto_sign_publickey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function crypto_sign_publickey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_publickey_from_secretkey')) {
-    /**
-     * @param string $sk
-     * @return string
-     */
-    function crypto_sign_publickey_from_secretkey($sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
-    }
+	/**
+	 * @param string $sk
+	 * @return string
+	 */
+	function crypto_sign_publickey_from_secretkey($sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_secretkey')) {
-    /**
-     * @param string $keypair
-     * @return string
-     */
-    function crypto_sign_secretkey($keypair)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
-    }
+	/**
+	 * @param string $keypair
+	 * @return string
+	 */
+	function crypto_sign_secretkey($keypair)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_seed_keypair')) {
-    /**
-     * @param string $seed
-     * @return string
-     */
-    function crypto_sign_seed_keypair($seed)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
-    }
+	/**
+	 * @param string $seed
+	 * @return string
+	 */
+	function crypto_sign_seed_keypair($seed)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_sign_verify_detached')) {
-    /**
-     * @param string $signature
-     * @param string $message
-     * @param string $pk
-     * @return bool
-     */
-    function crypto_sign_verify_detached($signature, $message, $pk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
-    }
+	/**
+	 * @param string $signature
+	 * @param string $message
+	 * @param string $pk
+	 * @return bool
+	 */
+	function 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_sk_to_curve25519')) {
-    /**
-     * @param string $sk
-     * @return string
-     */
-    function crypto_sign_ed25519_sk_to_curve25519($sk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
-    }
+	/**
+	 * @param string $sk
+	 * @return string
+	 */
+	function crypto_sign_ed25519_sk_to_curve25519($sk)
+	{
+		return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_stream')) {
-    /**
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function crypto_stream($len, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
-    }
+	/**
+	 * @param int $len
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_stream($len, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+	}
 }
 if (!is_callable('\\Sodium\\crypto_stream_xor')) {
-    /**
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     */
-    function crypto_stream_xor($message, $nonce, $key)
-    {
-        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
-    }
+	/**
+	 * @param string $message
+	 * @param string $nonce
+	 * @param string $key
+	 * @return string
+	 */
+	function crypto_stream_xor($message, $nonce, $key)
+	{
+		return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+	}
 }
 if (!is_callable('\\Sodium\\hex2bin')) {
-    /**
-     * @param string $string
-     * @return string
-     */
-    function hex2bin($string)
-    {
-        return ParagonIE_Sodium_Compat::hex2bin($string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	function hex2bin($string)
+	{
+		return ParagonIE_Sodium_Compat::hex2bin($string);
+	}
 }
 if (!is_callable('\\Sodium\\memcmp')) {
-    /**
-     * @param string $a
-     * @param string $b
-     * @return int
-     */
-    function memcmp($a, $b)
-    {
-        return ParagonIE_Sodium_Compat::memcmp($a, $b);
-    }
+	/**
+	 * @param string $a
+	 * @param string $b
+	 * @return int
+	 */
+	function memcmp($a, $b)
+	{
+		return ParagonIE_Sodium_Compat::memcmp($a, $b);
+	}
 }
 if (!is_callable('\\Sodium\\memzero')) {
-    /**
-     * @param string $str
-     * @return void
-     */
-    function memzero(&$str)
-    {
-        ParagonIE_Sodium_Compat::memzero($str);
-    }
+	/**
+	 * @param string $str
+	 * @return void
+	 */
+	function memzero(&$str)
+	{
+		ParagonIE_Sodium_Compat::memzero($str);
+	}
 }
 if (!is_callable('\\Sodium\\randombytes_buf')) {
-    /**
-     * @param int $amount
-     * @return string
-     */
-    function randombytes_buf($amount)
-    {
-        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
-    }
+	/**
+	 * @param int $amount
+	 * @return string
+	 */
+	function randombytes_buf($amount)
+	{
+		return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+	}
 }
 
 if (!is_callable('\\Sodium\\randombytes_uniform')) {
-    /**
-     * @param int $upperLimit
-     * @return int
-     */
-    function randombytes_uniform($upperLimit)
-    {
-        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
-    }
+	/**
+	 * @param int $upperLimit
+	 * @return int
+	 */
+	function randombytes_uniform($upperLimit)
+	{
+		return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+	}
 }
 
 if (!is_callable('\\Sodium\\randombytes_random16')) {
-    /**
-     * @return int
-     */
-    function randombytes_random16()
-    {
-        return ParagonIE_Sodium_Compat::randombytes_random16();
-    }
+	/**
+	 * @return int
+	 */
+	function randombytes_random16()
+	{
+		return ParagonIE_Sodium_Compat::randombytes_random16();
+	}
 }
 
 if (!defined('\\Sodium\\CRYPTO_AUTH_BYTES')) {
-    require_once dirname(__FILE__) . '/constants.php';
+	require_once dirname(__FILE__) . '/constants.php';
 }

Spacing +160 added lines, -160 removed lines

@@ -10,28 +10,28 @@ 
  * Thus, the functions just proxy to the appropriate ParagonIE_Sodium_Compat
  * method.
  */
-if (!is_callable('\\Sodium\\bin2hex')) {
+if ( ! is_callable( '\\Sodium\\bin2hex' ) ) {
     /**
      * @param string $string
      * @return string
      */
-    function bin2hex($string)
+    function bin2hex( $string )
     {
-        return ParagonIE_Sodium_Compat::bin2hex($string);
+        return ParagonIE_Sodium_Compat::bin2hex( $string );
     }
 }
-if (!is_callable('\\Sodium\\compare')) {
+if ( ! is_callable( '\\Sodium\\compare' ) ) {
     /**
      * @param string $a
      * @param string $b
      * @return int
      */
-    function compare($a, $b)
+    function compare( $a, $b )
     {
-        return ParagonIE_Sodium_Compat::compare($a, $b);
+        return ParagonIE_Sodium_Compat::compare( $a, $b );
     }
 }
-if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_decrypt')) {
+if ( ! is_callable( '\\Sodium\\crypto_aead_chacha20poly1305_decrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -39,18 +39,18 @@ 
      * @param string $key
      * @return string|bool
      */
-    function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
+    function 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' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -58,12 +58,12 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
+    function 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_ietf_decrypt')) {
+if ( ! is_callable( '\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -71,18 +71,18 @@ 
      * @param string $key
      * @return string|bool
      */
-    function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    function 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' ) ) {
     /**
      * @param string $message
      * @param string $assocData
@@ -90,47 +90,47 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    function 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_auth')) {
+if ( ! is_callable( '\\Sodium\\crypto_auth' ) ) {
     /**
      * @param string $message
      * @param string $key
      * @return string
      */
-    function crypto_auth($message, $key)
+    function 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_verify')) {
+if ( ! is_callable( '\\Sodium\\crypto_auth_verify' ) ) {
     /**
      * @param string $mac
      * @param string $message
      * @param string $key
      * @return bool
      */
-    function crypto_auth_verify($mac, $message, $key)
+    function 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' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $kp
      * @return string
      */
-    function crypto_box($message, $nonce, $kp)
+    function 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' ) ) {
     /**
      * @return string
      */
@@ -139,139 +139,139 @@ 
         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' ) ) {
     /**
      * @param string $sk
      * @param string $pk
      * @return string
      */
-    function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
+    function 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' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $kp
      * @return string|bool
      */
-    function crypto_box_open($message, $nonce, $kp)
+    function 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' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function crypto_box_publickey($keypair)
+    function 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' ) ) {
     /**
      * @param string $sk
      * @return string
      */
-    function crypto_box_publickey_from_secretkey($sk)
+    function 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' ) ) {
     /**
      * @param string $message
      * @param string $publicKey
      * @return string
      */
-    function crypto_box_seal($message, $publicKey)
+    function 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' ) ) {
     /**
      * @param string $message
      * @param string $kp
      * @return string|bool
      */
-    function crypto_box_seal_open($message, $kp)
+    function crypto_box_seal_open( $message, $kp )
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
-        } catch (\Error $ex) {
+            return ParagonIE_Sodium_Compat::crypto_box_seal_open( $message, $kp );
+        } catch ( \Error $ex ) {
             return false;
-        } catch (\Exception $ex) {
+        } catch ( \Exception $ex ) {
             return false;
         }
     }
 }
-if (!is_callable('\\Sodium\\crypto_box_secretkey')) {
+if ( ! is_callable( '\\Sodium\\crypto_box_secretkey' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function crypto_box_secretkey($keypair)
+    function 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_generichash')) {
+if ( ! is_callable( '\\Sodium\\crypto_generichash' ) ) {
     /**
      * @param string $message
      * @param string|null $key
      * @param int $outLen
      * @return string
      */
-    function crypto_generichash($message, $key = null, $outLen = 32)
+    function 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' ) ) {
     /**
      * @param string|null $ctx
      * @param int $outputLength
      * @return string
      */
-    function crypto_generichash_final(&$ctx, $outputLength = 32)
+    function 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' ) ) {
     /**
      * @param string|null $key
      * @param int $outLen
      * @return string
      */
-    function crypto_generichash_init($key = null, $outLen = 32)
+    function 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_update')) {
+if ( ! is_callable( '\\Sodium\\crypto_generichash_update' ) ) {
     /**
      * @param string|null $ctx
      * @param string $message
      * @return void
      */
-    function crypto_generichash_update(&$ctx, $message = '')
+    function 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_kx')) {
+if ( ! is_callable( '\\Sodium\\crypto_kx' ) ) {
     /**
      * @param string $my_secret
      * @param string $their_public
@@ -279,7 +279,7 @@ 
      * @param string $server_public
      * @return string
      */
-    function crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    function crypto_kx( $my_secret, $their_public, $client_public, $server_public )
     {
         return ParagonIE_Sodium_Compat::crypto_kx(
             $my_secret,
@@ -289,7 +289,7 @@ 
         );
     }
 }
-if (!is_callable('\\Sodium\\crypto_pwhash')) {
+if ( ! is_callable( '\\Sodium\\crypto_pwhash' ) ) {
     /**
      * @param int $outlen
      * @param string $passwd
@@ -298,35 +298,35 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+    function crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit )
     {
-        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+        return ParagonIE_Sodium_Compat::crypto_pwhash( $outlen, $passwd, $salt, $opslimit, $memlimit );
     }
 }
-if (!is_callable('\\Sodium\\crypto_pwhash_str')) {
+if ( ! is_callable( '\\Sodium\\crypto_pwhash_str' ) ) {
     /**
      * @param string $passwd
      * @param int $opslimit
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_str($passwd, $opslimit, $memlimit)
+    function 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_verify')) {
+if ( ! is_callable( '\\Sodium\\crypto_pwhash_str_verify' ) ) {
     /**
      * @param string $passwd
      * @param string $hash
      * @return bool
      */
-    function crypto_pwhash_str_verify($passwd, $hash)
+    function 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' ) ) {
     /**
      * @param int $outlen
      * @param string $passwd
@@ -335,119 +335,119 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+    function 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' ) ) {
     /**
      * @param string $passwd
      * @param int $opslimit
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+    function 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' ) ) {
     /**
      * @param string $passwd
      * @param string $hash
      * @return bool
      */
-    function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+    function 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' ) ) {
     /**
      * @param string $n
      * @param string $p
      * @return string
      */
-    function crypto_scalarmult($n, $p)
+    function 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' ) ) {
     /**
      * @param string $n
      * @return string
      */
-    function crypto_scalarmult_base($n)
+    function 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' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    function crypto_secretbox($message, $nonce, $key)
+    function 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_open')) {
+if ( ! is_callable( '\\Sodium\\crypto_secretbox_open' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string|bool
      */
-    function crypto_secretbox_open($message, $nonce, $key)
+    function 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_shorthash')) {
+if ( ! is_callable( '\\Sodium\\crypto_shorthash' ) ) {
     /**
      * @param string $message
      * @param string $key
      * @return string
      */
-    function crypto_shorthash($message, $key = '')
+    function 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_sign')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign' ) ) {
     /**
      * @param string $message
      * @param string $sk
      * @return string
      */
-    function crypto_sign($message, $sk)
+    function 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' ) ) {
     /**
      * @param string $message
      * @param string $sk
      * @return string
      */
-    function crypto_sign_detached($message, $sk)
+    function 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')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_keypair' ) ) {
     /**
      * @return string
      */
@@ -456,163 +456,163 @@ 
         return ParagonIE_Sodium_Compat::crypto_sign_keypair();
     }
 }
-if (!is_callable('\\Sodium\\crypto_sign_open')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_open' ) ) {
     /**
      * @param string $signedMessage
      * @param string $pk
      * @return string|bool
      */
-    function crypto_sign_open($signedMessage, $pk)
+    function 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' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function crypto_sign_publickey($keypair)
+    function 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' ) ) {
     /**
      * @param string $sk
      * @return string
      */
-    function crypto_sign_publickey_from_secretkey($sk)
+    function 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' ) ) {
     /**
      * @param string $keypair
      * @return string
      */
-    function crypto_sign_secretkey($keypair)
+    function 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' ) ) {
     /**
      * @param string $seed
      * @return string
      */
-    function crypto_sign_seed_keypair($seed)
+    function 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' ) ) {
     /**
      * @param string $signature
      * @param string $message
      * @param string $pk
      * @return bool
      */
-    function crypto_sign_verify_detached($signature, $message, $pk)
+    function 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_sk_to_curve25519')) {
+if ( ! is_callable( '\\Sodium\\crypto_sign_ed25519_sk_to_curve25519' ) ) {
     /**
      * @param string $sk
      * @return string
      */
-    function crypto_sign_ed25519_sk_to_curve25519($sk)
+    function 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' ) ) {
     /**
      * @param int $len
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    function crypto_stream($len, $nonce, $key)
+    function 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_xor')) {
+if ( ! is_callable( '\\Sodium\\crypto_stream_xor' ) ) {
     /**
      * @param string $message
      * @param string $nonce
      * @param string $key
      * @return string
      */
-    function crypto_stream_xor($message, $nonce, $key)
+    function 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 );
     }
 }
-if (!is_callable('\\Sodium\\hex2bin')) {
+if ( ! is_callable( '\\Sodium\\hex2bin' ) ) {
     /**
      * @param string $string
      * @return string
      */
-    function hex2bin($string)
+    function hex2bin( $string )
     {
-        return ParagonIE_Sodium_Compat::hex2bin($string);
+        return ParagonIE_Sodium_Compat::hex2bin( $string );
     }
 }
-if (!is_callable('\\Sodium\\memcmp')) {
+if ( ! is_callable( '\\Sodium\\memcmp' ) ) {
     /**
      * @param string $a
      * @param string $b
      * @return int
      */
-    function memcmp($a, $b)
+    function 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' ) ) {
     /**
      * @param string $str
      * @return void
      */
-    function memzero(&$str)
+    function memzero( &$str )
     {
-        ParagonIE_Sodium_Compat::memzero($str);
+        ParagonIE_Sodium_Compat::memzero( $str );
     }
 }
-if (!is_callable('\\Sodium\\randombytes_buf')) {
+if ( ! is_callable( '\\Sodium\\randombytes_buf' ) ) {
     /**
      * @param int $amount
      * @return string
      */
-    function randombytes_buf($amount)
+    function 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' ) ) {
     /**
      * @param int $upperLimit
      * @return int
      */
-    function randombytes_uniform($upperLimit)
+    function 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' ) ) {
     /**
      * @return int
      */
@@ -622,6 +622,6 @@ 
     }
 }
 
-if (!defined('\\Sodium\\CRYPTO_AUTH_BYTES')) {
-    require_once dirname(__FILE__) . '/constants.php';
+if ( ! defined( '\\Sodium\\CRYPTO_AUTH_BYTES' ) ) {
+    require_once dirname( __FILE__ ) . '/constants.php';
 }

Braces +51 added lines, -102 removed lines

@@ -15,8 +15,7 @@ 
      * @param string $string
      * @return string
      */
-    function bin2hex($string)
-    {
+    function bin2hex($string) {
         return ParagonIE_Sodium_Compat::bin2hex($string);
     }
 }
@@ -26,8 +25,7 @@ 
      * @param string $b
      * @return int
      */
-    function compare($a, $b)
-    {
+    function compare($a, $b) {
         return ParagonIE_Sodium_Compat::compare($a, $b);
     }
 }
@@ -39,8 +37,7 @@ 
      * @param string $key
      * @return string|bool
      */
-    function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
-    {
+    function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key) {
         try {
             return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
         } catch (Error $ex) {
@@ -58,8 +55,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
-    {
+    function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
     }
 }
@@ -71,8 +67,7 @@ 
      * @param string $key
      * @return string|bool
      */
-    function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
-    {
+    function 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) {
@@ -90,8 +85,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
-    {
+    function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
     }
 }
@@ -101,8 +95,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_auth($message, $key)
-    {
+    function crypto_auth($message, $key) {
         return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
     }
 }
@@ -113,8 +106,7 @@ 
      * @param string $key
      * @return bool
      */
-    function crypto_auth_verify($mac, $message, $key)
-    {
+    function crypto_auth_verify($mac, $message, $key) {
         return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
     }
 }
@@ -125,8 +117,7 @@ 
      * @param string $kp
      * @return string
      */
-    function crypto_box($message, $nonce, $kp)
-    {
+    function crypto_box($message, $nonce, $kp) {
         return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
     }
 }
@@ -134,8 +125,7 @@ 
     /**
      * @return string
      */
-    function crypto_box_keypair()
-    {
+    function crypto_box_keypair() {
         return ParagonIE_Sodium_Compat::crypto_box_keypair();
     }
 }
@@ -145,8 +135,7 @@ 
      * @param string $pk
      * @return string
      */
-    function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
-    {
+    function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk) {
         return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
     }
 }
@@ -157,8 +146,7 @@ 
      * @param string $kp
      * @return string|bool
      */
-    function crypto_box_open($message, $nonce, $kp)
-    {
+    function crypto_box_open($message, $nonce, $kp) {
         try {
             return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
         } catch (Error $ex) {
@@ -173,8 +161,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function crypto_box_publickey($keypair)
-    {
+    function crypto_box_publickey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
     }
 }
@@ -183,8 +170,7 @@ 
      * @param string $sk
      * @return string
      */
-    function crypto_box_publickey_from_secretkey($sk)
-    {
+    function crypto_box_publickey_from_secretkey($sk) {
         return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
     }
 }
@@ -194,8 +180,7 @@ 
      * @param string $publicKey
      * @return string
      */
-    function crypto_box_seal($message, $publicKey)
-    {
+    function crypto_box_seal($message, $publicKey) {
         return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
     }
 }
@@ -205,8 +190,7 @@ 
      * @param string $kp
      * @return string|bool
      */
-    function crypto_box_seal_open($message, $kp)
-    {
+    function crypto_box_seal_open($message, $kp) {
         try {
             return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
         } catch (\Error $ex) {
@@ -221,8 +205,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function crypto_box_secretkey($keypair)
-    {
+    function crypto_box_secretkey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
     }
 }
@@ -233,8 +216,7 @@ 
      * @param int $outLen
      * @return string
      */
-    function crypto_generichash($message, $key = null, $outLen = 32)
-    {
+    function crypto_generichash($message, $key = null, $outLen = 32) {
         return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
     }
 }
@@ -244,8 +226,7 @@ 
      * @param int $outputLength
      * @return string
      */
-    function crypto_generichash_final(&$ctx, $outputLength = 32)
-    {
+    function crypto_generichash_final(&$ctx, $outputLength = 32) {
         return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
     }
 }
@@ -255,8 +236,7 @@ 
      * @param int $outLen
      * @return string
      */
-    function crypto_generichash_init($key = null, $outLen = 32)
-    {
+    function crypto_generichash_init($key = null, $outLen = 32) {
         return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
     }
 }
@@ -266,8 +246,7 @@ 
      * @param string $message
      * @return void
      */
-    function crypto_generichash_update(&$ctx, $message = '')
-    {
+    function crypto_generichash_update(&$ctx, $message = '') {
         ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
     }
 }
@@ -279,8 +258,7 @@ 
      * @param string $server_public
      * @return string
      */
-    function crypto_kx($my_secret, $their_public, $client_public, $server_public)
-    {
+    function crypto_kx($my_secret, $their_public, $client_public, $server_public) {
         return ParagonIE_Sodium_Compat::crypto_kx(
             $my_secret,
             $their_public,
@@ -298,8 +276,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
+    function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
     }
 }
@@ -310,8 +287,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_str($passwd, $opslimit, $memlimit)
-    {
+    function crypto_pwhash_str($passwd, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
     }
 }
@@ -321,8 +297,7 @@ 
      * @param string $hash
      * @return bool
      */
-    function crypto_pwhash_str_verify($passwd, $hash)
-    {
+    function crypto_pwhash_str_verify($passwd, $hash) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
     }
 }
@@ -335,8 +310,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
-    {
+    function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
     }
 }
@@ -347,8 +321,7 @@ 
      * @param int $memlimit
      * @return string
      */
-    function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
-    {
+    function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
     }
 }
@@ -358,8 +331,7 @@ 
      * @param string $hash
      * @return bool
      */
-    function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
-    {
+    function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash) {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
     }
 }
@@ -369,8 +341,7 @@ 
      * @param string $p
      * @return string
      */
-    function crypto_scalarmult($n, $p)
-    {
+    function crypto_scalarmult($n, $p) {
         return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
     }
 }
@@ -379,8 +350,7 @@ 
      * @param string $n
      * @return string
      */
-    function crypto_scalarmult_base($n)
-    {
+    function crypto_scalarmult_base($n) {
         return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
     }
 }
@@ -391,8 +361,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_secretbox($message, $nonce, $key)
-    {
+    function crypto_secretbox($message, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
     }
 }
@@ -403,8 +372,7 @@ 
      * @param string $key
      * @return string|bool
      */
-    function crypto_secretbox_open($message, $nonce, $key)
-    {
+    function crypto_secretbox_open($message, $nonce, $key) {
         try {
             return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
         } catch (Error $ex) {
@@ -420,8 +388,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_shorthash($message, $key = '')
-    {
+    function crypto_shorthash($message, $key = '') {
         return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
     }
 }
@@ -431,8 +398,7 @@ 
      * @param string $sk
      * @return string
      */
-    function crypto_sign($message, $sk)
-    {
+    function crypto_sign($message, $sk) {
         return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
     }
 }
@@ -442,8 +408,7 @@ 
      * @param string $sk
      * @return string
      */
-    function crypto_sign_detached($message, $sk)
-    {
+    function crypto_sign_detached($message, $sk) {
         return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
     }
 }
@@ -451,8 +416,7 @@ 
     /**
      * @return string
      */
-    function crypto_sign_keypair()
-    {
+    function crypto_sign_keypair() {
         return ParagonIE_Sodium_Compat::crypto_sign_keypair();
     }
 }
@@ -462,8 +426,7 @@ 
      * @param string $pk
      * @return string|bool
      */
-    function crypto_sign_open($signedMessage, $pk)
-    {
+    function crypto_sign_open($signedMessage, $pk) {
         try {
             return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
         } catch (\Error $ex) {
@@ -478,8 +441,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function crypto_sign_publickey($keypair)
-    {
+    function crypto_sign_publickey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
     }
 }
@@ -488,8 +450,7 @@ 
      * @param string $sk
      * @return string
      */
-    function crypto_sign_publickey_from_secretkey($sk)
-    {
+    function crypto_sign_publickey_from_secretkey($sk) {
         return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
     }
 }
@@ -498,8 +459,7 @@ 
      * @param string $keypair
      * @return string
      */
-    function crypto_sign_secretkey($keypair)
-    {
+    function crypto_sign_secretkey($keypair) {
         return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
     }
 }
@@ -508,8 +468,7 @@ 
      * @param string $seed
      * @return string
      */
-    function crypto_sign_seed_keypair($seed)
-    {
+    function crypto_sign_seed_keypair($seed) {
         return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
     }
 }
@@ -520,8 +479,7 @@ 
      * @param string $pk
      * @return bool
      */
-    function crypto_sign_verify_detached($signature, $message, $pk)
-    {
+    function crypto_sign_verify_detached($signature, $message, $pk) {
         return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
     }
 }
@@ -530,8 +488,7 @@ 
      * @param string $sk
      * @return string
      */
-    function crypto_sign_ed25519_sk_to_curve25519($sk)
-    {
+    function crypto_sign_ed25519_sk_to_curve25519($sk) {
         return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
     }
 }
@@ -542,8 +499,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_stream($len, $nonce, $key)
-    {
+    function crypto_stream($len, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
     }
 }
@@ -554,8 +510,7 @@ 
      * @param string $key
      * @return string
      */
-    function crypto_stream_xor($message, $nonce, $key)
-    {
+    function crypto_stream_xor($message, $nonce, $key) {
         return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
     }
 }
@@ -564,8 +519,7 @@ 
      * @param string $string
      * @return string
      */
-    function hex2bin($string)
-    {
+    function hex2bin($string) {
         return ParagonIE_Sodium_Compat::hex2bin($string);
     }
 }
@@ -575,8 +529,7 @@ 
      * @param string $b
      * @return int
      */
-    function memcmp($a, $b)
-    {
+    function memcmp($a, $b) {
         return ParagonIE_Sodium_Compat::memcmp($a, $b);
     }
 }
@@ -585,8 +538,7 @@ 
      * @param string $str
      * @return void
      */
-    function memzero(&$str)
-    {
+    function memzero(&$str) {
         ParagonIE_Sodium_Compat::memzero($str);
     }
 }
@@ -595,8 +547,7 @@ 
      * @param int $amount
      * @return string
      */
-    function randombytes_buf($amount)
-    {
+    function randombytes_buf($amount) {
         return ParagonIE_Sodium_Compat::randombytes_buf($amount);
     }
 }
@@ -606,8 +557,7 @@ 
      * @param int $upperLimit
      * @return int
      */
-    function randombytes_uniform($upperLimit)
-    {
+    function randombytes_uniform($upperLimit) {
         return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
     }
 }
@@ -616,8 +566,7 @@ 
     /**
      * @return int
      */
-    function randombytes_random16()
-    {
+    function randombytes_random16() {
         return ParagonIE_Sodium_Compat::randombytes_random16();
     }
 }