gravityview / GravityView

includes/fields/class-gravityview-field-fileupload.php

Spacing +23 added lines, -23 removed lines

@@ -26,21 +26,21 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		unset( $field_options['search_filter'] );
+		unset( $field_options[ 'search_filter' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$add_options['link_to_file'] = array(
+		$add_options[ 'link_to_file' ] = array(
 			'type' => 'checkbox',
 			'label' => __( 'Display as a Link:', 'gravityview' ),
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
 			'value' => false,
 			'merge_tags' => false,
 		);
 
-		$add_options['image_width'] = array(
+		$add_options[ 'image_width' ] = array(
 			'type' => 'text',
 			'label' => __( 'Custom Width:', 'gravityview' ),
 			'desc' => __( 'Override the default image width (250).', 'gravityview' ),
@@ -158,14 +158,14 @@ 
 			$base_id = null;
 
 			$is_single = gravityview_get_context() === 'single';
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
 			$field_compat = $gravityview_view->getCurrentField();
 		}
 
 		$output_arr = array();
 
 		// Get an array of file paths for the field.
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
 
 		// The $value JSON was probably truncated; let's check lead_detail_long.
 		if ( ! is_array( $file_paths ) ) {
@@ -185,7 +185,7 @@ 
 			$rendered = null;
 
 			// If the site is HTTPS, use HTTPS
-			if ( function_exists('set_url_scheme') ) {
+			if ( function_exists( 'set_url_scheme' ) ) {
 				$file_path = set_url_scheme( $file_path );
 			}
 
@@ -196,7 +196,7 @@ 
 			$file_path_info = pathinfo( $file_path );
 
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
 
 			/**
 			 * @filter `gravityview/fields/fileupload/extension` Modify the file extension before it's used in display logic
@@ -206,7 +206,7 @@ 
 			 */
 			$extension = apply_filters( 'gravityview/fields/fileupload/extension', $extension, $file_path );
 
-			$basename = $file_path_info['basename'];
+			$basename = $file_path_info[ 'basename' ];
 
 			// Get the secure download URL
 			$is_secure = false;
@@ -246,7 +246,7 @@ 
 					 */
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
 					), $context );
 
 					/**
@@ -275,7 +275,7 @@ 
 					 */
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
 					), $context );
 
 					/**
@@ -299,20 +299,20 @@ 
 					$file_path = add_query_arg( array( 'gv-iframe' => 'true' ), $file_path );
 				}
 
-				$field_settings['link_to_file'] = true;
+				$field_settings[ 'link_to_file' ] = true;
 
 			// Images
 			} else if ( in_array( $extension, GravityView_Image::get_image_extensions() ) ) {
 				$width = \GV\Utils::get( $field_settings, 'image_width', 250 );
 				$image_atts = array(
 					'src'   => $file_path,
-					'class' => 'gv-image gv-field-id-' . $field_settings['id'],
-					'alt'   => $field_settings['label'],
-					'width' => ( $is_single ? null : ( $width ? $width: 250 ) )
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
+					'alt'   => $field_settings[ 'label' ],
+					'width' => ( $is_single ? null : ( $width ? $width : 250 ) )
 				);
 
 				if ( $is_secure ) {
-					$image_atts['validate_src'] = false;
+					$image_atts[ 'validate_src' ] = false;
 				}
 
 				/**
@@ -333,7 +333,7 @@ 
 
 				unset( $gv_entry );
 
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) ) {
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) ) {
 
 					$lightbox_link_atts = array(
 						'rel'   => sprintf( "%s-%s", $gv_class, $entry_slug ),
@@ -348,13 +348,13 @@ 
 				}
 
 				// Show as link should render the image regardless.
-				if ( ! empty( $field_settings['show_as_link'] ) ) {
+				if ( ! empty( $field_settings[ 'show_as_link' ] ) ) {
 					$text = $rendered;
 				}
 			}
 			// For all other non-media file types (ZIP, for example), always show as a link regardless of setting.
 			else {
-				$field_settings['link_to_file'] = true;
+				$field_settings[ 'link_to_file' ] = true;
 				$disable_lightbox = true;
 			}
 
@@ -370,7 +370,7 @@ 
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
 
 			// Output textualized content where
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) {
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) {
 				/**
 				 * Modify the link text (defaults to the file name)
 				 *
@@ -383,7 +383,7 @@ 
 				 */
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context );
 
-				if ( empty( $field_settings['show_as_link'] ) ) {
+				if ( empty( $field_settings[ 'show_as_link' ] ) ) {
 					/**
 					 * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field
 					 * @since 2.0 Added $context
@@ -404,7 +404,7 @@ 
 				$content = empty( $rendered ) ? $text : $rendered;
 			}
 
-			$output_arr[] = array(
+			$output_arr[ ] = array(
 				'file_path' => $file_path,
 				'content' => $content
 			);

includes/class-gravityview-image.php

Spacing +19 added lines, -19 removed lines

@@ -65,11 +65,11 @@ 
 
 		$atts = wp_parse_args( $atts, $defaults );
 
-		foreach( $atts as $key => $val ) {
+		foreach ( $atts as $key => $val ) {
 			$this->{$key} = $val;
 		}
 
-		$this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
+		$this->class = ! empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
 
 		$this->set_image_size();
 
@@ -85,13 +85,13 @@ 
 	 */
 	function validate_image_src() {
 
-		if ( !$this->validate_src ) { return true; }
+		if ( ! $this->validate_src ) { return true; }
 
 		$info = pathinfo( $this->src );
 
 		$image_exts = self::get_image_extensions();
 
-		return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts);
+		return isset( $info[ 'extension' ] ) && in_array( strtolower( $info[ 'extension' ] ), $image_exts );
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 		 */
 		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico', 'webp' ) );
 
-		return (array) $image_exts;
+		return (array)$image_exts;
 	}
 
 	/**
@@ -125,16 +125,16 @@ 
 
 			// And there is no string size passed
 			// 		And we want to get the image size using PHP
-			if ( empty( $string ) && !empty( $this->getimagesize ) ) {
+			if ( empty( $string ) && ! empty( $this->getimagesize ) ) {
 
 				$image_size = @getimagesize( $this->src );
 
 				// If it didn't return a response, it may be a HTTPS/SSL error
-				if ( empty( $image_size[0] ) ) {
+				if ( empty( $image_size[ 0 ] ) ) {
 					$image_size = @getimagesize( set_url_scheme( $this->src, 'http' ) );
 				}
 
-				if ( !empty( $image_size ) ) {
+				if ( ! empty( $image_size ) ) {
 					list( $width, $height ) = $image_size;
 				}
 
@@ -147,33 +147,33 @@ 
 				 * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels
 				 */
 				$image_sizes = apply_filters( 'gravityview_image_sizes', array(
-					'tiny' => array('width' => 40, 'height' => 30),
-					'small' => array('width' => 100, 'height' => 75),
-					'medium' => array('width' => 250, 'height' => 188),
-					'large' => array('width' => 448, 'height' => 336),
+					'tiny' => array( 'width' => 40, 'height' => 30 ),
+					'small' => array( 'width' => 100, 'height' => 75 ),
+					'medium' => array( 'width' => 250, 'height' => 188 ),
+					'large' => array( 'width' => 448, 'height' => 336 ),
 				) );
 
-				switch( $this->size ) {
+				switch ( $this->size ) {
 					case 'tiny':
-						extract($image_sizes['tiny']);
+						extract( $image_sizes[ 'tiny' ] );
 						break;
 					case 'small':
 					case 's':
 					case 'thumb':
-						extract($image_sizes['small']);
+						extract( $image_sizes[ 'small' ] );
 						break;
 					case 'm':
 					case 'medium':
-						extract($image_sizes['medium']);
+						extract( $image_sizes[ 'medium' ] );
 						break;
 					case 'large':
 					case 'l':
-						extract($image_sizes['large']);
+						extract( $image_sizes[ 'large' ] );
 						break;
 					default:
 						// Verify that the passed sizes are integers.
-						$width = !empty( $width ) ? intval( $width ) : intval( $this->width );
-						$height = !empty( $height ) ? intval( $height ) : intval( $this->height );
+						$width = ! empty( $width ) ? intval( $width ) : intval( $this->width );
+						$height = ! empty( $height ) ? intval( $height ) : intval( $this->height );
 				}
 
 			}

includes/class-common.php

Spacing +114 added lines, -114 removed lines

@@ -124,8 +124,8 @@ 
 
 		$form = false;
 
-		if( $entry ) {
-			$form = GFAPI::get_form( $entry['form_id'] );
+		if ( $entry ) {
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
 		}
 
 		return $form;
@@ -201,7 +201,7 @@ 
 			}
 		}
 
-		return (bool) $has_transaction_data;
+		return (bool)$has_transaction_data;
 	}
 
 	/**
@@ -239,7 +239,7 @@ 
 
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
 
 		return $result;
 	}
@@ -259,13 +259,13 @@ 
 	 *
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
 	 */
-	public static function get_forms(  $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) {
+	public static function get_forms( $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) {
 		$forms = array();
 		if ( ! class_exists( 'GFAPI' ) ) {
 			return array();
 		}
 
-		if( 'any' === $active ) {
+		if ( 'any' === $active ) {
 			$active_forms = GFAPI::get_forms( true, $trash );
 			$inactive_forms = GFAPI::get_forms( false, $trash );
 			$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -297,9 +297,9 @@ 
 		$has_post_fields = false;
 
 		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields["{$field['id']}"] = array(
+			foreach ( $form[ 'fields' ] as $field ) {
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
+					$fields[ "{$field[ 'id' ]}" ] = array(
 						'label' => \GV\Utils::get( $field, 'label' ),
 						'parent' => null,
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -308,10 +308,10 @@ 
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
+					foreach ( $field[ 'inputs' ] as $input ) {
 
-						if( ! empty( $input['isHidden'] ) ) {
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
 							continue;
 						}
 
@@ -319,10 +319,10 @@ 
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields["{$input['id']}"] = array(
+						$fields[ "{$input[ 'id' ]}" ] = array(
 							'label' => \GV\Utils::get( $input, 'label' ),
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
 							'parent' => $field,
@@ -334,7 +334,7 @@ 
 				}
 
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
 					$has_product_fields = true;
 				}
 
@@ -348,7 +348,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gravityview' ),
 				'type' => 'post_id',
 			);
@@ -361,11 +361,11 @@ 
 			foreach ( $payment_fields as $payment_field ) {
 
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
 					continue;
 				}
 
-				$fields["{$payment_field->name}"] = array(
+				$fields[ "{$payment_field->name}" ] = array(
 					'label' => $payment_field->label,
 					'desc' => $payment_field->description,
 					'type' => $payment_field->name,
@@ -397,9 +397,9 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ( $extra_fields as $key => $field ) {
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
 			}
 		}
 
@@ -439,33 +439,33 @@ 
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
 			'context_view_id' => null,
 		);
 
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) && is_array( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) && is_array( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
 
 				if ( ! is_array( $filter ) ) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
 			}
 
 			// don't send just the [mode] without any field filter.
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
 			}
 
 		}
@@ -476,33 +476,33 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
 
 				if ( $date ) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
 				} else {
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
 
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset( $criteria[ 'search_criteria' ][ $key ] );
 				}
 			}
 		}
 
-		if ( empty( $criteria['context_view_id'] ) ) {
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
 			// Calculate the context view id and send it to the advanced filter
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
 			}
 		}
 
@@ -512,7 +512,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
 
 		return (array)$criteria;
 	}
@@ -546,7 +546,7 @@ 
 		/** Reduce # of database calls */
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
 
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
 
@@ -554,7 +554,7 @@ 
 
 				// Still update the total count when using cached results
 				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
 				}
 
 				$return = $entries;
@@ -576,9 +576,9 @@ 
 			$entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) );
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if ( is_null( $entries ) ) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
 
 				if ( is_wp_error( $entries ) ) {
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -589,7 +589,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -706,18 +706,18 @@ 
 		$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry, $view );
 
 		// Is the entry allowed
-		if( $check_entry_display ) {
+		if ( $check_entry_display ) {
 
 			$gvid = \GV\Utils::_GET( 'gvid' );
 
-			if( $gvid ) {
+			if ( $gvid ) {
 				$view = \GV\View::by_id( $gvid );
 			}
 
 			$entry = self::check_entry_display( $entry, $view );
 		}
 
-		if( is_wp_error( $entry ) ) {
+		if ( is_wp_error( $entry ) ) {
 			gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
 			return false;
 		}
@@ -751,12 +751,12 @@ 
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ( 'context' === $val1 ) {
 
 			$matching_contexts = array( $val2 );
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ( $val2 ) {
 				// Check for either single or edit
 				case 'singular':
 					$matching_contexts = array( 'single', 'edit' );
@@ -799,18 +799,18 @@ 
 				$json_val_1 = json_decode( $val1, true );
 				$json_val_2 = json_decode( $val2, true );
 
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
 
 					$json_in = false;
-					$json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 );
-					$json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 );
+					$json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 );
+					$json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 );
 
 					// For JSON, we want to compare as "in" or "not in" rather than "contains"
 					foreach ( $json_val_1 as $item_1 ) {
 						foreach ( $json_val_2 as $item_2 ) {
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
 
-							if( $json_in ) {
+							if ( $json_in ) {
 								break 2;
 							}
 						}
@@ -861,10 +861,10 @@ 
 	public static function check_entry_display( $entry, $view = null ) {
 
 		if ( ! $entry || is_wp_error( $entry ) ) {
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) ) {
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
 		}
 
@@ -879,19 +879,19 @@ 
 
 		$_gvid = \GV\Utils::_GET( 'gvid' );
 
-		if ( $_gvid && $view->ID !== (int) $_gvid ) {
+		if ( $_gvid && $view->ID !== (int)$_gvid ) {
 			return new WP_Error( 'view_id_not_match_gvid', 'View does not match passed $_GET["gvid"].', $view->ID );
 		}
 
 		$view_form_id = $view->form->ID;
 
 		if ( $view->joins ) {
-			if ( in_array( (int) $entry['form_id'], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
-				$view_form_id = $entry['form_id'];
+			if ( in_array( (int)$entry[ 'form_id' ], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
+				$view_form_id = $entry[ 'form_id' ];
 			}
 		}
 
-		if ( (int) $view_form_id !== (int) $entry['form_id'] ) {
+		if ( (int)$view_form_id !== (int)$entry[ 'form_id' ] ) {
 			return new WP_Error( 'view_id_not_match', 'View form source does not match entry form source ID.', $entry );
 		}
 
@@ -899,13 +899,13 @@ 
 		 * Check whether the entry is in the entries subset by running a modified query.
 		 */
 		add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry, $view_form_id ) {
-			$_tmp_query       = new \GF_Query( $view_form_id, array(
+			$_tmp_query = new \GF_Query( $view_form_id, array(
 				'field_filters' => array(
 					'mode' => 'all',
 					array(
 						'key' => 'id',
 						'operation' => 'is',
-						'value' => $entry['id']
+						'value' => $entry[ 'id' ]
 					)
 				)
 			) );
@@ -915,14 +915,14 @@ 
 			/** @type \GF_Query $query */
 			$query_parts      = $query->_introspect();
 
-			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) );
+			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) );
 
 		}, 10, 3 );
 
 		// Prevent page offset from being applied to the single entry query; it's used to return to the referring page number
 		add_filter( 'gravityview_search_criteria', $remove_pagenum = function( $criteria ) {
 
-			$criteria['paging'] = array(
+			$criteria[ 'paging' ] = array(
 				'offset' => 0,
 				'page_size' => 25
 			);
@@ -941,20 +941,20 @@ 
 		}
 
 		// This entry is on a View with joins
-		if ( $entries[0]->is_multi() ) {
+		if ( $entries[ 0 ]->is_multi() ) {
 
 			$multi_entry_ids = array();
 
-			foreach ( $entries[0]->entries as $multi_entry ) {
-				$multi_entry_ids[] = (int) $multi_entry->ID;
+			foreach ( $entries[ 0 ]->entries as $multi_entry ) {
+				$multi_entry_ids[ ] = (int)$multi_entry->ID;
 			}
 
-			if ( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) {
+			if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) {
 				remove_action( 'gravityview/view/query', $entry_subset_callback );
 				return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
 			}
 
-		} elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) {
+		} elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) {
 			remove_action( 'gravityview/view/query', $entry_subset_callback );
 			return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
 		}
@@ -999,18 +999,18 @@ 
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
+		$date_gmt_time = mysql2date( 'G', $date_string );
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
 
-		$format  = \GV\Utils::get( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = \GV\Utils::get( $atts, 'format' );
+		$is_human = ! empty( $atts[ 'human' ] );
+		$is_diff = ! empty( $atts[ 'diff' ] );
+		$is_raw = ! empty( $atts[ 'raw' ] );
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
+		$include_time = ! empty( $atts[ 'time' ] );
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
+		if ( empty( $format ) ) {
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
 		}
@@ -1018,7 +1018,7 @@ 
 		// If raw was specified, don't modify the stored value
 		if ( $is_raw ) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ( $is_timestamp ) {
 			$formatted_date = $date_local_timestamp;
 		} elseif ( $is_diff ) {
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1051,7 +1051,7 @@ 
 
 		$label = \GV\Utils::get( $field, 'label' );
 
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
 		}
 
@@ -1078,7 +1078,7 @@ 
 			$form = GFAPI::get_form( $form );
 		}
 
-		if ( class_exists( 'GFFormsModel' ) ){
+		if ( class_exists( 'GFFormsModel' ) ) {
 			return GFFormsModel::get_field( $form, $field_id );
 		} else {
 			return null;
@@ -1125,19 +1125,19 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
 			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+				if ( $tag === $shortcode[ 2 ] ) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
-					$shortcodes[] = $shortcode;
+					$shortcodes[ ] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
-					foreach( $results as $result ) {
-						$shortcodes[] = $result;
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
+					foreach ( $results as $result ) {
+						$shortcodes[ ] = $result;
 					}
 				}
 			}
@@ -1169,7 +1169,7 @@ 
 			'post_type'      => 'gravityview',
 			'posts_per_page' => 100,
 			'meta_key'       => '_gravityview_form_id',
-			'meta_value'     => (int) $form_id,
+			'meta_value'     => (int)$form_id,
 		);
 		$args     = wp_parse_args( $args, $defaults );
 		$views    = get_posts( $args );
@@ -1181,21 +1181,21 @@ 
 
 			$data = unserialize( $view->meta_value );
 
-			if( ! $data || ! is_array( $data ) ) {
+			if ( ! $data || ! is_array( $data ) ) {
 				continue;
 			}
 
 			foreach ( $data as $datum ) {
-				if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) {
-					$joined_forms[] = $view->post_id;
+				if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) {
+					$joined_forms[ ] = $view->post_id;
 				}
 			}
 		}
 
 		if ( $joined_forms ) {
-			$joined_args  = array(
+			$joined_args = array(
 				'post_type'      => 'gravityview',
-				'posts_per_page' => $args['posts_per_page'],
+				'posts_per_page' => $args[ 'posts_per_page' ],
 				'post__in'       => $joined_forms,
 			);
 			$views = array_merge( $views, get_posts( $joined_args ) );
@@ -1351,7 +1351,7 @@ 
 
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
 
-		if( $json_decode ) {
+		if ( $json_decode ) {
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
 		}
 
@@ -1366,7 +1366,7 @@ 
 	 * @return string         html
 	 */
 	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default (Entry ID)', 'gravityview' ) .'</option>';
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default (Entry ID)', 'gravityview' ) . '</option>';
 
 		if ( empty( $formid ) ) {
 			return $output;
@@ -1383,11 +1383,11 @@ 
 			$blocklist_field_types = apply_filters( 'gravityview_blocklist_field_types', $blocklist_field_types, null );
 
 			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blocklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blocklist_field_types ) ) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -1430,16 +1430,16 @@ 
 		$blocklist_field_types = apply_filters( 'gravityview_blocklist_field_types', $blocklist_field_types, null );
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ( $fields as $id => $field ) {
 
-			if( in_array( $field['type'], $blocklist_field_types ) ) {
+			if ( in_array( $field[ 'type' ], $blocklist_field_types ) ) {
 				unset( $fields[ $id ] );
 			}
 
 			/**
 			 * Merge date and time subfields.
 			 */
-			if ( in_array( $field['type'], array( 'date', 'time' ) ) && ! empty( $field['parent'] ) ) {
+			if ( in_array( $field[ 'type' ], array( 'date', 'time' ) ) && ! empty( $field[ 'parent' ] ) ) {
 				$fields[ intval( $id ) ] = array(
 					'label' => \GV\Utils::get( $field, 'parent/label' ),
 					'parent' => null,
@@ -1489,14 +1489,14 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric( $form = null, $field = '' ) {
 
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
 			$form = self::get_form( $form );
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
 			$type = $field;
 		} else {
 			$type = self::get_field_type( $form, $field );
@@ -1510,9 +1510,9 @@ 
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
-				$numeric_types[] = $gv_field->is_numeric;
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
+			if ( true === $gv_field->is_numeric ) {
+				$numeric_types[ ] = $gv_field->is_numeric;
 			}
 		}
 
@@ -1663,20 +1663,20 @@ 
 		$final_atts = array_filter( $final_atts );
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
-			$final_atts['href'] = $href;
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
+			$final_atts[ 'href' ] = $href;
 		}
 
-		if ( isset( $final_atts['href'] ) ) {
-			$final_atts['href'] = esc_url_raw( $final_atts['href'] );
+		if ( isset( $final_atts[ 'href' ] ) ) {
+			$final_atts[ 'href' ] = esc_url_raw( $final_atts[ 'href' ] );
 		}
 
 		/**
 		 * Fix potential security issue with target=_blank
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
 		 */
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
 		}
 
 		// Sort the attributes alphabetically, to help testing
@@ -1688,7 +1688,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		if( '' !== $output ) {
+		if ( '' !== $output ) {
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
 		}
 
@@ -1715,7 +1715,7 @@ 
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
-				$merged[] = $value;
+				$merged[ ] = $value;
 			} else {
 				$merged[ $key ] = $value;
 			}
@@ -1748,7 +1748,7 @@ 
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
 
 		return get_users( $get_users_settings );
 	}
@@ -1768,11 +1768,11 @@ 
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
 
     	// If $cap is defined, only show notice if user has capability
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
     		return '';
 	    }
 
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
     }
 
 	/**

includes/class-gravityview-logging.php

Spacing +13 added lines, -13 removed lines

@@ -9,9 +9,9 @@ 
 
 	function __construct() {
 
-		add_action( 'gravityview_log_error', array( $this, 'log_error'), 10, 2 );
+		add_action( 'gravityview_log_error', array( $this, 'log_error' ), 10, 2 );
 
-		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
+		add_action( 'gravityview_log_debug', array( $this, 'log_debug' ), 10, 2 );
 
 		// Enable debug with Gravity Forms Logging Add-on
 	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
@@ -36,7 +36,7 @@ 
 			include_once( GRAVITYVIEW_DIR . 'includes/class-debug-bar.php' );
 		}
 
-		$panels[] = new GravityView_Debug_Bar;
+		$panels[ ] = new GravityView_Debug_Bar;
 
 		return $panels;
 	}
@@ -46,7 +46,7 @@ 
 	 * @param array $supported_plugins List of plugins
 	 */
 	public function enable_gform_logging( $supported_plugins ) {
-	    $supported_plugins['gravityview'] = 'GravityView';
+	    $supported_plugins[ 'gravityview' ] = 'GravityView';
 	    return $supported_plugins;
 	}
 
@@ -74,7 +74,7 @@ 
 	 * @return string "print_r" or "var_export"
 	 */
 	static function get_print_function() {
-		if( ob_get_level() > 0 ) {
+		if ( ob_get_level() > 0 ) {
 			$function = 'var_export';
 		} else {
 			$function = 'print_r';
@@ -95,17 +95,17 @@ 
 		$hash = md5( json_encode( $notice ) );
 
 		if ( ! isset( self::$notices_hash[ $hash ] ) ) {
-			self::$notices[]             = $notice;
+			self::$notices[ ]             = $notice;
 			self::$notices_hash[ $hash ] = true;
 		}
 
-		if ( class_exists("GFLogging") ) {
+		if ( class_exists( "GFLogging" ) ) {
 			GFLogging::include_logger();
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
+	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $data, true ), KLogger::DEBUG );
 	    }
 	}
 
-	static function log_error( $message = '', $data = null  ) {
+	static function log_error( $message = '', $data = null ) {
 
 		$function = self::get_print_function();
 
@@ -118,13 +118,13 @@ 
 		$hash = md5( json_encode( $error ) );
 
 		if ( ! isset( self::$errors_hash[ $hash ] ) ) {
-			self::$errors[]             = $error;
+			self::$errors[ ]             = $error;
 			self::$errors_hash[ $hash ] = true;
 		}
 
-		if ( class_exists("GFLogging") ) {
+		if ( class_exists( "GFLogging" ) ) {
 		    GFLogging::include_logger();
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ( $error, true), KLogger::ERROR );
+		    GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $error, true ), KLogger::ERROR );
 		}
 	}
 
@@ -141,7 +141,7 @@ 
 	 */
 	static function is_logging_active( $plugin = 'gravityview' ) {
 
-		if( ! class_exists( 'GFLogging') ) {
+		if ( ! class_exists( 'GFLogging' ) ) {
 			return false;
 		}
 

trustedlogin/autoload-classmap.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 // autoload-classmap.php @generated by Strauss
 
-$trustedlogin = dirname(__FILE__);
+$trustedlogin = dirname( __FILE__ );
 
 return array(
    'GravityView\TrustedLogin\Logging' => $trustedlogin . '/trustedlogin/client/src/Logging.php',

vendor/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php

Spacing +43 added lines, -43 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_ChaCha20_Ctx', false ) ) {
     return;
 }
 
@@ -27,40 +27,40 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public function __construct($key = '', $iv = '', $counter = '')
+    public function __construct( $key = '', $iv = '', $counter = '' )
     {
-        if (self::strlen($key) !== 32) {
-            throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
+        if ( self::strlen( $key ) !== 32 ) {
+            throw new InvalidArgumentException( 'ChaCha20 expects a 256-bit key.' );
         }
-        if (self::strlen($iv) !== 8) {
-            throw new InvalidArgumentException('ChaCha20 expects a 64-bit nonce.');
+        if ( self::strlen( $iv ) !== 8 ) {
+            throw new InvalidArgumentException( 'ChaCha20 expects a 64-bit nonce.' );
         }
-        $this->container = new SplFixedArray(16);
+        $this->container = new SplFixedArray( 16 );
 
         /* "expand 32-byte k" as per ChaCha20 spec */
-        $this->container[0]  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-        $this->container[1]  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-        $this->container[2]  = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-        $this->container[3]  = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+        $this->container[ 0 ]  = new ParagonIE_Sodium_Core32_Int32( array( 0x6170, 0x7865 ) );
+        $this->container[ 1 ]  = new ParagonIE_Sodium_Core32_Int32( array( 0x3320, 0x646e ) );
+        $this->container[ 2 ]  = new ParagonIE_Sodium_Core32_Int32( array( 0x7962, 0x2d32 ) );
+        $this->container[ 3 ]  = new ParagonIE_Sodium_Core32_Int32( array( 0x6b20, 0x6574 ) );
 
-        $this->container[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
-        $this->container[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
-        $this->container[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
-        $this->container[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
-        $this->container[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
-        $this->container[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
-        $this->container[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
-        $this->container[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
+        $this->container[ 4 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 0, 4 ) );
+        $this->container[ 5 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 4, 4 ) );
+        $this->container[ 6 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 8, 4 ) );
+        $this->container[ 7 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 12, 4 ) );
+        $this->container[ 8 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 16, 4 ) );
+        $this->container[ 9 ]  = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 20, 4 ) );
+        $this->container[ 10 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 24, 4 ) );
+        $this->container[ 11 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $key, 28, 4 ) );
 
-        if (empty($counter)) {
-            $this->container[12] = new ParagonIE_Sodium_Core32_Int32();
-            $this->container[13] = new ParagonIE_Sodium_Core32_Int32();
+        if ( empty( $counter ) ) {
+            $this->container[ 12 ] = new ParagonIE_Sodium_Core32_Int32();
+            $this->container[ 13 ] = new ParagonIE_Sodium_Core32_Int32();
         } else {
-            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 0, 4));
-            $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 4, 4));
+            $this->container[ 12 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $counter, 0, 4 ) );
+            $this->container[ 13 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $counter, 4, 4 ) );
         }
-        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 0, 4));
-        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 4, 4));
+        $this->container[ 14 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $iv, 0, 4 ) );
+        $this->container[ 15 ] = ParagonIE_Sodium_Core32_Int32::fromReverseString( self::substr( $iv, 4, 4 ) );
     }
 
     /**
@@ -70,21 +70,21 @@ 
      * @param int|ParagonIE_Sodium_Core32_Int32 $value
      * @return void
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    #[ReturnTypeWillChange ]
+    public function offsetSet( $offset, $value )
     {
-        if (!is_int($offset)) {
-            throw new InvalidArgumentException('Expected an integer');
+        if ( ! is_int( $offset ) ) {
+            throw new InvalidArgumentException( 'Expected an integer' );
         }
-        if ($value instanceof ParagonIE_Sodium_Core32_Int32) {
+        if ( $value instanceof ParagonIE_Sodium_Core32_Int32 ) {
             /*
         } elseif (is_int($value)) {
             $value = ParagonIE_Sodium_Core32_Int32::fromInt($value);
             */
         } else {
-            throw new InvalidArgumentException('Expected an integer');
+            throw new InvalidArgumentException( 'Expected an integer' );
         }
-        $this->container[$offset] = $value;
+        $this->container[ $offset ] = $value;
     }
 
     /**
@@ -94,10 +94,10 @@ 
      * @return bool
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetExists( $offset )
     {
-        return isset($this->container[$offset]);
+        return isset( $this->container[ $offset ] );
     }
 
     /**
@@ -107,10 +107,10 @@ 
      * @return void
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetUnset( $offset )
     {
-        unset($this->container[$offset]);
+        unset( $this->container[ $offset ] );
     }
 
     /**
@@ -120,11 +120,11 @@ 
      * @return mixed|null
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetGet( $offset )
     {
-        return isset($this->container[$offset])
-            ? $this->container[$offset]
+        return isset( $this->container[ $offset ] )
+            ? $this->container[ $offset ]
             : null;
     }
 }

vendor/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php

Spacing +60 added lines, -60 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Fe', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core32_Curve25519_Fe', false ) ) {
     return;
 }
 
@@ -30,26 +30,26 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function fromArray($array, $save_indexes = null)
+    public static function fromArray( $array, $save_indexes = null )
     {
-        $count = count($array);
-        if ($save_indexes) {
-            $keys = array_keys($array);
+        $count = count( $array );
+        if ( $save_indexes ) {
+            $keys = array_keys( $array );
         } else {
-            $keys = range(0, $count - 1);
+            $keys = range( 0, $count - 1 );
         }
-        $array = array_values($array);
+        $array = array_values( $array );
 
         $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
-                $array[$i]->overflow = 0;
-                $obj->offsetSet($keys[$i], $array[$i]);
+        if ( $save_indexes ) {
+            for ( $i = 0; $i < $count; ++$i ) {
+                $array[ $i ]->overflow = 0;
+                $obj->offsetSet( $keys[ $i ], $array[ $i ] );
             }
         } else {
-            for ($i = 0; $i < $count; ++$i) {
-                $array[$i]->overflow = 0;
-                $obj->offsetSet($i, $array[$i]);
+            for ( $i = 0; $i < $count; ++$i ) {
+                $array[ $i ]->overflow = 0;
+                $obj->offsetSet( $i, $array[ $i ] );
             }
         }
         return $obj;
@@ -64,32 +64,32 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function fromIntArray($array, $save_indexes = null)
+    public static function fromIntArray( $array, $save_indexes = null )
     {
-        $count = count($array);
-        if ($save_indexes) {
-            $keys = array_keys($array);
+        $count = count( $array );
+        if ( $save_indexes ) {
+            $keys = array_keys( $array );
         } else {
-            $keys = range(0, $count - 1);
+            $keys = range( 0, $count - 1 );
         }
-        $array = array_values($array);
+        $array = array_values( $array );
         $set = array();
         /** @var int $i */
         /** @var int $v */
-        foreach ($array as $i => $v) {
-            $set[$i] = ParagonIE_Sodium_Core32_Int32::fromInt($v);
+        foreach ( $array as $i => $v ) {
+            $set[ $i ] = ParagonIE_Sodium_Core32_Int32::fromInt( $v );
         }
 
         $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
-                $set[$i]->overflow = 0;
-                $obj->offsetSet($keys[$i], $set[$i]);
+        if ( $save_indexes ) {
+            for ( $i = 0; $i < $count; ++$i ) {
+                $set[ $i ]->overflow = 0;
+                $obj->offsetSet( $keys[ $i ], $set[ $i ] );
             }
         } else {
-            for ($i = 0; $i < $count; ++$i) {
-                $set[$i]->overflow = 0;
-                $obj->offsetSet($i, $set[$i]);
+            for ( $i = 0; $i < $count; ++$i ) {
+                $set[ $i ]->overflow = 0;
+                $obj->offsetSet( $i, $set[ $i ] );
             }
         }
         return $obj;
@@ -104,17 +104,17 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    #[ReturnTypeWillChange ]
+    public function offsetSet( $offset, $value )
     {
-        if (!($value instanceof ParagonIE_Sodium_Core32_Int32)) {
-            throw new InvalidArgumentException('Expected an instance of ParagonIE_Sodium_Core32_Int32');
+        if ( ! ( $value instanceof ParagonIE_Sodium_Core32_Int32 ) ) {
+            throw new InvalidArgumentException( 'Expected an instance of ParagonIE_Sodium_Core32_Int32' );
         }
-        if (is_null($offset)) {
-            $this->container[] = $value;
+        if ( is_null( $offset ) ) {
+            $this->container[ ] = $value;
         } else {
-            ParagonIE_Sodium_Core32_Util::declareScalarType($offset, 'int', 1);
-            $this->container[(int) $offset] = $value;
+            ParagonIE_Sodium_Core32_Util::declareScalarType( $offset, 'int', 1 );
+            $this->container[ (int)$offset ] = $value;
         }
     }
 
@@ -125,10 +125,10 @@ 
      * @return bool
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetExists( $offset )
     {
-        return isset($this->container[$offset]);
+        return isset( $this->container[ $offset ] );
     }
 
     /**
@@ -138,10 +138,10 @@ 
      * @return void
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetUnset( $offset )
     {
-        unset($this->container[$offset]);
+        unset( $this->container[ $offset ] );
     }
 
     /**
@@ -151,14 +151,14 @@ 
      * @return ParagonIE_Sodium_Core32_Int32
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetGet( $offset )
     {
-        if (!isset($this->container[$offset])) {
-            $this->container[(int) $offset] = new ParagonIE_Sodium_Core32_Int32();
+        if ( ! isset( $this->container[ $offset ] ) ) {
+            $this->container[ (int)$offset ] = new ParagonIE_Sodium_Core32_Int32();
         }
         /** @var ParagonIE_Sodium_Core32_Int32 $get */
-        $get = $this->container[$offset];
+        $get = $this->container[ $offset ];
         return $get;
     }
 
@@ -169,21 +169,21 @@ 
      */
     public function __debugInfo()
     {
-        if (empty($this->container)) {
+        if ( empty( $this->container ) ) {
             return array();
         }
         $c = array(
-            (int) ($this->container[0]->toInt()),
-            (int) ($this->container[1]->toInt()),
-            (int) ($this->container[2]->toInt()),
-            (int) ($this->container[3]->toInt()),
-            (int) ($this->container[4]->toInt()),
-            (int) ($this->container[5]->toInt()),
-            (int) ($this->container[6]->toInt()),
-            (int) ($this->container[7]->toInt()),
-            (int) ($this->container[8]->toInt()),
-            (int) ($this->container[9]->toInt())
+            (int)( $this->container[ 0 ]->toInt() ),
+            (int)( $this->container[ 1 ]->toInt() ),
+            (int)( $this->container[ 2 ]->toInt() ),
+            (int)( $this->container[ 3 ]->toInt() ),
+            (int)( $this->container[ 4 ]->toInt() ),
+            (int)( $this->container[ 5 ]->toInt() ),
+            (int)( $this->container[ 6 ]->toInt() ),
+            (int)( $this->container[ 7 ]->toInt() ),
+            (int)( $this->container[ 8 ]->toInt() ),
+            (int)( $this->container[ 9 ]->toInt() )
         );
-        return array(implode(', ', $c));
+        return array( implode( ', ', $c ) );
     }
 }

vendor/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php

Spacing +43 added lines, -43 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_ChaCha20_Ctx', false ) ) {
     return;
 }
 
@@ -26,39 +26,39 @@ 
      * @throws InvalidArgumentException
      * @throws TypeError
      */
-    public function __construct($key = '', $iv = '', $counter = '')
+    public function __construct( $key = '', $iv = '', $counter = '' )
     {
-        if (self::strlen($key) !== 32) {
-            throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
+        if ( self::strlen( $key ) !== 32 ) {
+            throw new InvalidArgumentException( 'ChaCha20 expects a 256-bit key.' );
         }
-        if (self::strlen($iv) !== 8) {
-            throw new InvalidArgumentException('ChaCha20 expects a 64-bit nonce.');
+        if ( self::strlen( $iv ) !== 8 ) {
+            throw new InvalidArgumentException( 'ChaCha20 expects a 64-bit nonce.' );
         }
-        $this->container = new SplFixedArray(16);
+        $this->container = new SplFixedArray( 16 );
 
         /* "expand 32-byte k" as per ChaCha20 spec */
-        $this->container[0]  = 0x61707865;
-        $this->container[1]  = 0x3320646e;
-        $this->container[2]  = 0x79622d32;
-        $this->container[3]  = 0x6b206574;
-        $this->container[4]  = self::load_4(self::substr($key, 0, 4));
-        $this->container[5]  = self::load_4(self::substr($key, 4, 4));
-        $this->container[6]  = self::load_4(self::substr($key, 8, 4));
-        $this->container[7]  = self::load_4(self::substr($key, 12, 4));
-        $this->container[8]  = self::load_4(self::substr($key, 16, 4));
-        $this->container[9]  = self::load_4(self::substr($key, 20, 4));
-        $this->container[10] = self::load_4(self::substr($key, 24, 4));
-        $this->container[11] = self::load_4(self::substr($key, 28, 4));
+        $this->container[ 0 ]  = 0x61707865;
+        $this->container[ 1 ]  = 0x3320646e;
+        $this->container[ 2 ]  = 0x79622d32;
+        $this->container[ 3 ]  = 0x6b206574;
+        $this->container[ 4 ]  = self::load_4( self::substr( $key, 0, 4 ) );
+        $this->container[ 5 ]  = self::load_4( self::substr( $key, 4, 4 ) );
+        $this->container[ 6 ]  = self::load_4( self::substr( $key, 8, 4 ) );
+        $this->container[ 7 ]  = self::load_4( self::substr( $key, 12, 4 ) );
+        $this->container[ 8 ]  = self::load_4( self::substr( $key, 16, 4 ) );
+        $this->container[ 9 ]  = self::load_4( self::substr( $key, 20, 4 ) );
+        $this->container[ 10 ] = self::load_4( self::substr( $key, 24, 4 ) );
+        $this->container[ 11 ] = self::load_4( self::substr( $key, 28, 4 ) );
 
-        if (empty($counter)) {
-            $this->container[12] = 0;
-            $this->container[13] = 0;
+        if ( empty( $counter ) ) {
+            $this->container[ 12 ] = 0;
+            $this->container[ 13 ] = 0;
         } else {
-            $this->container[12] = self::load_4(self::substr($counter, 0, 4));
-            $this->container[13] = self::load_4(self::substr($counter, 4, 4));
+            $this->container[ 12 ] = self::load_4( self::substr( $counter, 0, 4 ) );
+            $this->container[ 13 ] = self::load_4( self::substr( $counter, 4, 4 ) );
         }
-        $this->container[14] = self::load_4(self::substr($iv, 0, 4));
-        $this->container[15] = self::load_4(self::substr($iv, 4, 4));
+        $this->container[ 14 ] = self::load_4( self::substr( $iv, 0, 4 ) );
+        $this->container[ 15 ] = self::load_4( self::substr( $iv, 4, 4 ) );
     }
 
     /**
@@ -69,16 +69,16 @@ 
      * @return void
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    #[ReturnTypeWillChange ]
+    public function offsetSet( $offset, $value )
     {
-        if (!is_int($offset)) {
-            throw new InvalidArgumentException('Expected an integer');
+        if ( ! is_int( $offset ) ) {
+            throw new InvalidArgumentException( 'Expected an integer' );
         }
-        if (!is_int($value)) {
-            throw new InvalidArgumentException('Expected an integer');
+        if ( ! is_int( $value ) ) {
+            throw new InvalidArgumentException( 'Expected an integer' );
         }
-        $this->container[$offset] = $value;
+        $this->container[ $offset ] = $value;
     }
 
     /**
@@ -87,10 +87,10 @@ 
      * @param int $offset
      * @return bool
      */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetExists( $offset )
     {
-        return isset($this->container[$offset]);
+        return isset( $this->container[ $offset ] );
     }
 
     /**
@@ -100,10 +100,10 @@ 
      * @return void
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetUnset( $offset )
     {
-        unset($this->container[$offset]);
+        unset( $this->container[ $offset ] );
     }
 
     /**
@@ -113,11 +113,11 @@ 
      * @return mixed|null
      * @psalm-suppress MixedArrayOffset
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    #[ReturnTypeWillChange ]
+    public function offsetGet( $offset )
     {
-        return isset($this->container[$offset])
-            ? $this->container[$offset]
+        return isset( $this->container[ $offset ] )
+            ? $this->container[ $offset ]
             : null;
     }
 }

vendor/paragonie/sodium_compat/src/Core/Curve25519.php

Spacing +1611 added lines, -1611 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists('ParagonIE_Sodium_Core_Curve25519', false)) {
+if ( class_exists( 'ParagonIE_Sodium_Core_Curve25519', false ) ) {
     return;
 }
 
@@ -25,7 +25,7 @@ 
     public static function fe_0()
     {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
         );
     }
 
@@ -39,7 +39,7 @@ 
     public static function fe_1()
     {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            array( 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
         );
     }
 
@@ -60,10 +60,10 @@ 
     ) {
         /** @var array<int, int> $arr */
         $arr = array();
-        for ($i = 0; $i < 10; ++$i) {
-            $arr[$i] = (int) ($f[$i] + $g[$i]);
+        for ( $i = 0; $i < 10; ++$i ) {
+            $arr[ $i ] = (int)( $f[ $i ] + $g[ $i ] );
         }
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($arr);
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $arr );
     }
 
     /**
@@ -85,11 +85,11 @@ 
         /** @var array<int, int> $h */
         $h = array();
         $b *= -1;
-        for ($i = 0; $i < 10; ++$i) {
-            $x = (($f[$i] ^ $g[$i]) & $b);
-            $h[$i] = ($f[$i]) ^ $x;
+        for ( $i = 0; $i < 10; ++$i ) {
+            $x = ( ( $f[ $i ] ^ $g[ $i ] ) & $b );
+            $h[ $i ] = ( $f[ $i ] ) ^ $x;
         }
-        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($h);
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $h );
     }
 
     /**
@@ -100,7 +100,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_copy(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_copy( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
         $h = clone $f;
         return $h;
@@ -117,66 +117,66 @@ 
      * @throws RangeException
      * @throws TypeError
      */
-    public static function fe_frombytes($s)
+    public static function fe_frombytes( $s )
     {
-        if (self::strlen($s) !== 32) {
-            throw new RangeException('Expected a 32-byte string.');
+        if ( self::strlen( $s ) !== 32 ) {
+            throw new RangeException( 'Expected a 32-byte string.' );
         }
-        $h0 = self::load_4($s);
-        $h1 = self::load_3(self::substr($s, 4, 3)) << 6;
-        $h2 = self::load_3(self::substr($s, 7, 3)) << 5;
-        $h3 = self::load_3(self::substr($s, 10, 3)) << 3;
-        $h4 = self::load_3(self::substr($s, 13, 3)) << 2;
-        $h5 = self::load_4(self::substr($s, 16, 4));
-        $h6 = self::load_3(self::substr($s, 20, 3)) << 7;
-        $h7 = self::load_3(self::substr($s, 23, 3)) << 5;
-        $h8 = self::load_3(self::substr($s, 26, 3)) << 4;
-        $h9 = (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2;
-
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
+        $h0 = self::load_4( $s );
+        $h1 = self::load_3( self::substr( $s, 4, 3 ) ) << 6;
+        $h2 = self::load_3( self::substr( $s, 7, 3 ) ) << 5;
+        $h3 = self::load_3( self::substr( $s, 10, 3 ) ) << 3;
+        $h4 = self::load_3( self::substr( $s, 13, 3 ) ) << 2;
+        $h5 = self::load_4( self::substr( $s, 16, 4 ) );
+        $h6 = self::load_3( self::substr( $s, 20, 3 ) ) << 7;
+        $h7 = self::load_3( self::substr( $s, 23, 3 ) ) << 5;
+        $h8 = self::load_3( self::substr( $s, 26, 3 ) ) << 4;
+        $h9 = ( self::load_3( self::substr( $s, 29, 3 ) ) & 8388607 ) << 2;
+
+        $carry9 = ( $h9 + ( 1 << 24 ) ) >> 25;
+        $h0 += self::mul( $carry9, 19, 5 );
         $h9 -= $carry9 << 25;
-        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $carry1 = ( $h1 + ( 1 << 24 ) ) >> 25;
         $h2 += $carry1;
         $h1 -= $carry1 << 25;
-        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $carry3 = ( $h3 + ( 1 << 24 ) ) >> 25;
         $h4 += $carry3;
         $h3 -= $carry3 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $carry5 = ( $h5 + ( 1 << 24 ) ) >> 25;
         $h6 += $carry5;
         $h5 -= $carry5 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $carry7 = ( $h7 + ( 1 << 24 ) ) >> 25;
         $h8 += $carry7;
         $h7 -= $carry7 << 25;
 
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
-        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $carry2 = ( $h2 + ( 1 << 25 ) ) >> 26;
         $h3 += $carry2;
         $h2 -= $carry2 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $carry6 = ( $h6 + ( 1 << 25 ) ) >> 26;
         $h7 += $carry6;
         $h6 -= $carry6 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $carry8 = ( $h8 + ( 1 << 25 ) ) >> 26;
         $h9 += $carry8;
         $h8 -= $carry8 << 26;
 
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
             array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
+                (int)$h0,
+                (int)$h1,
+                (int)$h2,
+                (int)$h3,
+                (int)$h4,
+                (int)$h5,
+                (int)$h6,
+                (int)$h7,
+                (int)$h8,
+                (int)$h9
             )
         );
     }
@@ -189,32 +189,32 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $h
      * @return string
      */
-    public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h)
+    public static function fe_tobytes( ParagonIE_Sodium_Core_Curve25519_Fe $h )
     {
-        $h0 = (int) $h[0];
-        $h1 = (int) $h[1];
-        $h2 = (int) $h[2];
-        $h3 = (int) $h[3];
-        $h4 = (int) $h[4];
-        $h5 = (int) $h[5];
-        $h6 = (int) $h[6];
-        $h7 = (int) $h[7];
-        $h8 = (int) $h[8];
-        $h9 = (int) $h[9];
-
-        $q = (self::mul($h9, 19, 5) + (1 << 24)) >> 25;
-        $q = ($h0 + $q) >> 26;
-        $q = ($h1 + $q) >> 25;
-        $q = ($h2 + $q) >> 26;
-        $q = ($h3 + $q) >> 25;
-        $q = ($h4 + $q) >> 26;
-        $q = ($h5 + $q) >> 25;
-        $q = ($h6 + $q) >> 26;
-        $q = ($h7 + $q) >> 25;
-        $q = ($h8 + $q) >> 26;
-        $q = ($h9 + $q) >> 25;
-
-        $h0 += self::mul($q, 19, 5);
+        $h0 = (int)$h[ 0 ];
+        $h1 = (int)$h[ 1 ];
+        $h2 = (int)$h[ 2 ];
+        $h3 = (int)$h[ 3 ];
+        $h4 = (int)$h[ 4 ];
+        $h5 = (int)$h[ 5 ];
+        $h6 = (int)$h[ 6 ];
+        $h7 = (int)$h[ 7 ];
+        $h8 = (int)$h[ 8 ];
+        $h9 = (int)$h[ 9 ];
+
+        $q = ( self::mul( $h9, 19, 5 ) + ( 1 << 24 ) ) >> 25;
+        $q = ( $h0 + $q ) >> 26;
+        $q = ( $h1 + $q ) >> 25;
+        $q = ( $h2 + $q ) >> 26;
+        $q = ( $h3 + $q ) >> 25;
+        $q = ( $h4 + $q ) >> 26;
+        $q = ( $h5 + $q ) >> 25;
+        $q = ( $h6 + $q ) >> 26;
+        $q = ( $h7 + $q ) >> 25;
+        $q = ( $h8 + $q ) >> 26;
+        $q = ( $h9 + $q ) >> 25;
+
+        $h0 += self::mul( $q, 19, 5 );
 
         $carry0 = $h0 >> 26;
         $h1 += $carry0;
@@ -250,40 +250,40 @@ 
          * @var array<int, int>
          */
         $s = array(
-            (int) (($h0 >> 0) & 0xff),
-            (int) (($h0 >> 8) & 0xff),
-            (int) (($h0 >> 16) & 0xff),
-            (int) ((($h0 >> 24) | ($h1 << 2)) & 0xff),
-            (int) (($h1 >> 6) & 0xff),
-            (int) (($h1 >> 14) & 0xff),
-            (int) ((($h1 >> 22) | ($h2 << 3)) & 0xff),
-            (int) (($h2 >> 5) & 0xff),
-            (int) (($h2 >> 13) & 0xff),
-            (int) ((($h2 >> 21) | ($h3 << 5)) & 0xff),
-            (int) (($h3 >> 3) & 0xff),
-            (int) (($h3 >> 11) & 0xff),
-            (int) ((($h3 >> 19) | ($h4 << 6)) & 0xff),
-            (int) (($h4 >> 2) & 0xff),
-            (int) (($h4 >> 10) & 0xff),
-            (int) (($h4 >> 18) & 0xff),
-            (int) (($h5 >> 0) & 0xff),
-            (int) (($h5 >> 8) & 0xff),
-            (int) (($h5 >> 16) & 0xff),
-            (int) ((($h5 >> 24) | ($h6 << 1)) & 0xff),
-            (int) (($h6 >> 7) & 0xff),
-            (int) (($h6 >> 15) & 0xff),
-            (int) ((($h6 >> 23) | ($h7 << 3)) & 0xff),
-            (int) (($h7 >> 5) & 0xff),
-            (int) (($h7 >> 13) & 0xff),
-            (int) ((($h7 >> 21) | ($h8 << 4)) & 0xff),
-            (int) (($h8 >> 4) & 0xff),
-            (int) (($h8 >> 12) & 0xff),
-            (int) ((($h8 >> 20) | ($h9 << 6)) & 0xff),
-            (int) (($h9 >> 2) & 0xff),
-            (int) (($h9 >> 10) & 0xff),
-            (int) (($h9 >> 18) & 0xff)
+            (int)( ( $h0 >> 0 ) & 0xff ),
+            (int)( ( $h0 >> 8 ) & 0xff ),
+            (int)( ( $h0 >> 16 ) & 0xff ),
+            (int)( ( ( $h0 >> 24 ) | ( $h1 << 2 ) ) & 0xff ),
+            (int)( ( $h1 >> 6 ) & 0xff ),
+            (int)( ( $h1 >> 14 ) & 0xff ),
+            (int)( ( ( $h1 >> 22 ) | ( $h2 << 3 ) ) & 0xff ),
+            (int)( ( $h2 >> 5 ) & 0xff ),
+            (int)( ( $h2 >> 13 ) & 0xff ),
+            (int)( ( ( $h2 >> 21 ) | ( $h3 << 5 ) ) & 0xff ),
+            (int)( ( $h3 >> 3 ) & 0xff ),
+            (int)( ( $h3 >> 11 ) & 0xff ),
+            (int)( ( ( $h3 >> 19 ) | ( $h4 << 6 ) ) & 0xff ),
+            (int)( ( $h4 >> 2 ) & 0xff ),
+            (int)( ( $h4 >> 10 ) & 0xff ),
+            (int)( ( $h4 >> 18 ) & 0xff ),
+            (int)( ( $h5 >> 0 ) & 0xff ),
+            (int)( ( $h5 >> 8 ) & 0xff ),
+            (int)( ( $h5 >> 16 ) & 0xff ),
+            (int)( ( ( $h5 >> 24 ) | ( $h6 << 1 ) ) & 0xff ),
+            (int)( ( $h6 >> 7 ) & 0xff ),
+            (int)( ( $h6 >> 15 ) & 0xff ),
+            (int)( ( ( $h6 >> 23 ) | ( $h7 << 3 ) ) & 0xff ),
+            (int)( ( $h7 >> 5 ) & 0xff ),
+            (int)( ( $h7 >> 13 ) & 0xff ),
+            (int)( ( ( $h7 >> 21 ) | ( $h8 << 4 ) ) & 0xff ),
+            (int)( ( $h8 >> 4 ) & 0xff ),
+            (int)( ( $h8 >> 12 ) & 0xff ),
+            (int)( ( ( $h8 >> 20 ) | ( $h9 << 6 ) ) & 0xff ),
+            (int)( ( $h9 >> 2 ) & 0xff ),
+            (int)( ( $h9 >> 10 ) & 0xff ),
+            (int)( ( $h9 >> 18 ) & 0xff )
         );
-        return self::intArrayToString($s);
+        return self::intArrayToString( $s );
     }
 
     /**
@@ -296,10 +296,10 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function fe_isnegative(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_isnegative( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
-        $str = self::fe_tobytes($f);
-        return (int) (self::chrToInt($str[0]) & 1);
+        $str = self::fe_tobytes( $f );
+        return (int)( self::chrToInt( $str[ 0 ] ) & 1 );
     }
 
     /**
@@ -312,16 +312,16 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function fe_isnonzero(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_isnonzero( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
         static $zero;
-        if ($zero === null) {
-            $zero = str_repeat("\x00", 32);
+        if ( $zero === null ) {
+            $zero = str_repeat( "\x00", 32 );
         }
         /** @var string $zero */
         /** @var string $str */
-        $str = self::fe_tobytes($f);
-        return !self::verify_32($str, (string) $zero);
+        $str = self::fe_tobytes( $f );
+        return ! self::verify_32( $str, (string)$zero );
     }
 
     /**
@@ -342,206 +342,206 @@ 
         ParagonIE_Sodium_Core_Curve25519_Fe $f,
         ParagonIE_Sodium_Core_Curve25519_Fe $g
     ) {
-        $f0 = $f[0];
-        $f1 = $f[1];
-        $f2 = $f[2];
-        $f3 = $f[3];
-        $f4 = $f[4];
-        $f5 = $f[5];
-        $f6 = $f[6];
-        $f7 = $f[7];
-        $f8 = $f[8];
-        $f9 = $f[9];
-        $g0 = $g[0];
-        $g1 = $g[1];
-        $g2 = $g[2];
-        $g3 = $g[3];
-        $g4 = $g[4];
-        $g5 = $g[5];
-        $g6 = $g[6];
-        $g7 = $g[7];
-        $g8 = $g[8];
-        $g9 = $g[9];
-        $g1_19 = self::mul($g1, 19, 5);
-        $g2_19 = self::mul($g2, 19, 5);
-        $g3_19 = self::mul($g3, 19, 5);
-        $g4_19 = self::mul($g4, 19, 5);
-        $g5_19 = self::mul($g5, 19, 5);
-        $g6_19 = self::mul($g6, 19, 5);
-        $g7_19 = self::mul($g7, 19, 5);
-        $g8_19 = self::mul($g8, 19, 5);
-        $g9_19 = self::mul($g9, 19, 5);
+        $f0 = $f[ 0 ];
+        $f1 = $f[ 1 ];
+        $f2 = $f[ 2 ];
+        $f3 = $f[ 3 ];
+        $f4 = $f[ 4 ];
+        $f5 = $f[ 5 ];
+        $f6 = $f[ 6 ];
+        $f7 = $f[ 7 ];
+        $f8 = $f[ 8 ];
+        $f9 = $f[ 9 ];
+        $g0 = $g[ 0 ];
+        $g1 = $g[ 1 ];
+        $g2 = $g[ 2 ];
+        $g3 = $g[ 3 ];
+        $g4 = $g[ 4 ];
+        $g5 = $g[ 5 ];
+        $g6 = $g[ 6 ];
+        $g7 = $g[ 7 ];
+        $g8 = $g[ 8 ];
+        $g9 = $g[ 9 ];
+        $g1_19 = self::mul( $g1, 19, 5 );
+        $g2_19 = self::mul( $g2, 19, 5 );
+        $g3_19 = self::mul( $g3, 19, 5 );
+        $g4_19 = self::mul( $g4, 19, 5 );
+        $g5_19 = self::mul( $g5, 19, 5 );
+        $g6_19 = self::mul( $g6, 19, 5 );
+        $g7_19 = self::mul( $g7, 19, 5 );
+        $g8_19 = self::mul( $g8, 19, 5 );
+        $g9_19 = self::mul( $g9, 19, 5 );
         $f1_2 = $f1 << 1;
         $f3_2 = $f3 << 1;
         $f5_2 = $f5 << 1;
         $f7_2 = $f7 << 1;
         $f9_2 = $f9 << 1;
-        $f0g0    = self::mul($f0,    $g0, 26);
-        $f0g1    = self::mul($f0,    $g1, 25);
-        $f0g2    = self::mul($f0,    $g2, 26);
-        $f0g3    = self::mul($f0,    $g3, 25);
-        $f0g4    = self::mul($f0,    $g4, 26);
-        $f0g5    = self::mul($f0,    $g5, 25);
-        $f0g6    = self::mul($f0,    $g6, 26);
-        $f0g7    = self::mul($f0,    $g7, 25);
-        $f0g8    = self::mul($f0,    $g8, 26);
-        $f0g9    = self::mul($f0,    $g9, 26);
-        $f1g0    = self::mul($f1,    $g0, 26);
-        $f1g1_2  = self::mul($f1_2,  $g1, 25);
-        $f1g2    = self::mul($f1,    $g2, 26);
-        $f1g3_2  = self::mul($f1_2,  $g3, 25);
-        $f1g4    = self::mul($f1,    $g4, 26);
-        $f1g5_2  = self::mul($f1_2,  $g5, 25);
-        $f1g6    = self::mul($f1,    $g6, 26);
-        $f1g7_2  = self::mul($f1_2,  $g7, 25);
-        $f1g8    = self::mul($f1,    $g8, 26);
-        $f1g9_38 = self::mul($g9_19, $f1_2, 26);
-        $f2g0    = self::mul($f2,    $g0, 26);
-        $f2g1    = self::mul($f2,    $g1, 25);
-        $f2g2    = self::mul($f2,    $g2, 26);
-        $f2g3    = self::mul($f2,    $g3, 25);
-        $f2g4    = self::mul($f2,    $g4, 26);
-        $f2g5    = self::mul($f2,    $g5, 25);
-        $f2g6    = self::mul($f2,    $g6, 26);
-        $f2g7    = self::mul($f2,    $g7, 25);
-        $f2g8_19 = self::mul($g8_19, $f2, 26);
-        $f2g9_19 = self::mul($g9_19, $f2, 26);
-        $f3g0    = self::mul($f3,    $g0, 26);
-        $f3g1_2  = self::mul($f3_2,  $g1, 25);
-        $f3g2    = self::mul($f3,    $g2, 26);
-        $f3g3_2  = self::mul($f3_2,  $g3, 25);
-        $f3g4    = self::mul($f3,    $g4, 26);
-        $f3g5_2  = self::mul($f3_2,  $g5, 25);
-        $f3g6    = self::mul($f3,    $g6, 26);
-        $f3g7_38 = self::mul($g7_19, $f3_2, 26);
-        $f3g8_19 = self::mul($g8_19, $f3, 25);
-        $f3g9_38 = self::mul($g9_19, $f3_2, 26);
-        $f4g0    = self::mul($f4,    $g0, 26);
-        $f4g1    = self::mul($f4,    $g1, 25);
-        $f4g2    = self::mul($f4,    $g2, 26);
-        $f4g3    = self::mul($f4,    $g3, 25);
-        $f4g4    = self::mul($f4,    $g4, 26);
-        $f4g5    = self::mul($f4,    $g5, 25);
-        $f4g6_19 = self::mul($g6_19, $f4, 26);
-        $f4g7_19 = self::mul($g7_19, $f4, 26);
-        $f4g8_19 = self::mul($g8_19, $f4, 26);
-        $f4g9_19 = self::mul($g9_19, $f4, 26);
-        $f5g0    = self::mul($f5,    $g0, 26);
-        $f5g1_2  = self::mul($f5_2,  $g1, 25);
-        $f5g2    = self::mul($f5,    $g2, 26);
-        $f5g3_2  = self::mul($f5_2,  $g3, 25);
-        $f5g4    = self::mul($f5,    $g4, 26);
-        $f5g5_38 = self::mul($g5_19, $f5_2, 26);
-        $f5g6_19 = self::mul($g6_19, $f5, 25);
-        $f5g7_38 = self::mul($g7_19, $f5_2, 26);
-        $f5g8_19 = self::mul($g8_19, $f5, 25);
-        $f5g9_38 = self::mul($g9_19, $f5_2, 26);
-        $f6g0    = self::mul($f6,    $g0, 26);
-        $f6g1    = self::mul($f6,    $g1, 25);
-        $f6g2    = self::mul($f6,    $g2, 26);
-        $f6g3    = self::mul($f6,    $g3, 25);
-        $f6g4_19 = self::mul($g4_19, $f6, 26);
-        $f6g5_19 = self::mul($g5_19, $f6, 26);
-        $f6g6_19 = self::mul($g6_19, $f6, 26);
-        $f6g7_19 = self::mul($g7_19, $f6, 26);
-        $f6g8_19 = self::mul($g8_19, $f6, 26);
-        $f6g9_19 = self::mul($g9_19, $f6, 26);
-        $f7g0    = self::mul($f7,    $g0, 26);
-        $f7g1_2  = self::mul($f7_2,  $g1, 25);
-        $f7g2    = self::mul($f7,    $g2, 26);
-        $f7g3_38 = self::mul($g3_19, $f7_2, 26);
-        $f7g4_19 = self::mul($g4_19, $f7, 26);
-        $f7g5_38 = self::mul($g5_19, $f7_2, 26);
-        $f7g6_19 = self::mul($g6_19, $f7, 25);
-        $f7g7_38 = self::mul($g7_19, $f7_2, 26);
-        $f7g8_19 = self::mul($g8_19, $f7, 25);
-        $f7g9_38 = self::mul($g9_19,$f7_2, 26);
-        $f8g0    = self::mul($f8,    $g0, 26);
-        $f8g1    = self::mul($f8,    $g1, 25);
-        $f8g2_19 = self::mul($g2_19, $f8, 26);
-        $f8g3_19 = self::mul($g3_19, $f8, 26);
-        $f8g4_19 = self::mul($g4_19, $f8, 26);
-        $f8g5_19 = self::mul($g5_19, $f8, 26);
-        $f8g6_19 = self::mul($g6_19, $f8, 26);
-        $f8g7_19 = self::mul($g7_19, $f8, 26);
-        $f8g8_19 = self::mul($g8_19, $f8, 26);
-        $f8g9_19 = self::mul($g9_19, $f8, 26);
-        $f9g0    = self::mul($f9,    $g0, 26);
-        $f9g1_38 = self::mul($g1_19, $f9_2, 26);
-        $f9g2_19 = self::mul($g2_19, $f9, 25);
-        $f9g3_38 = self::mul($g3_19, $f9_2, 26);
-        $f9g4_19 = self::mul($g4_19, $f9, 25);
-        $f9g5_38 = self::mul($g5_19, $f9_2, 26);
-        $f9g6_19 = self::mul($g6_19, $f9, 25);
-        $f9g7_38 = self::mul($g7_19, $f9_2, 26);
-        $f9g8_19 = self::mul($g8_19, $f9, 25);
-        $f9g9_38 = self::mul($g9_19, $f9_2, 26);
+        $f0g0    = self::mul( $f0, $g0, 26 );
+        $f0g1    = self::mul( $f0, $g1, 25 );
+        $f0g2    = self::mul( $f0, $g2, 26 );
+        $f0g3    = self::mul( $f0, $g3, 25 );
+        $f0g4    = self::mul( $f0, $g4, 26 );
+        $f0g5    = self::mul( $f0, $g5, 25 );
+        $f0g6    = self::mul( $f0, $g6, 26 );
+        $f0g7    = self::mul( $f0, $g7, 25 );
+        $f0g8    = self::mul( $f0, $g8, 26 );
+        $f0g9    = self::mul( $f0, $g9, 26 );
+        $f1g0    = self::mul( $f1, $g0, 26 );
+        $f1g1_2  = self::mul( $f1_2, $g1, 25 );
+        $f1g2    = self::mul( $f1, $g2, 26 );
+        $f1g3_2  = self::mul( $f1_2, $g3, 25 );
+        $f1g4    = self::mul( $f1, $g4, 26 );
+        $f1g5_2  = self::mul( $f1_2, $g5, 25 );
+        $f1g6    = self::mul( $f1, $g6, 26 );
+        $f1g7_2  = self::mul( $f1_2, $g7, 25 );
+        $f1g8    = self::mul( $f1, $g8, 26 );
+        $f1g9_38 = self::mul( $g9_19, $f1_2, 26 );
+        $f2g0    = self::mul( $f2, $g0, 26 );
+        $f2g1    = self::mul( $f2, $g1, 25 );
+        $f2g2    = self::mul( $f2, $g2, 26 );
+        $f2g3    = self::mul( $f2, $g3, 25 );
+        $f2g4    = self::mul( $f2, $g4, 26 );
+        $f2g5    = self::mul( $f2, $g5, 25 );
+        $f2g6    = self::mul( $f2, $g6, 26 );
+        $f2g7    = self::mul( $f2, $g7, 25 );
+        $f2g8_19 = self::mul( $g8_19, $f2, 26 );
+        $f2g9_19 = self::mul( $g9_19, $f2, 26 );
+        $f3g0    = self::mul( $f3, $g0, 26 );
+        $f3g1_2  = self::mul( $f3_2, $g1, 25 );
+        $f3g2    = self::mul( $f3, $g2, 26 );
+        $f3g3_2  = self::mul( $f3_2, $g3, 25 );
+        $f3g4    = self::mul( $f3, $g4, 26 );
+        $f3g5_2  = self::mul( $f3_2, $g5, 25 );
+        $f3g6    = self::mul( $f3, $g6, 26 );
+        $f3g7_38 = self::mul( $g7_19, $f3_2, 26 );
+        $f3g8_19 = self::mul( $g8_19, $f3, 25 );
+        $f3g9_38 = self::mul( $g9_19, $f3_2, 26 );
+        $f4g0    = self::mul( $f4, $g0, 26 );
+        $f4g1    = self::mul( $f4, $g1, 25 );
+        $f4g2    = self::mul( $f4, $g2, 26 );
+        $f4g3    = self::mul( $f4, $g3, 25 );
+        $f4g4    = self::mul( $f4, $g4, 26 );
+        $f4g5    = self::mul( $f4, $g5, 25 );
+        $f4g6_19 = self::mul( $g6_19, $f4, 26 );
+        $f4g7_19 = self::mul( $g7_19, $f4, 26 );
+        $f4g8_19 = self::mul( $g8_19, $f4, 26 );
+        $f4g9_19 = self::mul( $g9_19, $f4, 26 );
+        $f5g0    = self::mul( $f5, $g0, 26 );
+        $f5g1_2  = self::mul( $f5_2, $g1, 25 );
+        $f5g2    = self::mul( $f5, $g2, 26 );
+        $f5g3_2  = self::mul( $f5_2, $g3, 25 );
+        $f5g4    = self::mul( $f5, $g4, 26 );
+        $f5g5_38 = self::mul( $g5_19, $f5_2, 26 );
+        $f5g6_19 = self::mul( $g6_19, $f5, 25 );
+        $f5g7_38 = self::mul( $g7_19, $f5_2, 26 );
+        $f5g8_19 = self::mul( $g8_19, $f5, 25 );
+        $f5g9_38 = self::mul( $g9_19, $f5_2, 26 );
+        $f6g0    = self::mul( $f6, $g0, 26 );
+        $f6g1    = self::mul( $f6, $g1, 25 );
+        $f6g2    = self::mul( $f6, $g2, 26 );
+        $f6g3    = self::mul( $f6, $g3, 25 );
+        $f6g4_19 = self::mul( $g4_19, $f6, 26 );
+        $f6g5_19 = self::mul( $g5_19, $f6, 26 );
+        $f6g6_19 = self::mul( $g6_19, $f6, 26 );
+        $f6g7_19 = self::mul( $g7_19, $f6, 26 );
+        $f6g8_19 = self::mul( $g8_19, $f6, 26 );
+        $f6g9_19 = self::mul( $g9_19, $f6, 26 );
+        $f7g0    = self::mul( $f7, $g0, 26 );
+        $f7g1_2  = self::mul( $f7_2, $g1, 25 );
+        $f7g2    = self::mul( $f7, $g2, 26 );
+        $f7g3_38 = self::mul( $g3_19, $f7_2, 26 );
+        $f7g4_19 = self::mul( $g4_19, $f7, 26 );
+        $f7g5_38 = self::mul( $g5_19, $f7_2, 26 );
+        $f7g6_19 = self::mul( $g6_19, $f7, 25 );
+        $f7g7_38 = self::mul( $g7_19, $f7_2, 26 );
+        $f7g8_19 = self::mul( $g8_19, $f7, 25 );
+        $f7g9_38 = self::mul( $g9_19, $f7_2, 26 );
+        $f8g0    = self::mul( $f8, $g0, 26 );
+        $f8g1    = self::mul( $f8, $g1, 25 );
+        $f8g2_19 = self::mul( $g2_19, $f8, 26 );
+        $f8g3_19 = self::mul( $g3_19, $f8, 26 );
+        $f8g4_19 = self::mul( $g4_19, $f8, 26 );
+        $f8g5_19 = self::mul( $g5_19, $f8, 26 );
+        $f8g6_19 = self::mul( $g6_19, $f8, 26 );
+        $f8g7_19 = self::mul( $g7_19, $f8, 26 );
+        $f8g8_19 = self::mul( $g8_19, $f8, 26 );
+        $f8g9_19 = self::mul( $g9_19, $f8, 26 );
+        $f9g0    = self::mul( $f9, $g0, 26 );
+        $f9g1_38 = self::mul( $g1_19, $f9_2, 26 );
+        $f9g2_19 = self::mul( $g2_19, $f9, 25 );
+        $f9g3_38 = self::mul( $g3_19, $f9_2, 26 );
+        $f9g4_19 = self::mul( $g4_19, $f9, 25 );
+        $f9g5_38 = self::mul( $g5_19, $f9_2, 26 );
+        $f9g6_19 = self::mul( $g6_19, $f9, 25 );
+        $f9g7_38 = self::mul( $g7_19, $f9_2, 26 );
+        $f9g8_19 = self::mul( $g8_19, $f9, 25 );
+        $f9g9_38 = self::mul( $g9_19, $f9_2, 26 );
         $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
-        $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
-        $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
-        $h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
-        $h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
-        $h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
-        $h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
-        $h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
-        $h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
-        $h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 = $f0g1 + $f1g0 + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
+        $h2 = $f0g2 + $f1g1_2 + $f2g0 + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
+        $h3 = $f0g3 + $f1g2 + $f2g1 + $f3g0 + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
+        $h4 = $f0g4 + $f1g3_2 + $f2g2 + $f3g1_2 + $f4g0 + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
+        $h5 = $f0g5 + $f1g4 + $f2g3 + $f3g2 + $f4g1 + $f5g0 + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
+        $h6 = $f0g6 + $f1g5_2 + $f2g4 + $f3g3_2 + $f4g2 + $f5g1_2 + $f6g0 + $f7g9_38 + $f8g8_19 + $f9g7_38;
+        $h7 = $f0g7 + $f1g6 + $f2g5 + $f3g4 + $f4g3 + $f5g2 + $f6g1 + $f7g0 + $f8g9_19 + $f9g8_19;
+        $h8 = $f0g8 + $f1g7_2 + $f2g6 + $f3g5_2 + $f4g4 + $f5g3_2 + $f6g2 + $f7g1_2 + $f8g0 + $f9g9_38;
+        $h9 = $f0g9 + $f1g8 + $f2g7 + $f3g6 + $f4g5 + $f5g4 + $f6g3 + $f7g2 + $f8g1 + $f9g0;
+
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
 
-        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $carry1 = ( $h1 + ( 1 << 24 ) ) >> 25;
         $h2 += $carry1;
         $h1 -= $carry1 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $carry5 = ( $h5 + ( 1 << 24 ) ) >> 25;
         $h6 += $carry5;
         $h5 -= $carry5 << 25;
 
-        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $carry2 = ( $h2 + ( 1 << 25 ) ) >> 26;
         $h3 += $carry2;
         $h2 -= $carry2 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $carry6 = ( $h6 + ( 1 << 25 ) ) >> 26;
         $h7 += $carry6;
         $h6 -= $carry6 << 26;
 
-        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $carry3 = ( $h3 + ( 1 << 24 ) ) >> 25;
         $h4 += $carry3;
         $h3 -= $carry3 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $carry7 = ( $h7 + ( 1 << 24 ) ) >> 25;
         $h8 += $carry7;
         $h7 -= $carry7 << 25;
 
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $carry8 = ( $h8 + ( 1 << 25 ) ) >> 26;
         $h9 += $carry8;
         $h8 -= $carry8 << 26;
 
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
+        $carry9 = ( $h9 + ( 1 << 24 ) ) >> 25;
+        $h0 += self::mul( $carry9, 19, 5 );
         $h9 -= $carry9 << 25;
 
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
 
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
             array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
+                (int)$h0,
+                (int)$h1,
+                (int)$h2,
+                (int)$h3,
+                (int)$h4,
+                (int)$h5,
+                (int)$h6,
+                (int)$h7,
+                (int)$h8,
+                (int)$h9
             )
         );
     }
@@ -557,11 +557,11 @@ 
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      * @psalm-suppress MixedAssignment
      */
-    public static function fe_neg(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_neg( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
         $h = new ParagonIE_Sodium_Core_Curve25519_Fe();
-        for ($i = 0; $i < 10; ++$i) {
-            $h[$i] = -$f[$i];
+        for ( $i = 0; $i < 10; ++$i ) {
+            $h[ $i ] = -$f[ $i ];
         }
         return $h;
     }
@@ -576,18 +576,18 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_sq( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
-        $f0 = (int) $f[0];
-        $f1 = (int) $f[1];
-        $f2 = (int) $f[2];
-        $f3 = (int) $f[3];
-        $f4 = (int) $f[4];
-        $f5 = (int) $f[5];
-        $f6 = (int) $f[6];
-        $f7 = (int) $f[7];
-        $f8 = (int) $f[8];
-        $f9 = (int) $f[9];
+        $f0 = (int)$f[ 0 ];
+        $f1 = (int)$f[ 1 ];
+        $f2 = (int)$f[ 2 ];
+        $f3 = (int)$f[ 3 ];
+        $f4 = (int)$f[ 4 ];
+        $f5 = (int)$f[ 5 ];
+        $f6 = (int)$f[ 6 ];
+        $f7 = (int)$f[ 7 ];
+        $f8 = (int)$f[ 8 ];
+        $f9 = (int)$f[ 9 ];
 
         $f0_2 = $f0 << 1;
         $f1_2 = $f1 << 1;
@@ -597,132 +597,132 @@ 
         $f5_2 = $f5 << 1;
         $f6_2 = $f6 << 1;
         $f7_2 = $f7 << 1;
-        $f5_38 = self::mul($f5, 38, 6);
-        $f6_19 = self::mul($f6, 19, 5);
-        $f7_38 = self::mul($f7, 38, 6);
-        $f8_19 = self::mul($f8, 19, 5);
-        $f9_38 = self::mul($f9, 38, 6);
-        $f0f0    = self::mul($f0,    $f0,    26);
-        $f0f1_2  = self::mul($f0_2,  $f1,    26);
-        $f0f2_2  = self::mul($f0_2,  $f2,    26);
-        $f0f3_2  = self::mul($f0_2,  $f3,    26);
-        $f0f4_2  = self::mul($f0_2,  $f4,    26);
-        $f0f5_2  = self::mul($f0_2,  $f5,    26);
-        $f0f6_2  = self::mul($f0_2,  $f6,    26);
-        $f0f7_2  = self::mul($f0_2,  $f7,    26);
-        $f0f8_2  = self::mul($f0_2,  $f8,    26);
-        $f0f9_2  = self::mul($f0_2,  $f9,    26);
-        $f1f1_2  = self::mul($f1_2,  $f1,    26);
-        $f1f2_2  = self::mul($f1_2,  $f2,    26);
-        $f1f3_4  = self::mul($f1_2,  $f3_2,  26);
-        $f1f4_2  = self::mul($f1_2,  $f4,    26);
-        $f1f5_4  = self::mul($f1_2,  $f5_2,  26);
-        $f1f6_2  = self::mul($f1_2,  $f6,    26);
-        $f1f7_4  = self::mul($f1_2,  $f7_2,  26);
-        $f1f8_2  = self::mul($f1_2,  $f8,    26);
-        $f1f9_76 = self::mul($f9_38, $f1_2,  27);
-        $f2f2    = self::mul($f2,    $f2,    27);
-        $f2f3_2  = self::mul($f2_2,  $f3,    27);
-        $f2f4_2  = self::mul($f2_2,  $f4,    27);
-        $f2f5_2  = self::mul($f2_2,  $f5,    27);
-        $f2f6_2  = self::mul($f2_2,  $f6,    27);
-        $f2f7_2  = self::mul($f2_2,  $f7,    27);
-        $f2f8_38 = self::mul($f8_19, $f2_2,  27);
-        $f2f9_38 = self::mul($f9_38, $f2,    26);
-        $f3f3_2  = self::mul($f3_2,  $f3,    26);
-        $f3f4_2  = self::mul($f3_2,  $f4,    26);
-        $f3f5_4  = self::mul($f3_2,  $f5_2,  26);
-        $f3f6_2  = self::mul($f3_2,  $f6,    26);
-        $f3f7_76 = self::mul($f7_38, $f3_2,  26);
-        $f3f8_38 = self::mul($f8_19, $f3_2,  26);
-        $f3f9_76 = self::mul($f9_38, $f3_2,  26);
-        $f4f4    = self::mul($f4,    $f4,    26);
-        $f4f5_2  = self::mul($f4_2,  $f5,    26);
-        $f4f6_38 = self::mul($f6_19, $f4_2,  27);
-        $f4f7_38 = self::mul($f7_38, $f4,    26);
-        $f4f8_38 = self::mul($f8_19, $f4_2,  27);
-        $f4f9_38 = self::mul($f9_38, $f4,    26);
-        $f5f5_38 = self::mul($f5_38, $f5,    26);
-        $f5f6_38 = self::mul($f6_19, $f5_2,  26);
-        $f5f7_76 = self::mul($f7_38, $f5_2,  26);
-        $f5f8_38 = self::mul($f8_19, $f5_2,  26);
-        $f5f9_76 = self::mul($f9_38, $f5_2,  26);
-        $f6f6_19 = self::mul($f6_19, $f6,    26);
-        $f6f7_38 = self::mul($f7_38, $f6,    26);
-        $f6f8_38 = self::mul($f8_19, $f6_2,  27);
-        $f6f9_38 = self::mul($f9_38, $f6,    26);
-        $f7f7_38 = self::mul($f7_38, $f7,    26);
-        $f7f8_38 = self::mul($f8_19, $f7_2,  26);
-        $f7f9_76 = self::mul($f9_38, $f7_2,  26);
-        $f8f8_19 = self::mul($f8_19, $f8,    26);
-        $f8f9_38 = self::mul($f9_38, $f8,    26);
-        $f9f9_38 = self::mul($f9_38, $f9,    26);
-        $h0 = $f0f0   + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38;
+        $f5_38 = self::mul( $f5, 38, 6 );
+        $f6_19 = self::mul( $f6, 19, 5 );
+        $f7_38 = self::mul( $f7, 38, 6 );
+        $f8_19 = self::mul( $f8, 19, 5 );
+        $f9_38 = self::mul( $f9, 38, 6 );
+        $f0f0    = self::mul( $f0, $f0, 26 );
+        $f0f1_2  = self::mul( $f0_2, $f1, 26 );
+        $f0f2_2  = self::mul( $f0_2, $f2, 26 );
+        $f0f3_2  = self::mul( $f0_2, $f3, 26 );
+        $f0f4_2  = self::mul( $f0_2, $f4, 26 );
+        $f0f5_2  = self::mul( $f0_2, $f5, 26 );
+        $f0f6_2  = self::mul( $f0_2, $f6, 26 );
+        $f0f7_2  = self::mul( $f0_2, $f7, 26 );
+        $f0f8_2  = self::mul( $f0_2, $f8, 26 );
+        $f0f9_2  = self::mul( $f0_2, $f9, 26 );
+        $f1f1_2  = self::mul( $f1_2, $f1, 26 );
+        $f1f2_2  = self::mul( $f1_2, $f2, 26 );
+        $f1f3_4  = self::mul( $f1_2, $f3_2, 26 );
+        $f1f4_2  = self::mul( $f1_2, $f4, 26 );
+        $f1f5_4  = self::mul( $f1_2, $f5_2, 26 );
+        $f1f6_2  = self::mul( $f1_2, $f6, 26 );
+        $f1f7_4  = self::mul( $f1_2, $f7_2, 26 );
+        $f1f8_2  = self::mul( $f1_2, $f8, 26 );
+        $f1f9_76 = self::mul( $f9_38, $f1_2, 27 );
+        $f2f2    = self::mul( $f2, $f2, 27 );
+        $f2f3_2  = self::mul( $f2_2, $f3, 27 );
+        $f2f4_2  = self::mul( $f2_2, $f4, 27 );
+        $f2f5_2  = self::mul( $f2_2, $f5, 27 );
+        $f2f6_2  = self::mul( $f2_2, $f6, 27 );
+        $f2f7_2  = self::mul( $f2_2, $f7, 27 );
+        $f2f8_38 = self::mul( $f8_19, $f2_2, 27 );
+        $f2f9_38 = self::mul( $f9_38, $f2, 26 );
+        $f3f3_2  = self::mul( $f3_2, $f3, 26 );
+        $f3f4_2  = self::mul( $f3_2, $f4, 26 );
+        $f3f5_4  = self::mul( $f3_2, $f5_2, 26 );
+        $f3f6_2  = self::mul( $f3_2, $f6, 26 );
+        $f3f7_76 = self::mul( $f7_38, $f3_2, 26 );
+        $f3f8_38 = self::mul( $f8_19, $f3_2, 26 );
+        $f3f9_76 = self::mul( $f9_38, $f3_2, 26 );
+        $f4f4    = self::mul( $f4, $f4, 26 );
+        $f4f5_2  = self::mul( $f4_2, $f5, 26 );
+        $f4f6_38 = self::mul( $f6_19, $f4_2, 27 );
+        $f4f7_38 = self::mul( $f7_38, $f4, 26 );
+        $f4f8_38 = self::mul( $f8_19, $f4_2, 27 );
+        $f4f9_38 = self::mul( $f9_38, $f4, 26 );
+        $f5f5_38 = self::mul( $f5_38, $f5, 26 );
+        $f5f6_38 = self::mul( $f6_19, $f5_2, 26 );
+        $f5f7_76 = self::mul( $f7_38, $f5_2, 26 );
+        $f5f8_38 = self::mul( $f8_19, $f5_2, 26 );
+        $f5f9_76 = self::mul( $f9_38, $f5_2, 26 );
+        $f6f6_19 = self::mul( $f6_19, $f6, 26 );
+        $f6f7_38 = self::mul( $f7_38, $f6, 26 );
+        $f6f8_38 = self::mul( $f8_19, $f6_2, 27 );
+        $f6f9_38 = self::mul( $f9_38, $f6, 26 );
+        $f7f7_38 = self::mul( $f7_38, $f7, 26 );
+        $f7f8_38 = self::mul( $f8_19, $f7_2, 26 );
+        $f7f9_76 = self::mul( $f9_38, $f7_2, 26 );
+        $f8f8_19 = self::mul( $f8_19, $f8, 26 );
+        $f8f9_38 = self::mul( $f9_38, $f8, 26 );
+        $f9f9_38 = self::mul( $f9_38, $f9, 26 );
+        $h0 = $f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38;
         $h1 = $f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38;
-        $h2 = $f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19;
-        $h3 = $f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38;
-        $h4 = $f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38;
-        $h5 = $f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38;
-        $h6 = $f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19;
-        $h7 = $f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38;
-        $h8 = $f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38;
-        $h9 = $f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h2 = $f0f2_2 + $f1f1_2 + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19;
+        $h3 = $f0f3_2 + $f1f2_2 + $f4f9_38 + $f5f8_38 + $f6f7_38;
+        $h4 = $f0f4_2 + $f1f3_4 + $f2f2 + $f5f9_76 + $f6f8_38 + $f7f7_38;
+        $h5 = $f0f5_2 + $f1f4_2 + $f2f3_2 + $f6f9_38 + $f7f8_38;
+        $h6 = $f0f6_2 + $f1f5_4 + $f2f4_2 + $f3f3_2 + $f7f9_76 + $f8f8_19;
+        $h7 = $f0f7_2 + $f1f6_2 + $f2f5_2 + $f3f4_2 + $f8f9_38;
+        $h8 = $f0f8_2 + $f1f7_4 + $f2f6_2 + $f3f5_4 + $f4f4 + $f9f9_38;
+        $h9 = $f0f9_2 + $f1f8_2 + $f2f7_2 + $f3f6_2 + $f4f5_2;
+
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
 
-        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $carry1 = ( $h1 + ( 1 << 24 ) ) >> 25;
         $h2 += $carry1;
         $h1 -= $carry1 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $carry5 = ( $h5 + ( 1 << 24 ) ) >> 25;
         $h6 += $carry5;
         $h5 -= $carry5 << 25;
 
-        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $carry2 = ( $h2 + ( 1 << 25 ) ) >> 26;
         $h3 += $carry2;
         $h2 -= $carry2 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $carry6 = ( $h6 + ( 1 << 25 ) ) >> 26;
         $h7 += $carry6;
         $h6 -= $carry6 << 26;
 
-        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $carry3 = ( $h3 + ( 1 << 24 ) ) >> 25;
         $h4 += $carry3;
         $h3 -= $carry3 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $carry7 = ( $h7 + ( 1 << 24 ) ) >> 25;
         $h8 += $carry7;
         $h7 -= $carry7 << 25;
 
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $carry8 = ( $h8 + ( 1 << 25 ) ) >> 26;
         $h9 += $carry8;
         $h8 -= $carry8 << 26;
 
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
+        $carry9 = ( $h9 + ( 1 << 24 ) ) >> 25;
+        $h0 += self::mul( $carry9, 19, 5 );
         $h9 -= $carry9 << 25;
 
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
 
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
             array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
+                (int)$h0,
+                (int)$h1,
+                (int)$h2,
+                (int)$h3,
+                (int)$h4,
+                (int)$h5,
+                (int)$h6,
+                (int)$h7,
+                (int)$h8,
+                (int)$h9
             )
         );
     }
@@ -738,18 +738,18 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_sq2( ParagonIE_Sodium_Core_Curve25519_Fe $f )
     {
-        $f0 = (int) $f[0];
-        $f1 = (int) $f[1];
-        $f2 = (int) $f[2];
-        $f3 = (int) $f[3];
-        $f4 = (int) $f[4];
-        $f5 = (int) $f[5];
-        $f6 = (int) $f[6];
-        $f7 = (int) $f[7];
-        $f8 = (int) $f[8];
-        $f9 = (int) $f[9];
+        $f0 = (int)$f[ 0 ];
+        $f1 = (int)$f[ 1 ];
+        $f2 = (int)$f[ 2 ];
+        $f3 = (int)$f[ 3 ];
+        $f4 = (int)$f[ 4 ];
+        $f5 = (int)$f[ 5 ];
+        $f6 = (int)$f[ 6 ];
+        $f7 = (int)$f[ 7 ];
+        $f8 = (int)$f[ 8 ];
+        $f9 = (int)$f[ 9 ];
 
         $f0_2 = $f0 << 1;
         $f1_2 = $f1 << 1;
@@ -759,133 +759,133 @@ 
         $f5_2 = $f5 << 1;
         $f6_2 = $f6 << 1;
         $f7_2 = $f7 << 1;
-        $f5_38 = self::mul($f5, 38, 6); /* 1.959375*2^30 */
-        $f6_19 = self::mul($f6, 19, 5); /* 1.959375*2^30 */
-        $f7_38 = self::mul($f7, 38, 6); /* 1.959375*2^30 */
-        $f8_19 = self::mul($f8, 19, 5); /* 1.959375*2^30 */
-        $f9_38 = self::mul($f9, 38, 6); /* 1.959375*2^30 */
-        $f0f0 = self::mul($f0, $f0, 24);
-        $f0f1_2 = self::mul($f0_2, $f1, 24);
-        $f0f2_2 = self::mul($f0_2, $f2, 24);
-        $f0f3_2 = self::mul($f0_2, $f3, 24);
-        $f0f4_2 = self::mul($f0_2, $f4, 24);
-        $f0f5_2 = self::mul($f0_2, $f5, 24);
-        $f0f6_2 = self::mul($f0_2, $f6, 24);
-        $f0f7_2 = self::mul($f0_2, $f7, 24);
-        $f0f8_2 = self::mul($f0_2, $f8, 24);
-        $f0f9_2 = self::mul($f0_2, $f9, 24);
-        $f1f1_2 = self::mul($f1_2,  $f1, 24);
-        $f1f2_2 = self::mul($f1_2,  $f2, 24);
-        $f1f3_4 = self::mul($f1_2,  $f3_2, 24);
-        $f1f4_2 = self::mul($f1_2,  $f4, 24);
-        $f1f5_4 = self::mul($f1_2,  $f5_2, 24);
-        $f1f6_2 = self::mul($f1_2,  $f6, 24);
-        $f1f7_4 = self::mul($f1_2,  $f7_2, 24);
-        $f1f8_2 = self::mul($f1_2,  $f8, 24);
-        $f1f9_76 = self::mul($f9_38, $f1_2, 24);
-        $f2f2 = self::mul($f2,  $f2, 24);
-        $f2f3_2 = self::mul($f2_2,  $f3, 24);
-        $f2f4_2 = self::mul($f2_2,  $f4, 24);
-        $f2f5_2 = self::mul($f2_2,  $f5, 24);
-        $f2f6_2 = self::mul($f2_2,  $f6, 24);
-        $f2f7_2 = self::mul($f2_2,  $f7, 24);
-        $f2f8_38 = self::mul($f8_19, $f2_2, 25);
-        $f2f9_38 = self::mul($f9_38, $f2, 24);
-        $f3f3_2 = self::mul($f3_2,  $f3, 24);
-        $f3f4_2 = self::mul($f3_2,  $f4, 24);
-        $f3f5_4 = self::mul($f3_2,  $f5_2, 24);
-        $f3f6_2 = self::mul($f3_2,  $f6, 24);
-        $f3f7_76 = self::mul($f7_38, $f3_2, 24);
-        $f3f8_38 = self::mul($f8_19, $f3_2, 24);
-        $f3f9_76 = self::mul($f9_38, $f3_2, 24);
-        $f4f4 = self::mul($f4,  $f4, 24);
-        $f4f5_2 = self::mul($f4_2,  $f5, 24);
-        $f4f6_38 = self::mul($f6_19, $f4_2, 25);
-        $f4f7_38 = self::mul($f7_38, $f4, 24);
-        $f4f8_38 = self::mul($f8_19, $f4_2, 25);
-        $f4f9_38 = self::mul($f9_38, $f4, 24);
-        $f5f5_38 = self::mul($f5_38, $f5, 24);
-        $f5f6_38 = self::mul($f6_19, $f5_2, 24);
-        $f5f7_76 = self::mul($f7_38, $f5_2, 24);
-        $f5f8_38 = self::mul($f8_19, $f5_2, 24);
-        $f5f9_76 = self::mul($f9_38, $f5_2, 24);
-        $f6f6_19 = self::mul($f6_19, $f6, 24);
-        $f6f7_38 = self::mul($f7_38, $f6, 24);
-        $f6f8_38 = self::mul($f8_19, $f6_2, 25);
-        $f6f9_38 = self::mul($f9_38, $f6, 24);
-        $f7f7_38 = self::mul($f7_38, $f7, 24);
-        $f7f8_38 = self::mul($f8_19, $f7_2, 24);
-        $f7f9_76 = self::mul($f9_38, $f7_2, 24);
-        $f8f8_19 = self::mul($f8_19, $f8, 24);
-        $f8f9_38 = self::mul($f9_38, $f8, 24);
-        $f9f9_38 = self::mul($f9_38, $f9, 24);
-
-        $h0 = (int) ($f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38) << 1;
-        $h1 = (int) ($f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38) << 1;
-        $h2 = (int) ($f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19) << 1;
-        $h3 = (int) ($f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38) << 1;
-        $h4 = (int) ($f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38) << 1;
-        $h5 = (int) ($f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38) << 1;
-        $h6 = (int) ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19) << 1;
-        $h7 = (int) ($f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38) << 1;
-        $h8 = (int) ($f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38) << 1;
-        $h9 = (int) ($f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2) << 1;
-
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $f5_38 = self::mul( $f5, 38, 6 ); /* 1.959375*2^30 */
+        $f6_19 = self::mul( $f6, 19, 5 ); /* 1.959375*2^30 */
+        $f7_38 = self::mul( $f7, 38, 6 ); /* 1.959375*2^30 */
+        $f8_19 = self::mul( $f8, 19, 5 ); /* 1.959375*2^30 */
+        $f9_38 = self::mul( $f9, 38, 6 ); /* 1.959375*2^30 */
+        $f0f0 = self::mul( $f0, $f0, 24 );
+        $f0f1_2 = self::mul( $f0_2, $f1, 24 );
+        $f0f2_2 = self::mul( $f0_2, $f2, 24 );
+        $f0f3_2 = self::mul( $f0_2, $f3, 24 );
+        $f0f4_2 = self::mul( $f0_2, $f4, 24 );
+        $f0f5_2 = self::mul( $f0_2, $f5, 24 );
+        $f0f6_2 = self::mul( $f0_2, $f6, 24 );
+        $f0f7_2 = self::mul( $f0_2, $f7, 24 );
+        $f0f8_2 = self::mul( $f0_2, $f8, 24 );
+        $f0f9_2 = self::mul( $f0_2, $f9, 24 );
+        $f1f1_2 = self::mul( $f1_2, $f1, 24 );
+        $f1f2_2 = self::mul( $f1_2, $f2, 24 );
+        $f1f3_4 = self::mul( $f1_2, $f3_2, 24 );
+        $f1f4_2 = self::mul( $f1_2, $f4, 24 );
+        $f1f5_4 = self::mul( $f1_2, $f5_2, 24 );
+        $f1f6_2 = self::mul( $f1_2, $f6, 24 );
+        $f1f7_4 = self::mul( $f1_2, $f7_2, 24 );
+        $f1f8_2 = self::mul( $f1_2, $f8, 24 );
+        $f1f9_76 = self::mul( $f9_38, $f1_2, 24 );
+        $f2f2 = self::mul( $f2, $f2, 24 );
+        $f2f3_2 = self::mul( $f2_2, $f3, 24 );
+        $f2f4_2 = self::mul( $f2_2, $f4, 24 );
+        $f2f5_2 = self::mul( $f2_2, $f5, 24 );
+        $f2f6_2 = self::mul( $f2_2, $f6, 24 );
+        $f2f7_2 = self::mul( $f2_2, $f7, 24 );
+        $f2f8_38 = self::mul( $f8_19, $f2_2, 25 );
+        $f2f9_38 = self::mul( $f9_38, $f2, 24 );
+        $f3f3_2 = self::mul( $f3_2, $f3, 24 );
+        $f3f4_2 = self::mul( $f3_2, $f4, 24 );
+        $f3f5_4 = self::mul( $f3_2, $f5_2, 24 );
+        $f3f6_2 = self::mul( $f3_2, $f6, 24 );
+        $f3f7_76 = self::mul( $f7_38, $f3_2, 24 );
+        $f3f8_38 = self::mul( $f8_19, $f3_2, 24 );
+        $f3f9_76 = self::mul( $f9_38, $f3_2, 24 );
+        $f4f4 = self::mul( $f4, $f4, 24 );
+        $f4f5_2 = self::mul( $f4_2, $f5, 24 );
+        $f4f6_38 = self::mul( $f6_19, $f4_2, 25 );
+        $f4f7_38 = self::mul( $f7_38, $f4, 24 );
+        $f4f8_38 = self::mul( $f8_19, $f4_2, 25 );
+        $f4f9_38 = self::mul( $f9_38, $f4, 24 );
+        $f5f5_38 = self::mul( $f5_38, $f5, 24 );
+        $f5f6_38 = self::mul( $f6_19, $f5_2, 24 );
+        $f5f7_76 = self::mul( $f7_38, $f5_2, 24 );
+        $f5f8_38 = self::mul( $f8_19, $f5_2, 24 );
+        $f5f9_76 = self::mul( $f9_38, $f5_2, 24 );
+        $f6f6_19 = self::mul( $f6_19, $f6, 24 );
+        $f6f7_38 = self::mul( $f7_38, $f6, 24 );
+        $f6f8_38 = self::mul( $f8_19, $f6_2, 25 );
+        $f6f9_38 = self::mul( $f9_38, $f6, 24 );
+        $f7f7_38 = self::mul( $f7_38, $f7, 24 );
+        $f7f8_38 = self::mul( $f8_19, $f7_2, 24 );
+        $f7f9_76 = self::mul( $f9_38, $f7_2, 24 );
+        $f8f8_19 = self::mul( $f8_19, $f8, 24 );
+        $f8f9_38 = self::mul( $f9_38, $f8, 24 );
+        $f9f9_38 = self::mul( $f9_38, $f9, 24 );
+
+        $h0 = (int)( $f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38 ) << 1;
+        $h1 = (int)( $f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38 ) << 1;
+        $h2 = (int)( $f0f2_2 + $f1f1_2 + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19 ) << 1;
+        $h3 = (int)( $f0f3_2 + $f1f2_2 + $f4f9_38 + $f5f8_38 + $f6f7_38 ) << 1;
+        $h4 = (int)( $f0f4_2 + $f1f3_4 + $f2f2 + $f5f9_76 + $f6f8_38 + $f7f7_38 ) << 1;
+        $h5 = (int)( $f0f5_2 + $f1f4_2 + $f2f3_2 + $f6f9_38 + $f7f8_38 ) << 1;
+        $h6 = (int)( $f0f6_2 + $f1f5_4 + $f2f4_2 + $f3f3_2 + $f7f9_76 + $f8f8_19 ) << 1;
+        $h7 = (int)( $f0f7_2 + $f1f6_2 + $f2f5_2 + $f3f4_2 + $f8f9_38 ) << 1;
+        $h8 = (int)( $f0f8_2 + $f1f7_4 + $f2f6_2 + $f3f5_4 + $f4f4 + $f9f9_38 ) << 1;
+        $h9 = (int)( $f0f9_2 + $f1f8_2 + $f2f7_2 + $f3f6_2 + $f4f5_2 ) << 1;
+
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
 
-        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $carry1 = ( $h1 + ( 1 << 24 ) ) >> 25;
         $h2 += $carry1;
         $h1 -= $carry1 << 25;
-        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $carry5 = ( $h5 + ( 1 << 24 ) ) >> 25;
         $h6 += $carry5;
         $h5 -= $carry5 << 25;
 
-        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $carry2 = ( $h2 + ( 1 << 25 ) ) >> 26;
         $h3 += $carry2;
         $h2 -= $carry2 << 26;
-        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $carry6 = ( $h6 + ( 1 << 25 ) ) >> 26;
         $h7 += $carry6;
         $h6 -= $carry6 << 26;
 
-        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $carry3 = ( $h3 + ( 1 << 24 ) ) >> 25;
         $h4 += $carry3;
         $h3 -= $carry3 << 25;
-        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $carry7 = ( $h7 + ( 1 << 24 ) ) >> 25;
         $h8 += $carry7;
         $h7 -= $carry7 << 25;
 
-        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $carry4 = ( $h4 + ( 1 << 25 ) ) >> 26;
         $h5 += $carry4;
         $h4 -= $carry4 << 26;
-        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $carry8 = ( $h8 + ( 1 << 25 ) ) >> 26;
         $h9 += $carry8;
         $h8 -= $carry8 << 26;
 
-        $carry9 = ($h9 + (1 << 24)) >> 25;
-        $h0 += self::mul($carry9, 19, 5);
+        $carry9 = ( $h9 + ( 1 << 24 ) ) >> 25;
+        $h0 += self::mul( $carry9, 19, 5 );
         $h9 -= $carry9 << 25;
 
-        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $carry0 = ( $h0 + ( 1 << 25 ) ) >> 26;
         $h1 += $carry0;
         $h0 -= $carry0 << 26;
 
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
             array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
+                (int)$h0,
+                (int)$h1,
+                (int)$h2,
+                (int)$h3,
+                (int)$h4,
+                (int)$h5,
+                (int)$h6,
+                (int)$h7,
+                (int)$h8,
+                (int)$h9
             )
         );
     }
@@ -896,56 +896,56 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $Z
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_invert(ParagonIE_Sodium_Core_Curve25519_Fe $Z)
+    public static function fe_invert( ParagonIE_Sodium_Core_Curve25519_Fe $Z )
     {
         $z = clone $Z;
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t2 = self::fe_sq($t0);
-        $t1 = self::fe_mul($t1, $t2);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t0 = self::fe_sq( $z );
+        $t1 = self::fe_sq( $t0 );
+        $t1 = self::fe_sq( $t1 );
+        $t1 = self::fe_mul( $z, $t1 );
+        $t0 = self::fe_mul( $t0, $t1 );
+        $t2 = self::fe_sq( $t0 );
+        $t1 = self::fe_mul( $t1, $t2 );
+        $t2 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 5; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t2 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 20; ++$i) {
-            $t3 = self::fe_sq($t3);
+        $t2 = self::fe_mul( $t2, $t1 );
+        $t3 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 20; ++$i ) {
+            $t3 = self::fe_sq( $t3 );
         }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t2 = self::fe_mul( $t3, $t2 );
+        $t2 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t2 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 100; ++$i) {
-            $t3 = self::fe_sq($t3);
+        $t2 = self::fe_mul( $t2, $t1 );
+        $t3 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 100; ++$i ) {
+            $t3 = self::fe_sq( $t3 );
         }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
+        $t2 = self::fe_mul( $t3, $t2 );
+        $t2 = self::fe_sq( $t2 );
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t1 = self::fe_sq( $t1 );
+        for ( $i = 1; $i < 5; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
-        return self::fe_mul($t1, $t0);
+        return self::fe_mul( $t1, $t0 );
     }
 
     /**
@@ -956,7 +956,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $z
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z)
+    public static function fe_pow22523( ParagonIE_Sodium_Core_Curve25519_Fe $z )
     {
         # fe_sq(t0, z);
         # fe_sq(t1, t0);
@@ -966,102 +966,102 @@ 
         # fe_sq(t0, t0);
         # fe_mul(t0, t1, t0);
         # fe_sq(t1, t0);
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
+        $t0 = self::fe_sq( $z );
+        $t1 = self::fe_sq( $t0 );
+        $t1 = self::fe_sq( $t1 );
+        $t1 = self::fe_mul( $z, $t1 );
+        $t0 = self::fe_mul( $t0, $t1 );
+        $t0 = self::fe_sq( $t0 );
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t1 = self::fe_sq( $t0 );
 
         # for (i = 1; i < 5; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 5; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t0, t1, t0);
         # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t1 = self::fe_sq( $t0 );
 
         # for (i = 1; i < 10; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t1, t1, t0);
         # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t1, $t0 );
+        $t2 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 20; ++i) {
         #     fe_sq(t2, t2);
         # }
-        for ($i = 1; $i < 20; ++$i) {
-            $t2 = self::fe_sq($t2);
+        for ( $i = 1; $i < 20; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
 
         # fe_mul(t1, t2, t1);
         # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t1 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 10; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 10; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t0, t1, t0);
         # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t1 = self::fe_sq( $t0 );
 
         # for (i = 1; i < 50; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t1, t1, t0);
         # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t1, $t0 );
+        $t2 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 100; ++i) {
         #     fe_sq(t2, t2);
         # }
-        for ($i = 1; $i < 100; ++$i) {
-            $t2 = self::fe_sq($t2);
+        for ( $i = 1; $i < 100; ++$i ) {
+            $t2 = self::fe_sq( $t2 );
         }
 
         # fe_mul(t1, t2, t1);
         # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul( $t2, $t1 );
+        $t1 = self::fe_sq( $t1 );
 
         # for (i = 1; i < 50; ++i) {
         #     fe_sq(t1, t1);
         # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
+        for ( $i = 1; $i < 50; ++$i ) {
+            $t1 = self::fe_sq( $t1 );
         }
 
         # fe_mul(t0, t1, t0);
         # fe_sq(t0, t0);
         # fe_sq(t0, t0);
         # fe_mul(out, t0, z);
-        $t0 = self::fe_mul($t1, $t0);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_sq($t0);
-        return self::fe_mul($t0, $z);
+        $t0 = self::fe_mul( $t1, $t0 );
+        $t0 = self::fe_sq( $t0 );
+        $t0 = self::fe_sq( $t0 );
+        return self::fe_mul( $t0, $z );
     }
 
     /**
@@ -1083,20 +1083,20 @@ 
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      * @psalm-suppress MixedOperand
      */
-    public static function fe_sub(ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g)
+    public static function fe_sub( ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g )
     {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
             array(
-                (int) ($f[0] - $g[0]),
-                (int) ($f[1] - $g[1]),
-                (int) ($f[2] - $g[2]),
-                (int) ($f[3] - $g[3]),
-                (int) ($f[4] - $g[4]),
-                (int) ($f[5] - $g[5]),
-                (int) ($f[6] - $g[6]),
-                (int) ($f[7] - $g[7]),
-                (int) ($f[8] - $g[8]),
-                (int) ($f[9] - $g[9])
+                (int)( $f[ 0 ] - $g[ 0 ] ),
+                (int)( $f[ 1 ] - $g[ 1 ] ),
+                (int)( $f[ 2 ] - $g[ 2 ] ),
+                (int)( $f[ 3 ] - $g[ 3 ] ),
+                (int)( $f[ 4 ] - $g[ 4 ] ),
+                (int)( $f[ 5 ] - $g[ 5 ] ),
+                (int)( $f[ 6 ] - $g[ 6 ] ),
+                (int)( $f[ 7 ] - $g[ 7 ] ),
+                (int)( $f[ 8 ] - $g[ 8 ] ),
+                (int)( $f[ 9 ] - $g[ 9 ] )
             )
         );
     }
@@ -1117,17 +1117,17 @@ 
         ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
     ) {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YplusX);
-        $r->Y = self::fe_mul($r->Y, $q->YminusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0   = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->YplusX );
+        $r->Y = self::fe_mul( $r->Y, $q->YminusX );
+        $r->T = self::fe_mul( $q->T2d, $p->T );
+        $r->X = self::fe_mul( $p->Z, $q->Z );
+        $t0   = self::fe_add( $r->X, $r->X );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_add( $t0, $r->T );
+        $r->T = self::fe_sub( $t0, $r->T );
         return $r;
     }
 
@@ -1140,42 +1140,42 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function slide($a)
+    public static function slide( $a )
     {
-        if (self::strlen($a) < 256) {
-            if (self::strlen($a) < 16) {
-                $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
+        if ( self::strlen( $a ) < 256 ) {
+            if ( self::strlen( $a ) < 16 ) {
+                $a = str_pad( $a, 256, '0', STR_PAD_RIGHT );
             }
         }
         /** @var array<int, int> $r */
         $r = array();
 
         /** @var int $i */
-        for ($i = 0; $i < 256; ++$i) {
-            $r[$i] = (int) (
+        for ( $i = 0; $i < 256; ++$i ) {
+            $r[ $i ] = (int)(
                 1 & (
-                    self::chrToInt($a[(int) ($i >> 3)])
+                    self::chrToInt( $a[ (int)( $i >> 3 ) ] )
                         >>
-                    ($i & 7)
+                    ( $i & 7 )
                 )
             );
         }
 
-        for ($i = 0;$i < 256;++$i) {
-            if ($r[$i]) {
-                for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
-                    if ($r[$i + $b]) {
-                        if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
-                            $r[$i] += $r[$i + $b] << $b;
-                            $r[$i + $b] = 0;
-                        } elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
-                            $r[$i] -= $r[$i + $b] << $b;
-                            for ($k = $i + $b; $k < 256; ++$k) {
-                                if (!$r[$k]) {
-                                    $r[$k] = 1;
+        for ( $i = 0; $i < 256; ++$i ) {
+            if ( $r[ $i ] ) {
+                for ( $b = 1; $b <= 6 && $i + $b < 256; ++$b ) {
+                    if ( $r[ $i + $b ] ) {
+                        if ( $r[ $i ] + ( $r[ $i + $b ] << $b ) <= 15 ) {
+                            $r[ $i ] += $r[ $i + $b ] << $b;
+                            $r[ $i + $b ] = 0;
+                        } elseif ( $r[ $i ] - ( $r[ $i + $b ] << $b ) >= -15 ) {
+                            $r[ $i ] -= $r[ $i + $b ] << $b;
+                            for ( $k = $i + $b; $k < 256; ++$k ) {
+                                if ( ! $r[ $k ] ) {
+                                    $r[ $k ] = 1;
                                     break;
                                 }
-                                $r[$k] = 0;
+                                $r[ $k ] = 0;
                             }
                         } else {
                             break;
@@ -1195,18 +1195,18 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ge_frombytes_negate_vartime($s)
+    public static function ge_frombytes_negate_vartime( $s )
     {
         static $d = null;
-        if (!$d) {
-            $d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d);
+        if ( ! $d ) {
+            $d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$d );
         }
 
         # fe_frombytes(h->Y,s);
         # fe_1(h->Z);
         $h = new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
             self::fe_0(),
-            self::fe_frombytes($s),
+            self::fe_frombytes( $s ),
             self::fe_1()
         );
 
@@ -1214,36 +1214,36 @@ 
         # fe_mul(v,u,d);
         # fe_sub(u,u,h->Z);       /* u = y^2-1 */
         # fe_add(v,v,h->Z);       /* v = dy^2+1 */
-        $u = self::fe_sq($h->Y);
+        $u = self::fe_sq( $h->Y );
         /** @var ParagonIE_Sodium_Core_Curve25519_Fe $d */
-        $v = self::fe_mul($u, $d);
-        $u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
-        $v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
+        $v = self::fe_mul( $u, $d );
+        $u = self::fe_sub( $u, $h->Z ); /* u =  y^2 - 1 */
+        $v = self::fe_add( $v, $h->Z ); /* v = dy^2 + 1 */
 
         # fe_sq(v3,v);
         # fe_mul(v3,v3,v);        /* v3 = v^3 */
         # fe_sq(h->X,v3);
         # fe_mul(h->X,h->X,v);
         # fe_mul(h->X,h->X,u);    /* x = uv^7 */
-        $v3 = self::fe_sq($v);
-        $v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
-        $h->X = self::fe_sq($v3);
-        $h->X = self::fe_mul($h->X, $v);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
+        $v3 = self::fe_sq( $v );
+        $v3 = self::fe_mul( $v3, $v ); /* v3 = v^3 */
+        $h->X = self::fe_sq( $v3 );
+        $h->X = self::fe_mul( $h->X, $v );
+        $h->X = self::fe_mul( $h->X, $u ); /* x = uv^7 */
 
         # fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
         # fe_mul(h->X,h->X,v3);
         # fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
-        $h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
-        $h->X = self::fe_mul($h->X, $v3);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
+        $h->X = self::fe_pow22523( $h->X ); /* x = (uv^7)^((q-5)/8) */
+        $h->X = self::fe_mul( $h->X, $v3 );
+        $h->X = self::fe_mul( $h->X, $u ); /* x = uv^3(uv^7)^((q-5)/8) */
 
         # fe_sq(vxx,h->X);
         # fe_mul(vxx,vxx,v);
         # fe_sub(check,vxx,u);    /* vx^2-u */
-        $vxx = self::fe_sq($h->X);
-        $vxx = self::fe_mul($vxx, $v);
-        $check = self::fe_sub($vxx, $u); /* vx^2 - u */
+        $vxx = self::fe_sq( $h->X );
+        $vxx = self::fe_mul( $vxx, $v );
+        $check = self::fe_sub( $vxx, $u ); /* vx^2 - u */
 
         # if (fe_isnonzero(check)) {
         #     fe_add(check,vxx,u);  /* vx^2+u */
@@ -1252,27 +1252,27 @@ 
         #     }
         #     fe_mul(h->X,h->X,sqrtm1);
         # }
-        if (self::fe_isnonzero($check)) {
-            $check = self::fe_add($vxx, $u); /* vx^2 + u */
-            if (self::fe_isnonzero($check)) {
-                throw new RangeException('Internal check failed.');
+        if ( self::fe_isnonzero( $check ) ) {
+            $check = self::fe_add( $vxx, $u ); /* vx^2 + u */
+            if ( self::fe_isnonzero( $check ) ) {
+                throw new RangeException( 'Internal check failed.' );
             }
             $h->X = self::fe_mul(
                 $h->X,
-                ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1)
+                ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$sqrtm1 )
             );
         }
 
         # if (fe_isnegative(h->X) == (s[31] >> 7)) {
         #     fe_neg(h->X,h->X);
         # }
-        $i = self::chrToInt($s[31]);
-        if (self::fe_isnegative($h->X) === ($i >> 7)) {
-            $h->X = self::fe_neg($h->X);
+        $i = self::chrToInt( $s[ 31 ] );
+        if ( self::fe_isnegative( $h->X ) === ( $i >> 7 ) ) {
+            $h->X = self::fe_neg( $h->X );
         }
 
         # fe_mul(h->T,h->X,h->Y);
-        $h->T = self::fe_mul($h->X, $h->Y);
+        $h->T = self::fe_mul( $h->X, $h->Y );
         return $h;
     }
 
@@ -1290,16 +1290,16 @@ 
         ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
     ) {
         $r = clone $R;
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yplusx);
-        $r->Y = self::fe_mul($r->Y, $q->yminusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add(clone $p->Z, clone $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->yplusx );
+        $r->Y = self::fe_mul( $r->Y, $q->yminusx );
+        $r->T = self::fe_mul( $q->xy2d, $p->T );
+        $t0 = self::fe_add( clone $p->Z, clone $p->Z );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_add( $t0, $r->T );
+        $r->T = self::fe_sub( $t0, $r->T );
 
         return $r;
     }
@@ -1319,16 +1319,16 @@ 
     ) {
         $r = clone $R;
 
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yminusx);
-        $r->Y = self::fe_mul($r->Y, $q->yplusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add($p->Z, $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->yminusx );
+        $r->Y = self::fe_mul( $r->Y, $q->yplusx );
+        $r->T = self::fe_mul( $q->xy2d, $p->T );
+        $t0 = self::fe_add( $p->Z, $p->Z );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_sub( $t0, $r->T );
+        $r->T = self::fe_add( $t0, $r->T );
 
         return $r;
     }
@@ -1339,12 +1339,12 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      */
-    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
+    public static function ge_p1p1_to_p2( ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p )
     {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P2();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
+        $r->X = self::fe_mul( $p->X, $p->T );
+        $r->Y = self::fe_mul( $p->Y, $p->Z );
+        $r->Z = self::fe_mul( $p->Z, $p->T );
         return $r;
     }
 
@@ -1354,13 +1354,13 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
+    public static function ge_p1p1_to_p3( ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p )
     {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P3();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
-        $r->T = self::fe_mul($p->X, $p->Y);
+        $r->X = self::fe_mul( $p->X, $p->T );
+        $r->Y = self::fe_mul( $p->Y, $p->Z );
+        $r->Z = self::fe_mul( $p->Z, $p->T );
+        $r->T = self::fe_mul( $p->X, $p->Y );
         return $r;
     }
 
@@ -1384,19 +1384,19 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
      */
-    public static function ge_p2_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p)
+    public static function ge_p2_dbl( ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p )
     {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
-        $r->X = self::fe_sq($p->X);
-        $r->Z = self::fe_sq($p->Y);
-        $r->T = self::fe_sq2($p->Z);
-        $r->Y = self::fe_add($p->X, $p->Y);
-        $t0   = self::fe_sq($r->Y);
-        $r->Y = self::fe_add($r->Z, $r->X);
-        $r->Z = self::fe_sub($r->Z, $r->X);
-        $r->X = self::fe_sub($t0, $r->Y);
-        $r->T = self::fe_sub($r->T, $r->Z);
+        $r->X = self::fe_sq( $p->X );
+        $r->Z = self::fe_sq( $p->Y );
+        $r->T = self::fe_sq2( $p->Z );
+        $r->Y = self::fe_add( $p->X, $p->Y );
+        $t0   = self::fe_sq( $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->X );
+        $r->Z = self::fe_sub( $r->Z, $r->X );
+        $r->X = self::fe_sub( $t0, $r->Y );
+        $r->T = self::fe_sub( $r->T, $r->Z );
 
         return $r;
     }
@@ -1422,18 +1422,18 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Cached
      */
-    public static function ge_p3_to_cached(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    public static function ge_p3_to_cached( ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p )
     {
         static $d2 = null;
-        if ($d2 === null) {
-            $d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d2);
+        if ( $d2 === null ) {
+            $d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$d2 );
         }
         /** @var ParagonIE_Sodium_Core_Curve25519_Fe $d2 */
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached();
-        $r->YplusX = self::fe_add($p->Y, $p->X);
-        $r->YminusX = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_copy($p->Z);
-        $r->T2d = self::fe_mul($p->T, $d2);
+        $r->YplusX = self::fe_add( $p->Y, $p->X );
+        $r->YminusX = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_copy( $p->Z );
+        $r->T2d = self::fe_mul( $p->T, $d2 );
         return $r;
     }
 
@@ -1443,12 +1443,12 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      */
-    public static function ge_p3_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    public static function ge_p3_to_p2( ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p )
     {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
-            self::fe_copy($p->X),
-            self::fe_copy($p->Y),
-            self::fe_copy($p->Z)
+            self::fe_copy( $p->X ),
+            self::fe_copy( $p->Y ),
+            self::fe_copy( $p->Z )
         );
     }
 
@@ -1460,14 +1460,14 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ge_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h)
+    public static function ge_p3_tobytes( ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h )
     {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
-        $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+        $recip = self::fe_invert( $h->Z );
+        $x = self::fe_mul( $h->X, $recip );
+        $y = self::fe_mul( $h->Y, $recip );
+        $s = self::fe_tobytes( $y );
+        $s[ 31 ] = self::intToChr(
+            self::chrToInt( $s[ 31 ] ) ^ ( self::fe_isnegative( $x ) << 7 )
         );
         return $s;
     }
@@ -1478,10 +1478,10 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
      */
-    public static function ge_p3_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    public static function ge_p3_dbl( ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p )
     {
-        $q = self::ge_p3_to_p2($p);
-        return self::ge_p2_dbl($q);
+        $q = self::ge_p3_to_p2( $p );
+        return self::ge_p2_dbl( $q );
     }
 
     /**
@@ -1503,9 +1503,9 @@ 
      * @param int $c
      * @return int
      */
-    public static function equal($b, $c)
+    public static function equal( $b, $c )
     {
-        return (int) ((($b ^ $c) - 1) >> 31) & 1;
+        return (int)( ( ( $b ^ $c ) - 1 ) >> 31 ) & 1;
     }
 
     /**
@@ -1516,13 +1516,13 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function negative($char)
+    public static function negative( $char )
     {
-        if (is_int($char)) {
-            return ($char >> 63) & 1;
+        if ( is_int( $char ) ) {
+            return ( $char >> 63 ) & 1;
         }
-        $x = self::chrToInt(self::substr($char, 0, 1));
-        return (int) ($x >> 63);
+        $x = self::chrToInt( self::substr( $char, 0, 1 ) );
+        return (int)( $x >> 63 );
     }
 
     /**
@@ -1540,13 +1540,13 @@ 
         ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u,
         $b
     ) {
-        if (!is_int($b)) {
-            throw new InvalidArgumentException('Expected an integer.');
+        if ( ! is_int( $b ) ) {
+            throw new InvalidArgumentException( 'Expected an integer.' );
         }
         return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-            self::fe_cmov($t->yplusx,  $u->yplusx,  $b),
-            self::fe_cmov($t->yminusx, $u->yminusx, $b),
-            self::fe_cmov($t->xy2d,    $u->xy2d,    $b)
+            self::fe_cmov( $t->yplusx, $u->yplusx, $b ),
+            self::fe_cmov( $t->yminusx, $u->yminusx, $b ),
+            self::fe_cmov( $t->xy2d, $u->xy2d, $b )
         );
     }
 
@@ -1563,10 +1563,10 @@ 
     ) {
         $b &= 1;
         $ret = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached();
-        $ret->YplusX  = self::fe_cmov($t->YplusX,  $u->YplusX,  $b);
-        $ret->YminusX = self::fe_cmov($t->YminusX, $u->YminusX, $b);
-        $ret->Z       = self::fe_cmov($t->Z,       $u->Z,       $b);
-        $ret->T2d     = self::fe_cmov($t->T2d,     $u->T2d,     $b);
+        $ret->YplusX  = self::fe_cmov( $t->YplusX, $u->YplusX, $b );
+        $ret->YminusX = self::fe_cmov( $t->YminusX, $u->YminusX, $b );
+        $ret->Z       = self::fe_cmov( $t->Z, $u->Z, $b );
+        $ret->T2d     = self::fe_cmov( $t->T2d, $u->T2d, $b );
         return $ret;
     }
 
@@ -1576,12 +1576,12 @@ 
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Cached
      * @throws SodiumException
      */
-    public static function ge_cmov8_cached(array $cached, $b)
+    public static function ge_cmov8_cached( array $cached, $b )
     {
         // const unsigned char bnegative = negative(b);
         // const unsigned char babs      = b - (((-bnegative) & b) * ((signed char) 1 << 1));
-        $bnegative = self::negative($b);
-        $babs = $b - (((-$bnegative) & $b) << 1);
+        $bnegative = self::negative( $b );
+        $babs = $b - ( ( (-$bnegative) & $b ) << 1 );
 
         // ge25519_cached_0(t);
         $t = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
@@ -1599,8 +1599,8 @@ 
         // ge25519_cmov_cached(t, &cached[5], equal(babs, 6));
         // ge25519_cmov_cached(t, &cached[6], equal(babs, 7));
         // ge25519_cmov_cached(t, &cached[7], equal(babs, 8));
-        for ($x = 0; $x < 8; ++$x) {
-            $t = self::ge_cmov_cached($t, $cached[$x], self::equal($babs, $x + 1));
+        for ( $x = 0; $x < 8; ++$x ) {
+            $t = self::ge_cmov_cached( $t, $cached[ $x ], self::equal( $babs, $x + 1 ) );
         }
 
         // fe25519_copy(minust.YplusX, t->YminusX);
@@ -1608,12 +1608,12 @@ 
         // fe25519_copy(minust.Z, t->Z);
         // fe25519_neg(minust.T2d, t->T2d);
         $minust = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
-            self::fe_copy($t->YminusX),
-            self::fe_copy($t->YplusX),
-            self::fe_copy($t->Z),
-            self::fe_neg($t->T2d)
+            self::fe_copy( $t->YminusX ),
+            self::fe_copy( $t->YplusX ),
+            self::fe_copy( $t->Z ),
+            self::fe_neg( $t->T2d )
         );
-        return self::ge_cmov_cached($t, $minust, $bnegative);
+        return self::ge_cmov_cached( $t, $minust, $bnegative );
     }
 
     /**
@@ -1628,47 +1628,47 @@ 
      * @psalm-suppress MixedArrayAccess
      * @psalm-suppress MixedArrayOffset
      */
-    public static function ge_select($pos = 0, $b = 0)
+    public static function ge_select( $pos = 0, $b = 0 )
     {
         static $base = null;
-        if ($base === null) {
+        if ( $base === null ) {
             $base = array();
             /** @var int $i */
-            foreach (self::$base as $i => $bas) {
-                for ($j = 0; $j < 8; ++$j) {
-                    $base[$i][$j] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][0]),
-                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][1]),
-                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][2])
+            foreach ( self::$base as $i => $bas ) {
+                for ( $j = 0; $j < 8; ++$j ) {
+                    $base[ $i ][ $j ] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $bas[ $j ][ 0 ] ),
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $bas[ $j ][ 1 ] ),
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( $bas[ $j ][ 2 ] )
                     );
                 }
             }
         }
         /** @var array<int, array<int, ParagonIE_Sodium_Core_Curve25519_Ge_Precomp>> $base */
-        if (!is_int($pos)) {
-            throw new InvalidArgumentException('Position must be an integer');
+        if ( ! is_int( $pos ) ) {
+            throw new InvalidArgumentException( 'Position must be an integer' );
         }
-        if ($pos < 0 || $pos > 31) {
-            throw new RangeException('Position is out of range [0, 31]');
+        if ( $pos < 0 || $pos > 31 ) {
+            throw new RangeException( 'Position is out of range [0, 31]' );
         }
 
-        $bnegative = self::negative($b);
-        $babs = $b - (((-$bnegative) & $b) << 1);
+        $bnegative = self::negative( $b );
+        $babs = $b - ( ( (-$bnegative) & $b ) << 1 );
 
         $t = self::ge_precomp_0();
-        for ($i = 0; $i < 8; ++$i) {
+        for ( $i = 0; $i < 8; ++$i ) {
             $t = self::cmov(
                 $t,
-                $base[$pos][$i],
-                self::equal($babs, $i + 1)
+                $base[ $pos ][ $i ],
+                self::equal( $babs, $i + 1 )
             );
         }
         $minusT = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-            self::fe_copy($t->yminusx),
-            self::fe_copy($t->yplusx),
-            self::fe_neg($t->xy2d)
+            self::fe_copy( $t->yminusx ),
+            self::fe_copy( $t->yplusx ),
+            self::fe_neg( $t->xy2d )
         );
-        return self::cmov($t, $minusT, $bnegative);
+        return self::cmov( $t, $minusT, $bnegative );
     }
 
     /**
@@ -1688,17 +1688,17 @@ 
     ) {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YminusX);
-        $r->Y = self::fe_mul($r->Y, $q->YplusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0 = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
+        $r->X = self::fe_add( $p->Y, $p->X );
+        $r->Y = self::fe_sub( $p->Y, $p->X );
+        $r->Z = self::fe_mul( $r->X, $q->YminusX );
+        $r->Y = self::fe_mul( $r->Y, $q->YplusX );
+        $r->T = self::fe_mul( $q->T2d, $p->T );
+        $r->X = self::fe_mul( $p->Z, $q->Z );
+        $t0 = self::fe_add( $r->X, $r->X );
+        $r->X = self::fe_sub( $r->Z, $r->Y );
+        $r->Y = self::fe_add( $r->Z, $r->Y );
+        $r->Z = self::fe_sub( $t0, $r->T );
+        $r->T = self::fe_add( $t0, $r->T );
 
         return $r;
     }
@@ -1711,14 +1711,14 @@ 
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ge_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h)
+    public static function ge_tobytes( ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h )
     {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
-        $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+        $recip = self::fe_invert( $h->Z );
+        $x = self::fe_mul( $h->X, $recip );
+        $y = self::fe_mul( $h->Y, $recip );
+        $s = self::fe_tobytes( $y );
+        $s[ 31 ] = self::intToChr(
+            self::chrToInt( $s[ 31 ] ) ^ ( self::fe_isnegative( $x ) << 7 )
         );
         return $s;
     }
@@ -1745,17 +1745,17 @@ 
 
         /** @var array<int, ParagonIE_Sodium_Core_Curve25519_Ge_Precomp> $Bi */
         static $Bi = array();
-        if (!$Bi) {
-            for ($i = 0; $i < 8; ++$i) {
-                $Bi[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][0]),
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][1]),
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][2])
+        if ( ! $Bi ) {
+            for ( $i = 0; $i < 8; ++$i ) {
+                $Bi[ $i ] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$base2[ $i ][ 0 ] ),
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$base2[ $i ][ 1 ] ),
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray( self::$base2[ $i ][ 2 ] )
                 );
             }
         }
-        for ($i = 0; $i < 8; ++$i) {
-            $Ai[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
+        for ( $i = 0; $i < 8; ++$i ) {
+            $Ai[ $i ] = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
                 self::fe_0(),
                 self::fe_0(),
                 self::fe_0(),
@@ -1766,15 +1766,15 @@ 
         # slide(aslide,a);
         # slide(bslide,b);
         /** @var array<int, int> $aslide */
-        $aslide = self::slide($a);
+        $aslide = self::slide( $a );
         /** @var array<int, int> $bslide */
-        $bslide = self::slide($b);
+        $bslide = self::slide( $b );
 
         # ge_p3_to_cached(&Ai[0],A);
         # ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
-        $Ai[0] = self::ge_p3_to_cached($A);
-        $t = self::ge_p3_dbl($A);
-        $A2 = self::ge_p1p1_to_p3($t);
+        $Ai[ 0 ] = self::ge_p3_to_cached( $A );
+        $t = self::ge_p3_dbl( $A );
+        $A2 = self::ge_p1p1_to_p3( $t );
 
         # ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
         # ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
@@ -1783,10 +1783,10 @@ 
         # ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
         # ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
         # ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
-        for ($i = 0; $i < 7; ++$i) {
-            $t = self::ge_add($A2, $Ai[$i]);
-            $u = self::ge_p1p1_to_p3($t);
-            $Ai[$i + 1] = self::ge_p3_to_cached($u);
+        for ( $i = 0; $i < 7; ++$i ) {
+            $t = self::ge_add( $A2, $Ai[ $i ] );
+            $u = self::ge_p1p1_to_p3( $t );
+            $Ai[ $i + 1 ] = self::ge_p3_to_cached( $u );
         }
 
         # ge_p2_0(r);
@@ -1796,56 +1796,56 @@ 
         #     if (aslide[i] || bslide[i]) break;
         # }
         $i = 255;
-        for (; $i >= 0; --$i) {
-            if ($aslide[$i] || $bslide[$i]) {
+        for ( ; $i >= 0; --$i ) {
+            if ( $aslide[ $i ] || $bslide[ $i ] ) {
                 break;
             }
         }
 
         # for (;i >= 0;--i) {
-        for (; $i >= 0; --$i) {
+        for ( ; $i >= 0; --$i ) {
             # ge_p2_dbl(&t,r);
-            $t = self::ge_p2_dbl($r);
+            $t = self::ge_p2_dbl( $r );
 
             # if (aslide[i] > 0) {
-            if ($aslide[$i] > 0) {
+            if ( $aslide[ $i ] > 0 ) {
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_add(&t,&u,&Ai[aslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 $t = self::ge_add(
                     $u,
-                    $Ai[(int) floor($aslide[$i] / 2)]
+                    $Ai[ (int)floor( $aslide[ $i ] / 2 ) ]
                 );
             # } else if (aslide[i] < 0) {
-            } elseif ($aslide[$i] < 0) {
+            } elseif ( $aslide[ $i ] < 0 ) {
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 $t = self::ge_sub(
                     $u,
-                    $Ai[(int) floor(-$aslide[$i] / 2)]
+                    $Ai[ (int)floor(-$aslide[ $i ] / 2) ]
                 );
             }
 
             # if (bslide[i] > 0) {
-            if ($bslide[$i] > 0) {
+            if ( $bslide[ $i ] > 0 ) {
                 /** @var int $index */
-                $index = (int) floor($bslide[$i] / 2);
+                $index = (int)floor( $bslide[ $i ] / 2 );
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_madd(&t,&u,&Bi[bslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_madd($t, $u, $Bi[$index]);
+                $u = self::ge_p1p1_to_p3( $t );
+                $t = self::ge_madd( $t, $u, $Bi[ $index ] );
             # } else if (bslide[i] < 0) {
-            } elseif ($bslide[$i] < 0) {
+            } elseif ( $bslide[ $i ] < 0 ) {
                 /** @var int $index */
-                $index = (int) floor(-$bslide[$i] / 2);
+                $index = (int)floor(-$bslide[ $i ] / 2);
                 # ge_p1p1_to_p3(&u,&t);
                 # ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_msub($t, $u, $Bi[$index]);
+                $u = self::ge_p1p1_to_p3( $t );
+                $t = self::ge_msub( $t, $u, $Bi[ $index ] );
             }
             # ge_p1p1_to_p2(r,&t);
-            $r = self::ge_p1p1_to_p2($t);
+            $r = self::ge_p1p1_to_p2( $t );
         }
         return $r;
     }
@@ -1861,73 +1861,73 @@ 
      * @psalm-suppress MixedAssignment
      * @psalm-suppress MixedOperand
      */
-    public static function ge_scalarmult($a, $p)
+    public static function ge_scalarmult( $a, $p )
     {
-        $e = array_fill(0, 64, 0);
+        $e = array_fill( 0, 64, 0 );
 
         /** @var ParagonIE_Sodium_Core_Curve25519_Ge_Cached[] $pi */
         $pi = array();
 
         //        ge25519_p3_to_cached(&pi[1 - 1], p);   /* p */
-        $pi[0] = self::ge_p3_to_cached($p);
+        $pi[ 0 ] = self::ge_p3_to_cached( $p );
 
         //        ge25519_p3_dbl(&t2, p);
         //        ge25519_p1p1_to_p3(&p2, &t2);
         //        ge25519_p3_to_cached(&pi[2 - 1], &p2); /* 2p = 2*p */
-        $t2 = self::ge_p3_dbl($p);
-        $p2 = self::ge_p1p1_to_p3($t2);
-        $pi[1] = self::ge_p3_to_cached($p2);
+        $t2 = self::ge_p3_dbl( $p );
+        $p2 = self::ge_p1p1_to_p3( $t2 );
+        $pi[ 1 ] = self::ge_p3_to_cached( $p2 );
 
         //        ge25519_add_cached(&t3, p, &pi[2 - 1]);
         //        ge25519_p1p1_to_p3(&p3, &t3);
         //        ge25519_p3_to_cached(&pi[3 - 1], &p3); /* 3p = 2p+p */
-        $t3 = self::ge_add($p, $pi[1]);
-        $p3 = self::ge_p1p1_to_p3($t3);
-        $pi[2] = self::ge_p3_to_cached($p3);
+        $t3 = self::ge_add( $p, $pi[ 1 ] );
+        $p3 = self::ge_p1p1_to_p3( $t3 );
+        $pi[ 2 ] = self::ge_p3_to_cached( $p3 );
 
         //        ge25519_p3_dbl(&t4, &p2);
         //        ge25519_p1p1_to_p3(&p4, &t4);
         //        ge25519_p3_to_cached(&pi[4 - 1], &p4); /* 4p = 2*2p */
-        $t4 = self::ge_p3_dbl($p2);
-        $p4 = self::ge_p1p1_to_p3($t4);
-        $pi[3] = self::ge_p3_to_cached($p4);
+        $t4 = self::ge_p3_dbl( $p2 );
+        $p4 = self::ge_p1p1_to_p3( $t4 );
+        $pi[ 3 ] = self::ge_p3_to_cached( $p4 );
 
         //        ge25519_add_cached(&t5, p, &pi[4 - 1]);
         //        ge25519_p1p1_to_p3(&p5, &t5);
         //        ge25519_p3_to_cached(&pi[5 - 1], &p5); /* 5p = 4p+p */
-        $t5 = self::ge_add($p, $pi[3]);
-        $p5 = self::ge_p1p1_to_p3($t5);
-        $pi[4] = self::ge_p3_to_cached($p5);
+        $t5 = self::ge_add( $p, $pi[ 3 ] );
+        $p5 = self::ge_p1p1_to_p3( $t5 );
+        $pi[ 4 ] = self::ge_p3_to_cached( $p5 );
 
         //        ge25519_p3_dbl(&t6, &p3);
         //        ge25519_p1p1_to_p3(&p6, &t6);
         //        ge25519_p3_to_cached(&pi[6 - 1], &p6); /* 6p = 2*3p */
-        $t6 = self::ge_p3_dbl($p3);
-        $p6 = self::ge_p1p1_to_p3($t6);
-        $pi[5] = self::ge_p3_to_cached($p6);
+        $t6 = self::ge_p3_dbl( $p3 );
+        $p6 = self::ge_p1p1_to_p3( $t6 );
+        $pi[ 5 ] = self::ge_p3_to_cached( $p6 );
 
         //        ge25519_add_cached(&t7, p, &pi[6 - 1]);
         //        ge25519_p1p1_to_p3(&p7, &t7);
         //        ge25519_p3_to_cached(&pi[7 - 1], &p7); /* 7p = 6p+p */
-        $t7 = self::ge_add($p, $pi[5]);
-        $p7 = self::ge_p1p1_to_p3($t7);
-        $pi[6] = self::ge_p3_to_cached($p7);
+        $t7 = self::ge_add( $p, $pi[ 5 ] );
+        $p7 = self::ge_p1p1_to_p3( $t7 );
+        $pi[ 6 ] = self::ge_p3_to_cached( $p7 );
 
         //        ge25519_p3_dbl(&t8, &p4);
         //        ge25519_p1p1_to_p3(&p8, &t8);
         //        ge25519_p3_to_cached(&pi[8 - 1], &p8); /* 8p = 2*4p */
-        $t8 = self::ge_p3_dbl($p4);
-        $p8 = self::ge_p1p1_to_p3($t8);
-        $pi[7] = self::ge_p3_to_cached($p8);
+        $t8 = self::ge_p3_dbl( $p4 );
+        $p8 = self::ge_p1p1_to_p3( $t8 );
+        $pi[ 7 ] = self::ge_p3_to_cached( $p8 );
 
 
         //        for (i = 0; i < 32; ++i) {
         //            e[2 * i + 0] = (a[i] >> 0) & 15;
         //            e[2 * i + 1] = (a[i] >> 4) & 15;
         //        }
-        for ($i = 0; $i < 32; ++$i) {
-            $e[($i << 1)    ] =  self::chrToInt($a[$i]) & 15;
-            $e[($i << 1) + 1] = (self::chrToInt($a[$i]) >> 4) & 15;
+        for ( $i = 0; $i < 32; ++$i ) {
+            $e[ ( $i << 1 ) ] = self::chrToInt( $a[ $i ] ) & 15;
+            $e[ ( $i << 1 ) + 1 ] = ( self::chrToInt( $a[ $i ] ) >> 4 ) & 15;
         }
         //        /* each e[i] is between 0 and 15 */
         //        /* e[63] is between 0 and 7 */
@@ -1940,25 +1940,25 @@ 
         //            e[i] -= carry * ((signed char) 1 << 4);
         //        }
         $carry = 0;
-        for ($i = 0; $i < 63; ++$i) {
-            $e[$i] += $carry;
-            $carry = $e[$i] + 8;
+        for ( $i = 0; $i < 63; ++$i ) {
+            $e[ $i ] += $carry;
+            $carry = $e[ $i ] + 8;
             $carry >>= 4;
-            $e[$i] -= $carry << 4;
+            $e[ $i ] -= $carry << 4;
         }
         //        e[63] += carry;
         //        /* each e[i] is between -8 and 8 */
-        $e[63] += $carry;
+        $e[ 63 ] += $carry;
 
         //        ge25519_p3_0(h);
         $h = self::ge_p3_0();
 
         //        for (i = 63; i != 0; i--) {
-        for ($i = 63; $i != 0; --$i) {
+        for ( $i = 63; $i != 0; --$i ) {
             // ge25519_cmov8_cached(&t, pi, e[i]);
-            $t = self::ge_cmov8_cached($pi, $e[$i]);
+            $t = self::ge_cmov8_cached( $pi, $e[ $i ] );
             // ge25519_add_cached(&r, h, &t);
-            $r = self::ge_add($h, $t);
+            $r = self::ge_add( $h, $t );
 
             // ge25519_p1p1_to_p2(&s, &r);
             // ge25519_p2_dbl(&r, &s);
@@ -1968,25 +1968,25 @@ 
             // ge25519_p2_dbl(&r, &s);
             // ge25519_p1p1_to_p2(&s, &r);
             // ge25519_p2_dbl(&r, &s);
-            $s = self::ge_p1p1_to_p2($r);
-            $r = self::ge_p2_dbl($s);
-            $s = self::ge_p1p1_to_p2($r);
-            $r = self::ge_p2_dbl($s);
-            $s = self::ge_p1p1_to_p2($r);
-            $r = self::ge_p2_dbl($s);
-            $s = self::ge_p1p1_to_p2($r);
-            $r = self::ge_p2_dbl($s);
+            $s = self::ge_p1p1_to_p2( $r );
+            $r = self::ge_p2_dbl( $s );
+            $s = self::ge_p1p1_to_p2( $r );
+            $r = self::ge_p2_dbl( $s );
+            $s = self::ge_p1p1_to_p2( $r );
+            $r = self::ge_p2_dbl( $s );
+            $s = self::ge_p1p1_to_p2( $r );
+            $r = self::ge_p2_dbl( $s );
 
             // ge25519_p1p1_to_p3(h, &r);  /* *16 */
-            $h = self::ge_p1p1_to_p3($r); /* *16 */
+            $h = self::ge_p1p1_to_p3( $r ); /* *16 */
         }
 
         //        ge25519_cmov8_cached(&t, pi, e[i]);
         //        ge25519_add_cached(&r, h, &t);
         //        ge25519_p1p1_to_p3(h, &r);
-        $t = self::ge_cmov8_cached($pi, $e[0]);
-        $r = self::ge_add($h, $t);
-        return self::ge_p1p1_to_p3($r);
+        $t = self::ge_cmov8_cached( $pi, $e[ 0 ] );
+        $r = self::ge_add( $h, $t );
+        return self::ge_p1p1_to_p3( $r );
     }
 
     /**
@@ -1999,50 +1999,50 @@ 
      * @psalm-suppress MixedAssignment
      * @psalm-suppress MixedOperand
      */
-    public static function ge_scalarmult_base($a)
+    public static function ge_scalarmult_base( $a )
     {
         /** @var array<int, int> $e */
         $e = array();
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
-        for ($i = 0; $i < 32; ++$i) {
-            $dbl = (int) $i << 1;
-            $e[$dbl] = (int) self::chrToInt($a[$i]) & 15;
-            $e[$dbl + 1] = (int) (self::chrToInt($a[$i]) >> 4) & 15;
+        for ( $i = 0; $i < 32; ++$i ) {
+            $dbl = (int)$i << 1;
+            $e[ $dbl ] = (int)self::chrToInt( $a[ $i ] ) & 15;
+            $e[ $dbl + 1 ] = (int)( self::chrToInt( $a[ $i ] ) >> 4 ) & 15;
         }
 
         $carry = 0;
-        for ($i = 0; $i < 63; ++$i) {
-            $e[$i] += $carry;
-            $carry = $e[$i] + 8;
+        for ( $i = 0; $i < 63; ++$i ) {
+            $e[ $i ] += $carry;
+            $carry = $e[ $i ] + 8;
             $carry >>= 4;
-            $e[$i] -= $carry << 4;
+            $e[ $i ] -= $carry << 4;
         }
-        $e[63] += (int) $carry;
+        $e[ 63 ] += (int)$carry;
 
         $h = self::ge_p3_0();
 
-        for ($i = 1; $i < 64; $i += 2) {
-            $t = self::ge_select((int) floor($i / 2), (int) $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
+        for ( $i = 1; $i < 64; $i += 2 ) {
+            $t = self::ge_select( (int)floor( $i / 2 ), (int)$e[ $i ] );
+            $r = self::ge_madd( $r, $h, $t );
+            $h = self::ge_p1p1_to_p3( $r );
         }
 
-        $r = self::ge_p3_dbl($h);
+        $r = self::ge_p3_dbl( $h );
 
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
+        $s = self::ge_p1p1_to_p2( $r );
+        $r = self::ge_p2_dbl( $s );
+        $s = self::ge_p1p1_to_p2( $r );
+        $r = self::ge_p2_dbl( $s );
+        $s = self::ge_p1p1_to_p2( $r );
+        $r = self::ge_p2_dbl( $s );
 
-        $h = self::ge_p1p1_to_p3($r);
+        $h = self::ge_p1p1_to_p3( $r );
 
-        for ($i = 0; $i < 64; $i += 2) {
-            $t = self::ge_select($i >> 1, (int) $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
+        for ( $i = 0; $i < 64; $i += 2 ) {
+            $t = self::ge_select( $i >> 1, (int)$e[ $i ] );
+            $r = self::ge_madd( $r, $h, $t );
+            $h = self::ge_p1p1_to_p3( $r );
         }
         return $h;
     }
@@ -2059,330 +2059,330 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function sc_muladd($a, $b, $c)
+    public static function sc_muladd( $a, $b, $c )
     {
-        $a0 = 2097151 & self::load_3(self::substr($a, 0, 3));
-        $a1 = 2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5);
-        $a2 = 2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2);
-        $a3 = 2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7);
-        $a4 = 2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4);
-        $a5 = 2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1);
-        $a6 = 2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6);
-        $a7 = 2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3);
-        $a8 = 2097151 & self::load_3(self::substr($a, 21, 3));
-        $a9 = 2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5);
-        $a10 = 2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2);
-        $a11 = (self::load_4(self::substr($a, 28, 4)) >> 7);
-
-        $b0 = 2097151 & self::load_3(self::substr($b, 0, 3));
-        $b1 = 2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5);
-        $b2 = 2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2);
-        $b3 = 2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7);
-        $b4 = 2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4);
-        $b5 = 2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1);
-        $b6 = 2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6);
-        $b7 = 2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3);
-        $b8 = 2097151 & self::load_3(self::substr($b, 21, 3));
-        $b9 = 2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5);
-        $b10 = 2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2);
-        $b11 = (self::load_4(self::substr($b, 28, 4)) >> 7);
-
-        $c0 = 2097151 & self::load_3(self::substr($c, 0, 3));
-        $c1 = 2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5);
-        $c2 = 2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2);
-        $c3 = 2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7);
-        $c4 = 2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4);
-        $c5 = 2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1);
-        $c6 = 2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6);
-        $c7 = 2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3);
-        $c8 = 2097151 & self::load_3(self::substr($c, 21, 3));
-        $c9 = 2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5);
-        $c10 = 2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2);
-        $c11 = (self::load_4(self::substr($c, 28, 4)) >> 7);
+        $a0 = 2097151 & self::load_3( self::substr( $a, 0, 3 ) );
+        $a1 = 2097151 & ( self::load_4( self::substr( $a, 2, 4 ) ) >> 5 );
+        $a2 = 2097151 & ( self::load_3( self::substr( $a, 5, 3 ) ) >> 2 );
+        $a3 = 2097151 & ( self::load_4( self::substr( $a, 7, 4 ) ) >> 7 );
+        $a4 = 2097151 & ( self::load_4( self::substr( $a, 10, 4 ) ) >> 4 );
+        $a5 = 2097151 & ( self::load_3( self::substr( $a, 13, 3 ) ) >> 1 );
+        $a6 = 2097151 & ( self::load_4( self::substr( $a, 15, 4 ) ) >> 6 );
+        $a7 = 2097151 & ( self::load_3( self::substr( $a, 18, 3 ) ) >> 3 );
+        $a8 = 2097151 & self::load_3( self::substr( $a, 21, 3 ) );
+        $a9 = 2097151 & ( self::load_4( self::substr( $a, 23, 4 ) ) >> 5 );
+        $a10 = 2097151 & ( self::load_3( self::substr( $a, 26, 3 ) ) >> 2 );
+        $a11 = ( self::load_4( self::substr( $a, 28, 4 ) ) >> 7 );
+
+        $b0 = 2097151 & self::load_3( self::substr( $b, 0, 3 ) );
+        $b1 = 2097151 & ( self::load_4( self::substr( $b, 2, 4 ) ) >> 5 );
+        $b2 = 2097151 & ( self::load_3( self::substr( $b, 5, 3 ) ) >> 2 );
+        $b3 = 2097151 & ( self::load_4( self::substr( $b, 7, 4 ) ) >> 7 );
+        $b4 = 2097151 & ( self::load_4( self::substr( $b, 10, 4 ) ) >> 4 );
+        $b5 = 2097151 & ( self::load_3( self::substr( $b, 13, 3 ) ) >> 1 );
+        $b6 = 2097151 & ( self::load_4( self::substr( $b, 15, 4 ) ) >> 6 );
+        $b7 = 2097151 & ( self::load_3( self::substr( $b, 18, 3 ) ) >> 3 );
+        $b8 = 2097151 & self::load_3( self::substr( $b, 21, 3 ) );
+        $b9 = 2097151 & ( self::load_4( self::substr( $b, 23, 4 ) ) >> 5 );
+        $b10 = 2097151 & ( self::load_3( self::substr( $b, 26, 3 ) ) >> 2 );
+        $b11 = ( self::load_4( self::substr( $b, 28, 4 ) ) >> 7 );
+
+        $c0 = 2097151 & self::load_3( self::substr( $c, 0, 3 ) );
+        $c1 = 2097151 & ( self::load_4( self::substr( $c, 2, 4 ) ) >> 5 );
+        $c2 = 2097151 & ( self::load_3( self::substr( $c, 5, 3 ) ) >> 2 );
+        $c3 = 2097151 & ( self::load_4( self::substr( $c, 7, 4 ) ) >> 7 );
+        $c4 = 2097151 & ( self::load_4( self::substr( $c, 10, 4 ) ) >> 4 );
+        $c5 = 2097151 & ( self::load_3( self::substr( $c, 13, 3 ) ) >> 1 );
+        $c6 = 2097151 & ( self::load_4( self::substr( $c, 15, 4 ) ) >> 6 );
+        $c7 = 2097151 & ( self::load_3( self::substr( $c, 18, 3 ) ) >> 3 );
+        $c8 = 2097151 & self::load_3( self::substr( $c, 21, 3 ) );
+        $c9 = 2097151 & ( self::load_4( self::substr( $c, 23, 4 ) ) >> 5 );
+        $c10 = 2097151 & ( self::load_3( self::substr( $c, 26, 3 ) ) >> 2 );
+        $c11 = ( self::load_4( self::substr( $c, 28, 4 ) ) >> 7 );
 
         /* Can't really avoid the pyramid here: */
-        $s0 = $c0 + self::mul($a0, $b0, 24);
-        $s1 = $c1 + self::mul($a0, $b1, 24) + self::mul($a1, $b0, 24);
-        $s2 = $c2 + self::mul($a0, $b2, 24) + self::mul($a1, $b1, 24) + self::mul($a2, $b0, 24);
-        $s3 = $c3 + self::mul($a0, $b3, 24) + self::mul($a1, $b2, 24) + self::mul($a2, $b1, 24) + self::mul($a3, $b0, 24);
-        $s4 = $c4 + self::mul($a0, $b4, 24) + self::mul($a1, $b3, 24) + self::mul($a2, $b2, 24) + self::mul($a3, $b1, 24) +
-               self::mul($a4, $b0, 24);
-        $s5 = $c5 + self::mul($a0, $b5, 24) + self::mul($a1, $b4, 24) + self::mul($a2, $b3, 24) + self::mul($a3, $b2, 24) +
-               self::mul($a4, $b1, 24) + self::mul($a5, $b0, 24);
-        $s6 = $c6 + self::mul($a0, $b6, 24) + self::mul($a1, $b5, 24) + self::mul($a2, $b4, 24) + self::mul($a3, $b3, 24) +
-               self::mul($a4, $b2, 24) + self::mul($a5, $b1, 24) + self::mul($a6, $b0, 24);
-        $s7 = $c7 + self::mul($a0, $b7, 24) + self::mul($a1, $b6, 24) + self::mul($a2, $b5, 24) + self::mul($a3, $b4, 24) +
-               self::mul($a4, $b3, 24) + self::mul($a5, $b2, 24) + self::mul($a6, $b1, 24) + self::mul($a7, $b0, 24);
-        $s8 = $c8 + self::mul($a0, $b8, 24) + self::mul($a1, $b7, 24) + self::mul($a2, $b6, 24) + self::mul($a3, $b5, 24) +
-               self::mul($a4, $b4, 24) + self::mul($a5, $b3, 24) + self::mul($a6, $b2, 24) + self::mul($a7, $b1, 24) +
-               self::mul($a8, $b0, 24);
-        $s9 = $c9 + self::mul($a0, $b9, 24) + self::mul($a1, $b8, 24) + self::mul($a2, $b7, 24) + self::mul($a3, $b6, 24) +
-               self::mul($a4, $b5, 24) + self::mul($a5, $b4, 24) + self::mul($a6, $b3, 24) + self::mul($a7, $b2, 24) +
-               self::mul($a8, $b1, 24) + self::mul($a9, $b0, 24);
-        $s10 = $c10 + self::mul($a0, $b10, 24) + self::mul($a1, $b9, 24) + self::mul($a2, $b8, 24) + self::mul($a3, $b7, 24) +
-               self::mul($a4, $b6, 24) + self::mul($a5, $b5, 24) + self::mul($a6, $b4, 24) + self::mul($a7, $b3, 24) +
-               self::mul($a8, $b2, 24) + self::mul($a9, $b1, 24) + self::mul($a10, $b0, 24);
-        $s11 = $c11 + self::mul($a0, $b11, 24) + self::mul($a1, $b10, 24) + self::mul($a2, $b9, 24) + self::mul($a3, $b8, 24) +
-               self::mul($a4, $b7, 24) + self::mul($a5, $b6, 24) + self::mul($a6, $b5, 24) + self::mul($a7, $b4, 24) +
-               self::mul($a8, $b3, 24) + self::mul($a9, $b2, 24) + self::mul($a10, $b1, 24) + self::mul($a11, $b0, 24);
-        $s12 = self::mul($a1, $b11, 24) + self::mul($a2, $b10, 24) + self::mul($a3, $b9, 24) + self::mul($a4, $b8, 24) +
-               self::mul($a5, $b7, 24) + self::mul($a6, $b6, 24) + self::mul($a7, $b5, 24) + self::mul($a8, $b4, 24) +
-               self::mul($a9, $b3, 24) + self::mul($a10, $b2, 24) + self::mul($a11, $b1, 24);
-        $s13 = self::mul($a2, $b11, 24) + self::mul($a3, $b10, 24) + self::mul($a4, $b9, 24) + self::mul($a5, $b8, 24) +
-               self::mul($a6, $b7, 24) + self::mul($a7, $b6, 24) + self::mul($a8, $b5, 24) + self::mul($a9, $b4, 24) +
-               self::mul($a10, $b3, 24) + self::mul($a11, $b2, 24);
-        $s14 = self::mul($a3, $b11, 24) + self::mul($a4, $b10, 24) + self::mul($a5, $b9, 24) + self::mul($a6, $b8, 24) +
-               self::mul($a7, $b7, 24) + self::mul($a8, $b6, 24) + self::mul($a9, $b5, 24) + self::mul($a10, $b4, 24) +
-               self::mul($a11, $b3, 24);
-        $s15 = self::mul($a4, $b11, 24) + self::mul($a5, $b10, 24) + self::mul($a6, $b9, 24) + self::mul($a7, $b8, 24) +
-               self::mul($a8, $b7, 24) + self::mul($a9, $b6, 24) + self::mul($a10, $b5, 24) + self::mul($a11, $b4, 24);
-        $s16 = self::mul($a5, $b11, 24) + self::mul($a6, $b10, 24) + self::mul($a7, $b9, 24) + self::mul($a8, $b8, 24) +
-               self::mul($a9, $b7, 24) + self::mul($a10, $b6, 24) + self::mul($a11, $b5, 24);
-        $s17 = self::mul($a6, $b11, 24) + self::mul($a7, $b10, 24) + self::mul($a8, $b9, 24) + self::mul($a9, $b8, 24) +
-               self::mul($a10, $b7, 24) + self::mul($a11, $b6, 24);
-        $s18 = self::mul($a7, $b11, 24) + self::mul($a8, $b10, 24) + self::mul($a9, $b9, 24) + self::mul($a10, $b8, 24) +
-               self::mul($a11, $b7, 24);
-        $s19 = self::mul($a8, $b11, 24) + self::mul($a9, $b10, 24) + self::mul($a10, $b9, 24) + self::mul($a11, $b8, 24);
-        $s20 = self::mul($a9, $b11, 24) + self::mul($a10, $b10, 24) + self::mul($a11, $b9, 24);
-        $s21 = self::mul($a10, $b11, 24) + self::mul($a11, $b10, 24);
-        $s22 = self::mul($a11, $b11, 24);
+        $s0 = $c0 + self::mul( $a0, $b0, 24 );
+        $s1 = $c1 + self::mul( $a0, $b1, 24 ) + self::mul( $a1, $b0, 24 );
+        $s2 = $c2 + self::mul( $a0, $b2, 24 ) + self::mul( $a1, $b1, 24 ) + self::mul( $a2, $b0, 24 );
+        $s3 = $c3 + self::mul( $a0, $b3, 24 ) + self::mul( $a1, $b2, 24 ) + self::mul( $a2, $b1, 24 ) + self::mul( $a3, $b0, 24 );
+        $s4 = $c4 + self::mul( $a0, $b4, 24 ) + self::mul( $a1, $b3, 24 ) + self::mul( $a2, $b2, 24 ) + self::mul( $a3, $b1, 24 ) +
+               self::mul( $a4, $b0, 24 );
+        $s5 = $c5 + self::mul( $a0, $b5, 24 ) + self::mul( $a1, $b4, 24 ) + self::mul( $a2, $b3, 24 ) + self::mul( $a3, $b2, 24 ) +
+               self::mul( $a4, $b1, 24 ) + self::mul( $a5, $b0, 24 );
+        $s6 = $c6 + self::mul( $a0, $b6, 24 ) + self::mul( $a1, $b5, 24 ) + self::mul( $a2, $b4, 24 ) + self::mul( $a3, $b3, 24 ) +
+               self::mul( $a4, $b2, 24 ) + self::mul( $a5, $b1, 24 ) + self::mul( $a6, $b0, 24 );
+        $s7 = $c7 + self::mul( $a0, $b7, 24 ) + self::mul( $a1, $b6, 24 ) + self::mul( $a2, $b5, 24 ) + self::mul( $a3, $b4, 24 ) +
+               self::mul( $a4, $b3, 24 ) + self::mul( $a5, $b2, 24 ) + self::mul( $a6, $b1, 24 ) + self::mul( $a7, $b0, 24 );
+        $s8 = $c8 + self::mul( $a0, $b8, 24 ) + self::mul( $a1, $b7, 24 ) + self::mul( $a2, $b6, 24 ) + self::mul( $a3, $b5, 24 ) +
+               self::mul( $a4, $b4, 24 ) + self::mul( $a5, $b3, 24 ) + self::mul( $a6, $b2, 24 ) + self::mul( $a7, $b1, 24 ) +
+               self::mul( $a8, $b0, 24 );
+        $s9 = $c9 + self::mul( $a0, $b9, 24 ) + self::mul( $a1, $b8, 24 ) + self::mul( $a2, $b7, 24 ) + self::mul( $a3, $b6, 24 ) +
+               self::mul( $a4, $b5, 24 ) + self::mul( $a5, $b4, 24 ) + self::mul( $a6, $b3, 24 ) + self::mul( $a7, $b2, 24 ) +
+               self::mul( $a8, $b1, 24 ) + self::mul( $a9, $b0, 24 );
+        $s10 = $c10 + self::mul( $a0, $b10, 24 ) + self::mul( $a1, $b9, 24 ) + self::mul( $a2, $b8, 24 ) + self::mul( $a3, $b7, 24 ) +
+               self::mul( $a4, $b6, 24 ) + self::mul( $a5, $b5, 24 ) + self::mul( $a6, $b4, 24 ) + self::mul( $a7, $b3, 24 ) +
+               self::mul( $a8, $b2, 24 ) + self::mul( $a9, $b1, 24 ) + self::mul( $a10, $b0, 24 );
+        $s11 = $c11 + self::mul( $a0, $b11, 24 ) + self::mul( $a1, $b10, 24 ) + self::mul( $a2, $b9, 24 ) + self::mul( $a3, $b8, 24 ) +
+               self::mul( $a4, $b7, 24 ) + self::mul( $a5, $b6, 24 ) + self::mul( $a6, $b5, 24 ) + self::mul( $a7, $b4, 24 ) +
+               self::mul( $a8, $b3, 24 ) + self::mul( $a9, $b2, 24 ) + self::mul( $a10, $b1, 24 ) + self::mul( $a11, $b0, 24 );
+        $s12 = self::mul( $a1, $b11, 24 ) + self::mul( $a2, $b10, 24 ) + self::mul( $a3, $b9, 24 ) + self::mul( $a4, $b8, 24 ) +
+               self::mul( $a5, $b7, 24 ) + self::mul( $a6, $b6, 24 ) + self::mul( $a7, $b5, 24 ) + self::mul( $a8, $b4, 24 ) +
+               self::mul( $a9, $b3, 24 ) + self::mul( $a10, $b2, 24 ) + self::mul( $a11, $b1, 24 );
+        $s13 = self::mul( $a2, $b11, 24 ) + self::mul( $a3, $b10, 24 ) + self::mul( $a4, $b9, 24 ) + self::mul( $a5, $b8, 24 ) +
+               self::mul( $a6, $b7, 24 ) + self::mul( $a7, $b6, 24 ) + self::mul( $a8, $b5, 24 ) + self::mul( $a9, $b4, 24 ) +
+               self::mul( $a10, $b3, 24 ) + self::mul( $a11, $b2, 24 );
+        $s14 = self::mul( $a3, $b11, 24 ) + self::mul( $a4, $b10, 24 ) + self::mul( $a5, $b9, 24 ) + self::mul( $a6, $b8, 24 ) +
+               self::mul( $a7, $b7, 24 ) + self::mul( $a8, $b6, 24 ) + self::mul( $a9, $b5, 24 ) + self::mul( $a10, $b4, 24 ) +
+               self::mul( $a11, $b3, 24 );
+        $s15 = self::mul( $a4, $b11, 24 ) + self::mul( $a5, $b10, 24 ) + self::mul( $a6, $b9, 24 ) + self::mul( $a7, $b8, 24 ) +
+               self::mul( $a8, $b7, 24 ) + self::mul( $a9, $b6, 24 ) + self::mul( $a10, $b5, 24 ) + self::mul( $a11, $b4, 24 );
+        $s16 = self::mul( $a5, $b11, 24 ) + self::mul( $a6, $b10, 24 ) + self::mul( $a7, $b9, 24 ) + self::mul( $a8, $b8, 24 ) +
+               self::mul( $a9, $b7, 24 ) + self::mul( $a10, $b6, 24 ) + self::mul( $a11, $b5, 24 );
+        $s17 = self::mul( $a6, $b11, 24 ) + self::mul( $a7, $b10, 24 ) + self::mul( $a8, $b9, 24 ) + self::mul( $a9, $b8, 24 ) +
+               self::mul( $a10, $b7, 24 ) + self::mul( $a11, $b6, 24 );
+        $s18 = self::mul( $a7, $b11, 24 ) + self::mul( $a8, $b10, 24 ) + self::mul( $a9, $b9, 24 ) + self::mul( $a10, $b8, 24 ) +
+               self::mul( $a11, $b7, 24 );
+        $s19 = self::mul( $a8, $b11, 24 ) + self::mul( $a9, $b10, 24 ) + self::mul( $a10, $b9, 24 ) + self::mul( $a11, $b8, 24 );
+        $s20 = self::mul( $a9, $b11, 24 ) + self::mul( $a10, $b10, 24 ) + self::mul( $a11, $b9, 24 );
+        $s21 = self::mul( $a10, $b11, 24 ) + self::mul( $a11, $b10, 24 );
+        $s22 = self::mul( $a11, $b11, 24 );
         $s23 = 0;
 
-        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $carry0 = ( $s0 + ( 1 << 20 ) ) >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
-        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $carry2 = ( $s2 + ( 1 << 20 ) ) >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
-        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $carry4 = ( $s4 + ( 1 << 20 ) ) >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
-        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $carry12 = ( $s12 + ( 1 << 20 ) ) >> 21;
         $s13 += $carry12;
         $s12 -= $carry12 << 21;
-        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $carry14 = ( $s14 + ( 1 << 20 ) ) >> 21;
         $s15 += $carry14;
         $s14 -= $carry14 << 21;
-        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $carry16 = ( $s16 + ( 1 << 20 ) ) >> 21;
         $s17 += $carry16;
         $s16 -= $carry16 << 21;
-        $carry18 = ($s18 + (1 << 20)) >> 21;
+        $carry18 = ( $s18 + ( 1 << 20 ) ) >> 21;
         $s19 += $carry18;
         $s18 -= $carry18 << 21;
-        $carry20 = ($s20 + (1 << 20)) >> 21;
+        $carry20 = ( $s20 + ( 1 << 20 ) ) >> 21;
         $s21 += $carry20;
         $s20 -= $carry20 << 21;
-        $carry22 = ($s22 + (1 << 20)) >> 21;
+        $carry22 = ( $s22 + ( 1 << 20 ) ) >> 21;
         $s23 += $carry22;
         $s22 -= $carry22 << 21;
 
-        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $carry1 = ( $s1 + ( 1 << 20 ) ) >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
-        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $carry3 = ( $s3 + ( 1 << 20 ) ) >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
-        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $carry5 = ( $s5 + ( 1 << 20 ) ) >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
-        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $carry13 = ( $s13 + ( 1 << 20 ) ) >> 21;
         $s14 += $carry13;
         $s13 -= $carry13 << 21;
-        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $carry15 = ( $s15 + ( 1 << 20 ) ) >> 21;
         $s16 += $carry15;
         $s15 -= $carry15 << 21;
-        $carry17 = ($s17 + (1 << 20)) >> 21;
+        $carry17 = ( $s17 + ( 1 << 20 ) ) >> 21;
         $s18 += $carry17;
         $s17 -= $carry17 << 21;
-        $carry19 = ($s19 + (1 << 20)) >> 21;
+        $carry19 = ( $s19 + ( 1 << 20 ) ) >> 21;
         $s20 += $carry19;
         $s19 -= $carry19 << 21;
-        $carry21 = ($s21 + (1 << 20)) >> 21;
+        $carry21 = ( $s21 + ( 1 << 20 ) ) >> 21;
         $s22 += $carry21;
         $s21 -= $carry21 << 21;
 
-        $s11 += self::mul($s23, 666643, 20);
-        $s12 += self::mul($s23, 470296, 19);
-        $s13 += self::mul($s23, 654183, 20);
-        $s14 -= self::mul($s23, 997805, 20);
-        $s15 += self::mul($s23, 136657, 18);
-        $s16 -= self::mul($s23, 683901, 20);
-
-        $s10 += self::mul($s22, 666643, 20);
-        $s11 += self::mul($s22, 470296, 19);
-        $s12 += self::mul($s22, 654183, 20);
-        $s13 -= self::mul($s22, 997805, 20);
-        $s14 += self::mul($s22, 136657, 18);
-        $s15 -= self::mul($s22, 683901, 20);
-
-        $s9  += self::mul($s21,  666643, 20);
-        $s10 += self::mul($s21,  470296, 19);
-        $s11 += self::mul($s21,  654183, 20);
-        $s12 -= self::mul($s21,  997805, 20);
-        $s13 += self::mul($s21,  136657, 18);
-        $s14 -= self::mul($s21,  683901, 20);
-
-        $s8  += self::mul($s20,  666643, 20);
-        $s9  += self::mul($s20,  470296, 19);
-        $s10 += self::mul($s20,  654183, 20);
-        $s11 -= self::mul($s20,  997805, 20);
-        $s12 += self::mul($s20,  136657, 18);
-        $s13 -= self::mul($s20,  683901, 20);
-
-        $s7  += self::mul($s19,  666643, 20);
-        $s8  += self::mul($s19,  470296, 19);
-        $s9  += self::mul($s19,  654183, 20);
-        $s10 -= self::mul($s19,  997805, 20);
-        $s11 += self::mul($s19,  136657, 18);
-        $s12 -= self::mul($s19,  683901, 20);
-
-        $s6  += self::mul($s18,  666643, 20);
-        $s7  += self::mul($s18,  470296, 19);
-        $s8  += self::mul($s18,  654183, 20);
-        $s9  -= self::mul($s18,  997805, 20);
-        $s10 += self::mul($s18,  136657, 18);
-        $s11 -= self::mul($s18,  683901, 20);
-
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s11 += self::mul( $s23, 666643, 20 );
+        $s12 += self::mul( $s23, 470296, 19 );
+        $s13 += self::mul( $s23, 654183, 20 );
+        $s14 -= self::mul( $s23, 997805, 20 );
+        $s15 += self::mul( $s23, 136657, 18 );
+        $s16 -= self::mul( $s23, 683901, 20 );
+
+        $s10 += self::mul( $s22, 666643, 20 );
+        $s11 += self::mul( $s22, 470296, 19 );
+        $s12 += self::mul( $s22, 654183, 20 );
+        $s13 -= self::mul( $s22, 997805, 20 );
+        $s14 += self::mul( $s22, 136657, 18 );
+        $s15 -= self::mul( $s22, 683901, 20 );
+
+        $s9  += self::mul( $s21, 666643, 20 );
+        $s10 += self::mul( $s21, 470296, 19 );
+        $s11 += self::mul( $s21, 654183, 20 );
+        $s12 -= self::mul( $s21, 997805, 20 );
+        $s13 += self::mul( $s21, 136657, 18 );
+        $s14 -= self::mul( $s21, 683901, 20 );
+
+        $s8  += self::mul( $s20, 666643, 20 );
+        $s9  += self::mul( $s20, 470296, 19 );
+        $s10 += self::mul( $s20, 654183, 20 );
+        $s11 -= self::mul( $s20, 997805, 20 );
+        $s12 += self::mul( $s20, 136657, 18 );
+        $s13 -= self::mul( $s20, 683901, 20 );
+
+        $s7  += self::mul( $s19, 666643, 20 );
+        $s8  += self::mul( $s19, 470296, 19 );
+        $s9  += self::mul( $s19, 654183, 20 );
+        $s10 -= self::mul( $s19, 997805, 20 );
+        $s11 += self::mul( $s19, 136657, 18 );
+        $s12 -= self::mul( $s19, 683901, 20 );
+
+        $s6  += self::mul( $s18, 666643, 20 );
+        $s7  += self::mul( $s18, 470296, 19 );
+        $s8  += self::mul( $s18, 654183, 20 );
+        $s9  -= self::mul( $s18, 997805, 20 );
+        $s10 += self::mul( $s18, 136657, 18 );
+        $s11 -= self::mul( $s18, 683901, 20 );
+
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
-        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $carry12 = ( $s12 + ( 1 << 20 ) ) >> 21;
         $s13 += $carry12;
         $s12 -= $carry12 << 21;
-        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $carry14 = ( $s14 + ( 1 << 20 ) ) >> 21;
         $s15 += $carry14;
         $s14 -= $carry14 << 21;
-        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $carry16 = ( $s16 + ( 1 << 20 ) ) >> 21;
         $s17 += $carry16;
         $s16 -= $carry16 << 21;
 
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
-        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $carry13 = ( $s13 + ( 1 << 20 ) ) >> 21;
         $s14 += $carry13;
         $s13 -= $carry13 << 21;
-        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $carry15 = ( $s15 + ( 1 << 20 ) ) >> 21;
         $s16 += $carry15;
         $s15 -= $carry15 << 21;
 
-        $s5  += self::mul($s17,  666643, 20);
-        $s6  += self::mul($s17,  470296, 19);
-        $s7  += self::mul($s17,  654183, 20);
-        $s8  -= self::mul($s17,  997805, 20);
-        $s9  += self::mul($s17,  136657, 18);
-        $s10 -= self::mul($s17,  683901, 20);
-
-        $s4 += self::mul($s16,  666643, 20);
-        $s5 += self::mul($s16,  470296, 19);
-        $s6 += self::mul($s16,  654183, 20);
-        $s7 -= self::mul($s16,  997805, 20);
-        $s8 += self::mul($s16,  136657, 18);
-        $s9 -= self::mul($s16,  683901, 20);
-
-        $s3 += self::mul($s15,  666643, 20);
-        $s4 += self::mul($s15,  470296, 19);
-        $s5 += self::mul($s15,  654183, 20);
-        $s6 -= self::mul($s15,  997805, 20);
-        $s7 += self::mul($s15,  136657, 18);
-        $s8 -= self::mul($s15,  683901, 20);
-
-        $s2 += self::mul($s14,  666643, 20);
-        $s3 += self::mul($s14,  470296, 19);
-        $s4 += self::mul($s14,  654183, 20);
-        $s5 -= self::mul($s14,  997805, 20);
-        $s6 += self::mul($s14,  136657, 18);
-        $s7 -= self::mul($s14,  683901, 20);
-
-        $s1 += self::mul($s13,  666643, 20);
-        $s2 += self::mul($s13,  470296, 19);
-        $s3 += self::mul($s13,  654183, 20);
-        $s4 -= self::mul($s13,  997805, 20);
-        $s5 += self::mul($s13,  136657, 18);
-        $s6 -= self::mul($s13,  683901, 20);
-
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s5  += self::mul( $s17, 666643, 20 );
+        $s6  += self::mul( $s17, 470296, 19 );
+        $s7  += self::mul( $s17, 654183, 20 );
+        $s8  -= self::mul( $s17, 997805, 20 );
+        $s9  += self::mul( $s17, 136657, 18 );
+        $s10 -= self::mul( $s17, 683901, 20 );
+
+        $s4 += self::mul( $s16, 666643, 20 );
+        $s5 += self::mul( $s16, 470296, 19 );
+        $s6 += self::mul( $s16, 654183, 20 );
+        $s7 -= self::mul( $s16, 997805, 20 );
+        $s8 += self::mul( $s16, 136657, 18 );
+        $s9 -= self::mul( $s16, 683901, 20 );
+
+        $s3 += self::mul( $s15, 666643, 20 );
+        $s4 += self::mul( $s15, 470296, 19 );
+        $s5 += self::mul( $s15, 654183, 20 );
+        $s6 -= self::mul( $s15, 997805, 20 );
+        $s7 += self::mul( $s15, 136657, 18 );
+        $s8 -= self::mul( $s15, 683901, 20 );
+
+        $s2 += self::mul( $s14, 666643, 20 );
+        $s3 += self::mul( $s14, 470296, 19 );
+        $s4 += self::mul( $s14, 654183, 20 );
+        $s5 -= self::mul( $s14, 997805, 20 );
+        $s6 += self::mul( $s14, 136657, 18 );
+        $s7 -= self::mul( $s14, 683901, 20 );
+
+        $s1 += self::mul( $s13, 666643, 20 );
+        $s2 += self::mul( $s13, 470296, 19 );
+        $s3 += self::mul( $s13, 654183, 20 );
+        $s4 -= self::mul( $s13, 997805, 20 );
+        $s5 += self::mul( $s13, 136657, 18 );
+        $s6 -= self::mul( $s13, 683901, 20 );
+
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
         $s12 = 0;
 
-        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $carry0 = ( $s0 + ( 1 << 20 ) ) >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
-        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $carry2 = ( $s2 + ( 1 << 20 ) ) >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
-        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $carry4 = ( $s4 + ( 1 << 20 ) ) >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
 
-        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $carry1 = ( $s1 + ( 1 << 20 ) ) >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
-        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $carry3 = ( $s3 + ( 1 << 20 ) ) >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
-        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $carry5 = ( $s5 + ( 1 << 20 ) ) >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
         $s12 = 0;
 
         $carry0 = $s0 >> 21;
@@ -2422,12 +2422,12 @@ 
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
 
         $carry0 = $s0 >> 21;
         $s1 += $carry0;
@@ -2467,40 +2467,40 @@ 
          * @var array<int, int>
          */
         $arr = array(
-            (int) (0xff & ($s0 >> 0)),
-            (int) (0xff & ($s0 >> 8)),
-            (int) (0xff & (($s0 >> 16) | $s1 << 5)),
-            (int) (0xff & ($s1 >> 3)),
-            (int) (0xff & ($s1 >> 11)),
-            (int) (0xff & (($s1 >> 19) | $s2 << 2)),
-            (int) (0xff & ($s2 >> 6)),
-            (int) (0xff & (($s2 >> 14) | $s3 << 7)),
-            (int) (0xff & ($s3 >> 1)),
-            (int) (0xff & ($s3 >> 9)),
-            (int) (0xff & (($s3 >> 17) | $s4 << 4)),
-            (int) (0xff & ($s4 >> 4)),
-            (int) (0xff & ($s4 >> 12)),
-            (int) (0xff & (($s4 >> 20) | $s5 << 1)),
-            (int) (0xff & ($s5 >> 7)),
-            (int) (0xff & (($s5 >> 15) | $s6 << 6)),
-            (int) (0xff & ($s6 >> 2)),
-            (int) (0xff & ($s6 >> 10)),
-            (int) (0xff & (($s6 >> 18) | $s7 << 3)),
-            (int) (0xff & ($s7 >> 5)),
-            (int) (0xff & ($s7 >> 13)),
-            (int) (0xff & ($s8 >> 0)),
-            (int) (0xff & ($s8 >> 8)),
-            (int) (0xff & (($s8 >> 16) | $s9 << 5)),
-            (int) (0xff & ($s9 >> 3)),
-            (int) (0xff & ($s9 >> 11)),
-            (int) (0xff & (($s9 >> 19) | $s10 << 2)),
-            (int) (0xff & ($s10 >> 6)),
-            (int) (0xff & (($s10 >> 14) | $s11 << 7)),
-            (int) (0xff & ($s11 >> 1)),
-            (int) (0xff & ($s11 >> 9)),
-            0xff & ($s11 >> 17)
+            (int)( 0xff & ( $s0 >> 0 ) ),
+            (int)( 0xff & ( $s0 >> 8 ) ),
+            (int)( 0xff & ( ( $s0 >> 16 ) | $s1 << 5 ) ),
+            (int)( 0xff & ( $s1 >> 3 ) ),
+            (int)( 0xff & ( $s1 >> 11 ) ),
+            (int)( 0xff & ( ( $s1 >> 19 ) | $s2 << 2 ) ),
+            (int)( 0xff & ( $s2 >> 6 ) ),
+            (int)( 0xff & ( ( $s2 >> 14 ) | $s3 << 7 ) ),
+            (int)( 0xff & ( $s3 >> 1 ) ),
+            (int)( 0xff & ( $s3 >> 9 ) ),
+            (int)( 0xff & ( ( $s3 >> 17 ) | $s4 << 4 ) ),
+            (int)( 0xff & ( $s4 >> 4 ) ),
+            (int)( 0xff & ( $s4 >> 12 ) ),
+            (int)( 0xff & ( ( $s4 >> 20 ) | $s5 << 1 ) ),
+            (int)( 0xff & ( $s5 >> 7 ) ),
+            (int)( 0xff & ( ( $s5 >> 15 ) | $s6 << 6 ) ),
+            (int)( 0xff & ( $s6 >> 2 ) ),
+            (int)( 0xff & ( $s6 >> 10 ) ),
+            (int)( 0xff & ( ( $s6 >> 18 ) | $s7 << 3 ) ),
+            (int)( 0xff & ( $s7 >> 5 ) ),
+            (int)( 0xff & ( $s7 >> 13 ) ),
+            (int)( 0xff & ( $s8 >> 0 ) ),
+            (int)( 0xff & ( $s8 >> 8 ) ),
+            (int)( 0xff & ( ( $s8 >> 16 ) | $s9 << 5 ) ),
+            (int)( 0xff & ( $s9 >> 3 ) ),
+            (int)( 0xff & ( $s9 >> 11 ) ),
+            (int)( 0xff & ( ( $s9 >> 19 ) | $s10 << 2 ) ),
+            (int)( 0xff & ( $s10 >> 6 ) ),
+            (int)( 0xff & ( ( $s10 >> 14 ) | $s11 << 7 ) ),
+            (int)( 0xff & ( $s11 >> 1 ) ),
+            (int)( 0xff & ( $s11 >> 9 ) ),
+            0xff & ( $s11 >> 17 )
         );
-        return self::intArrayToString($arr);
+        return self::intArrayToString( $arr );
     }
 
     /**
@@ -2510,197 +2510,197 @@ 
      * @return string
      * @throws TypeError
      */
-    public static function sc_reduce($s)
+    public static function sc_reduce( $s )
     {
-        $s0 = 2097151 & self::load_3(self::substr($s, 0, 3));
-        $s1 = 2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5);
-        $s2 = 2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2);
-        $s3 = 2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7);
-        $s4 = 2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4);
-        $s5 = 2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1);
-        $s6 = 2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6);
-        $s7 = 2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3);
-        $s8 = 2097151 & self::load_3(self::substr($s, 21, 3));
-        $s9 = 2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5);
-        $s10 = 2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2);
-        $s11 = 2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7);
-        $s12 = 2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4);
-        $s13 = 2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1);
-        $s14 = 2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6);
-        $s15 = 2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3);
-        $s16 = 2097151 & self::load_3(self::substr($s, 42, 3));
-        $s17 = 2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5);
-        $s18 = 2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2);
-        $s19 = 2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7);
-        $s20 = 2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4);
-        $s21 = 2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1);
-        $s22 = 2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6);
-        $s23 = (self::load_4(self::substr($s, 60, 4)) >> 3);
-
-        $s11 += self::mul($s23,  666643, 20);
-        $s12 += self::mul($s23,  470296, 19);
-        $s13 += self::mul($s23,  654183, 20);
-        $s14 -= self::mul($s23,  997805, 20);
-        $s15 += self::mul($s23,  136657, 18);
-        $s16 -= self::mul($s23,  683901, 20);
-
-        $s10 += self::mul($s22,  666643, 20);
-        $s11 += self::mul($s22,  470296, 19);
-        $s12 += self::mul($s22,  654183, 20);
-        $s13 -= self::mul($s22,  997805, 20);
-        $s14 += self::mul($s22,  136657, 18);
-        $s15 -= self::mul($s22,  683901, 20);
-
-        $s9  += self::mul($s21,  666643, 20);
-        $s10 += self::mul($s21,  470296, 19);
-        $s11 += self::mul($s21,  654183, 20);
-        $s12 -= self::mul($s21,  997805, 20);
-        $s13 += self::mul($s21,  136657, 18);
-        $s14 -= self::mul($s21,  683901, 20);
-
-        $s8  += self::mul($s20,  666643, 20);
-        $s9  += self::mul($s20,  470296, 19);
-        $s10 += self::mul($s20,  654183, 20);
-        $s11 -= self::mul($s20,  997805, 20);
-        $s12 += self::mul($s20,  136657, 18);
-        $s13 -= self::mul($s20,  683901, 20);
-
-        $s7  += self::mul($s19,  666643, 20);
-        $s8  += self::mul($s19,  470296, 19);
-        $s9  += self::mul($s19,  654183, 20);
-        $s10 -= self::mul($s19,  997805, 20);
-        $s11 += self::mul($s19,  136657, 18);
-        $s12 -= self::mul($s19,  683901, 20);
-
-        $s6  += self::mul($s18,  666643, 20);
-        $s7  += self::mul($s18,  470296, 19);
-        $s8  += self::mul($s18,  654183, 20);
-        $s9  -= self::mul($s18,  997805, 20);
-        $s10 += self::mul($s18,  136657, 18);
-        $s11 -= self::mul($s18,  683901, 20);
-
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s0 = 2097151 & self::load_3( self::substr( $s, 0, 3 ) );
+        $s1 = 2097151 & ( self::load_4( self::substr( $s, 2, 4 ) ) >> 5 );
+        $s2 = 2097151 & ( self::load_3( self::substr( $s, 5, 3 ) ) >> 2 );
+        $s3 = 2097151 & ( self::load_4( self::substr( $s, 7, 4 ) ) >> 7 );
+        $s4 = 2097151 & ( self::load_4( self::substr( $s, 10, 4 ) ) >> 4 );
+        $s5 = 2097151 & ( self::load_3( self::substr( $s, 13, 3 ) ) >> 1 );
+        $s6 = 2097151 & ( self::load_4( self::substr( $s, 15, 4 ) ) >> 6 );
+        $s7 = 2097151 & ( self::load_3( self::substr( $s, 18, 4 ) ) >> 3 );
+        $s8 = 2097151 & self::load_3( self::substr( $s, 21, 3 ) );
+        $s9 = 2097151 & ( self::load_4( self::substr( $s, 23, 4 ) ) >> 5 );
+        $s10 = 2097151 & ( self::load_3( self::substr( $s, 26, 3 ) ) >> 2 );
+        $s11 = 2097151 & ( self::load_4( self::substr( $s, 28, 4 ) ) >> 7 );
+        $s12 = 2097151 & ( self::load_4( self::substr( $s, 31, 4 ) ) >> 4 );
+        $s13 = 2097151 & ( self::load_3( self::substr( $s, 34, 3 ) ) >> 1 );
+        $s14 = 2097151 & ( self::load_4( self::substr( $s, 36, 4 ) ) >> 6 );
+        $s15 = 2097151 & ( self::load_3( self::substr( $s, 39, 4 ) ) >> 3 );
+        $s16 = 2097151 & self::load_3( self::substr( $s, 42, 3 ) );
+        $s17 = 2097151 & ( self::load_4( self::substr( $s, 44, 4 ) ) >> 5 );
+        $s18 = 2097151 & ( self::load_3( self::substr( $s, 47, 3 ) ) >> 2 );
+        $s19 = 2097151 & ( self::load_4( self::substr( $s, 49, 4 ) ) >> 7 );
+        $s20 = 2097151 & ( self::load_4( self::substr( $s, 52, 4 ) ) >> 4 );
+        $s21 = 2097151 & ( self::load_3( self::substr( $s, 55, 3 ) ) >> 1 );
+        $s22 = 2097151 & ( self::load_4( self::substr( $s, 57, 4 ) ) >> 6 );
+        $s23 = ( self::load_4( self::substr( $s, 60, 4 ) ) >> 3 );
+
+        $s11 += self::mul( $s23, 666643, 20 );
+        $s12 += self::mul( $s23, 470296, 19 );
+        $s13 += self::mul( $s23, 654183, 20 );
+        $s14 -= self::mul( $s23, 997805, 20 );
+        $s15 += self::mul( $s23, 136657, 18 );
+        $s16 -= self::mul( $s23, 683901, 20 );
+
+        $s10 += self::mul( $s22, 666643, 20 );
+        $s11 += self::mul( $s22, 470296, 19 );
+        $s12 += self::mul( $s22, 654183, 20 );
+        $s13 -= self::mul( $s22, 997805, 20 );
+        $s14 += self::mul( $s22, 136657, 18 );
+        $s15 -= self::mul( $s22, 683901, 20 );
+
+        $s9  += self::mul( $s21, 666643, 20 );
+        $s10 += self::mul( $s21, 470296, 19 );
+        $s11 += self::mul( $s21, 654183, 20 );
+        $s12 -= self::mul( $s21, 997805, 20 );
+        $s13 += self::mul( $s21, 136657, 18 );
+        $s14 -= self::mul( $s21, 683901, 20 );
+
+        $s8  += self::mul( $s20, 666643, 20 );
+        $s9  += self::mul( $s20, 470296, 19 );
+        $s10 += self::mul( $s20, 654183, 20 );
+        $s11 -= self::mul( $s20, 997805, 20 );
+        $s12 += self::mul( $s20, 136657, 18 );
+        $s13 -= self::mul( $s20, 683901, 20 );
+
+        $s7  += self::mul( $s19, 666643, 20 );
+        $s8  += self::mul( $s19, 470296, 19 );
+        $s9  += self::mul( $s19, 654183, 20 );
+        $s10 -= self::mul( $s19, 997805, 20 );
+        $s11 += self::mul( $s19, 136657, 18 );
+        $s12 -= self::mul( $s19, 683901, 20 );
+
+        $s6  += self::mul( $s18, 666643, 20 );
+        $s7  += self::mul( $s18, 470296, 19 );
+        $s8  += self::mul( $s18, 654183, 20 );
+        $s9  -= self::mul( $s18, 997805, 20 );
+        $s10 += self::mul( $s18, 136657, 18 );
+        $s11 -= self::mul( $s18, 683901, 20 );
+
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
-        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $carry12 = ( $s12 + ( 1 << 20 ) ) >> 21;
         $s13 += $carry12;
         $s12 -= $carry12 << 21;
-        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $carry14 = ( $s14 + ( 1 << 20 ) ) >> 21;
         $s15 += $carry14;
         $s14 -= $carry14 << 21;
-        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $carry16 = ( $s16 + ( 1 << 20 ) ) >> 21;
         $s17 += $carry16;
         $s16 -= $carry16 << 21;
 
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
-        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $carry13 = ( $s13 + ( 1 << 20 ) ) >> 21;
         $s14 += $carry13;
         $s13 -= $carry13 << 21;
-        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $carry15 = ( $s15 + ( 1 << 20 ) ) >> 21;
         $s16 += $carry15;
         $s15 -= $carry15 << 21;
 
-        $s5  += self::mul($s17,  666643, 20);
-        $s6  += self::mul($s17,  470296, 19);
-        $s7  += self::mul($s17,  654183, 20);
-        $s8  -= self::mul($s17,  997805, 20);
-        $s9  += self::mul($s17,  136657, 18);
-        $s10 -= self::mul($s17,  683901, 20);
-
-        $s4 += self::mul($s16,  666643, 20);
-        $s5 += self::mul($s16,  470296, 19);
-        $s6 += self::mul($s16,  654183, 20);
-        $s7 -= self::mul($s16,  997805, 20);
-        $s8 += self::mul($s16,  136657, 18);
-        $s9 -= self::mul($s16,  683901, 20);
-
-        $s3 += self::mul($s15,  666643, 20);
-        $s4 += self::mul($s15,  470296, 19);
-        $s5 += self::mul($s15,  654183, 20);
-        $s6 -= self::mul($s15,  997805, 20);
-        $s7 += self::mul($s15,  136657, 18);
-        $s8 -= self::mul($s15,  683901, 20);
-
-        $s2 += self::mul($s14,  666643, 20);
-        $s3 += self::mul($s14,  470296, 19);
-        $s4 += self::mul($s14,  654183, 20);
-        $s5 -= self::mul($s14,  997805, 20);
-        $s6 += self::mul($s14,  136657, 18);
-        $s7 -= self::mul($s14,  683901, 20);
-
-        $s1 += self::mul($s13,  666643, 20);
-        $s2 += self::mul($s13,  470296, 19);
-        $s3 += self::mul($s13,  654183, 20);
-        $s4 -= self::mul($s13,  997805, 20);
-        $s5 += self::mul($s13,  136657, 18);
-        $s6 -= self::mul($s13,  683901, 20);
-
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s5  += self::mul( $s17, 666643, 20 );
+        $s6  += self::mul( $s17, 470296, 19 );
+        $s7  += self::mul( $s17, 654183, 20 );
+        $s8  -= self::mul( $s17, 997805, 20 );
+        $s9  += self::mul( $s17, 136657, 18 );
+        $s10 -= self::mul( $s17, 683901, 20 );
+
+        $s4 += self::mul( $s16, 666643, 20 );
+        $s5 += self::mul( $s16, 470296, 19 );
+        $s6 += self::mul( $s16, 654183, 20 );
+        $s7 -= self::mul( $s16, 997805, 20 );
+        $s8 += self::mul( $s16, 136657, 18 );
+        $s9 -= self::mul( $s16, 683901, 20 );
+
+        $s3 += self::mul( $s15, 666643, 20 );
+        $s4 += self::mul( $s15, 470296, 19 );
+        $s5 += self::mul( $s15, 654183, 20 );
+        $s6 -= self::mul( $s15, 997805, 20 );
+        $s7 += self::mul( $s15, 136657, 18 );
+        $s8 -= self::mul( $s15, 683901, 20 );
+
+        $s2 += self::mul( $s14, 666643, 20 );
+        $s3 += self::mul( $s14, 470296, 19 );
+        $s4 += self::mul( $s14, 654183, 20 );
+        $s5 -= self::mul( $s14, 997805, 20 );
+        $s6 += self::mul( $s14, 136657, 18 );
+        $s7 -= self::mul( $s14, 683901, 20 );
+
+        $s1 += self::mul( $s13, 666643, 20 );
+        $s2 += self::mul( $s13, 470296, 19 );
+        $s3 += self::mul( $s13, 654183, 20 );
+        $s4 -= self::mul( $s13, 997805, 20 );
+        $s5 += self::mul( $s13, 136657, 18 );
+        $s6 -= self::mul( $s13, 683901, 20 );
+
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
         $s12 = 0;
 
-        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $carry0 = ( $s0 + ( 1 << 20 ) ) >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
-        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $carry2 = ( $s2 + ( 1 << 20 ) ) >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
-        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $carry4 = ( $s4 + ( 1 << 20 ) ) >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
 
-        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $carry1 = ( $s1 + ( 1 << 20 ) ) >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
-        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $carry3 = ( $s3 + ( 1 << 20 ) ) >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
-        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $carry5 = ( $s5 + ( 1 << 20 ) ) >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
         $s12 = 0;
 
         $carry0 = $s0 >> 21;
@@ -2740,12 +2740,12 @@ 
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
-        $s0 += self::mul($s12,  666643, 20);
-        $s1 += self::mul($s12,  470296, 19);
-        $s2 += self::mul($s12,  654183, 20);
-        $s3 -= self::mul($s12,  997805, 20);
-        $s4 += self::mul($s12,  136657, 18);
-        $s5 -= self::mul($s12,  683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
 
         $carry0 = $s0 >> 21;
         $s1 += $carry0;
@@ -2785,40 +2785,40 @@ 
          * @var array<int, int>
          */
         $arr = array(
-            (int) ($s0 >> 0),
-            (int) ($s0 >> 8),
-            (int) (($s0 >> 16) | $s1 << 5),
-            (int) ($s1 >> 3),
-            (int) ($s1 >> 11),
-            (int) (($s1 >> 19) | $s2 << 2),
-            (int) ($s2 >> 6),
-            (int) (($s2 >> 14) | $s3 << 7),
-            (int) ($s3 >> 1),
-            (int) ($s3 >> 9),
-            (int) (($s3 >> 17) | $s4 << 4),
-            (int) ($s4 >> 4),
-            (int) ($s4 >> 12),
-            (int) (($s4 >> 20) | $s5 << 1),
-            (int) ($s5 >> 7),
-            (int) (($s5 >> 15) | $s6 << 6),
-            (int) ($s6 >> 2),
-            (int) ($s6 >> 10),
-            (int) (($s6 >> 18) | $s7 << 3),
-            (int) ($s7 >> 5),
-            (int) ($s7 >> 13),
-            (int) ($s8 >> 0),
-            (int) ($s8 >> 8),
-            (int) (($s8 >> 16) | $s9 << 5),
-            (int) ($s9 >> 3),
-            (int) ($s9 >> 11),
-            (int) (($s9 >> 19) | $s10 << 2),
-            (int) ($s10 >> 6),
-            (int) (($s10 >> 14) | $s11 << 7),
-            (int) ($s11 >> 1),
-            (int) ($s11 >> 9),
-            (int) $s11 >> 17
+            (int)( $s0 >> 0 ),
+            (int)( $s0 >> 8 ),
+            (int)( ( $s0 >> 16 ) | $s1 << 5 ),
+            (int)( $s1 >> 3 ),
+            (int)( $s1 >> 11 ),
+            (int)( ( $s1 >> 19 ) | $s2 << 2 ),
+            (int)( $s2 >> 6 ),
+            (int)( ( $s2 >> 14 ) | $s3 << 7 ),
+            (int)( $s3 >> 1 ),
+            (int)( $s3 >> 9 ),
+            (int)( ( $s3 >> 17 ) | $s4 << 4 ),
+            (int)( $s4 >> 4 ),
+            (int)( $s4 >> 12 ),
+            (int)( ( $s4 >> 20 ) | $s5 << 1 ),
+            (int)( $s5 >> 7 ),
+            (int)( ( $s5 >> 15 ) | $s6 << 6 ),
+            (int)( $s6 >> 2 ),
+            (int)( $s6 >> 10 ),
+            (int)( ( $s6 >> 18 ) | $s7 << 3 ),
+            (int)( $s7 >> 5 ),
+            (int)( $s7 >> 13 ),
+            (int)( $s8 >> 0 ),
+            (int)( $s8 >> 8 ),
+            (int)( ( $s8 >> 16 ) | $s9 << 5 ),
+            (int)( $s9 >> 3 ),
+            (int)( $s9 >> 11 ),
+            (int)( ( $s9 >> 19 ) | $s10 << 2 ),
+            (int)( $s10 >> 6 ),
+            (int)( ( $s10 >> 14 ) | $s11 << 7 ),
+            (int)( $s11 >> 1 ),
+            (int)( $s11 >> 9 ),
+            (int)$s11 >> 17
         );
-        return self::intArrayToString($arr);
+        return self::intArrayToString( $arr );
     }
 
     /**
@@ -2827,7 +2827,7 @@ 
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_mul_l(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A)
+    public static function ge_mul_l( ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A )
     {
         $aslide = array(
             13, 0, 0, 0, 0, -1, 0, 0, 0, 0, -11, 0, 0, 0, 0, 0, 0, -5, 0, 0, 0,
@@ -2848,39 +2848,39 @@ 
         $Ai = array();
 
         # ge_p3_to_cached(&Ai[0], A);
-        $Ai[0] = self::ge_p3_to_cached($A);
+        $Ai[ 0 ] = self::ge_p3_to_cached( $A );
         # ge_p3_dbl(&t, A);
-        $t = self::ge_p3_dbl($A);
+        $t = self::ge_p3_dbl( $A );
         # ge_p1p1_to_p3(&A2, &t);
-        $A2 = self::ge_p1p1_to_p3($t);
+        $A2 = self::ge_p1p1_to_p3( $t );
 
-        for ($i = 1; $i < 8; ++$i) {
+        for ( $i = 1; $i < 8; ++$i ) {
             # ge_add(&t, &A2, &Ai[0]);
-            $t = self::ge_add($A2, $Ai[$i - 1]);
+            $t = self::ge_add( $A2, $Ai[ $i - 1 ] );
             # ge_p1p1_to_p3(&u, &t);
-            $u = self::ge_p1p1_to_p3($t);
+            $u = self::ge_p1p1_to_p3( $t );
             # ge_p3_to_cached(&Ai[i], &u);
-            $Ai[$i] = self::ge_p3_to_cached($u);
+            $Ai[ $i ] = self::ge_p3_to_cached( $u );
         }
 
         $r = self::ge_p3_0();
-        for ($i = 252; $i >= 0; --$i) {
-            $t = self::ge_p3_dbl($r);
-            if ($aslide[$i] > 0) {
+        for ( $i = 252; $i >= 0; --$i ) {
+            $t = self::ge_p3_dbl( $r );
+            if ( $aslide[ $i ] > 0 ) {
                 # ge_p1p1_to_p3(&u, &t);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 # ge_add(&t, &u, &Ai[aslide[i] / 2]);
-                $t = self::ge_add($u, $Ai[(int)($aslide[$i] / 2)]);
-            } elseif ($aslide[$i] < 0) {
+                $t = self::ge_add( $u, $Ai[ (int)( $aslide[ $i ] / 2 ) ] );
+            } elseif ( $aslide[ $i ] < 0 ) {
                 # ge_p1p1_to_p3(&u, &t);
-                $u = self::ge_p1p1_to_p3($t);
+                $u = self::ge_p1p1_to_p3( $t );
                 # ge_sub(&t, &u, &Ai[(-aslide[i]) / 2]);
-                $t = self::ge_sub($u, $Ai[(int)(-$aslide[$i] / 2)]);
+                $t = self::ge_sub( $u, $Ai[ (int)(-$aslide[ $i ] / 2) ] );
             }
         }
 
         # ge_p1p1_to_p3(r, &t);
-        return self::ge_p1p1_to_p3($t);
+        return self::ge_p1p1_to_p3( $t );
     }
 
     /**
@@ -2888,7 +2888,7 @@ 
      * @param string $b
      * @return string
      */
-    public static function sc25519_mul($a, $b)
+    public static function sc25519_mul( $a, $b )
     {
         //    int64_t a0  = 2097151 & load_3(a);
         //    int64_t a1  = 2097151 & (load_4(a + 2) >> 5);
@@ -2902,18 +2902,18 @@ 
         //    int64_t a9  = 2097151 & (load_4(a + 23) >> 5);
         //    int64_t a10 = 2097151 & (load_3(a + 26) >> 2);
         //    int64_t a11 = (load_4(a + 28) >> 7);
-        $a0  = 2097151 &  self::load_3(self::substr($a, 0, 3));
-        $a1  = 2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5);
-        $a2  = 2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2);
-        $a3  = 2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7);
-        $a4  = 2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4);
-        $a5  = 2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1);
-        $a6  = 2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6);
-        $a7  = 2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3);
-        $a8  = 2097151 &  self::load_3(self::substr($a, 21, 3));
-        $a9  = 2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5);
-        $a10 = 2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2);
-        $a11 = (self::load_4(self::substr($a, 28, 4)) >> 7);
+        $a0  = 2097151 &  self::load_3( self::substr( $a, 0, 3 ) );
+        $a1  = 2097151 & ( self::load_4( self::substr( $a, 2, 4 ) ) >> 5 );
+        $a2  = 2097151 & ( self::load_3( self::substr( $a, 5, 3 ) ) >> 2 );
+        $a3  = 2097151 & ( self::load_4( self::substr( $a, 7, 4 ) ) >> 7 );
+        $a4  = 2097151 & ( self::load_4( self::substr( $a, 10, 4 ) ) >> 4 );
+        $a5  = 2097151 & ( self::load_3( self::substr( $a, 13, 3 ) ) >> 1 );
+        $a6  = 2097151 & ( self::load_4( self::substr( $a, 15, 4 ) ) >> 6 );
+        $a7  = 2097151 & ( self::load_3( self::substr( $a, 18, 3 ) ) >> 3 );
+        $a8  = 2097151 &  self::load_3( self::substr( $a, 21, 3 ) );
+        $a9  = 2097151 & ( self::load_4( self::substr( $a, 23, 4 ) ) >> 5 );
+        $a10 = 2097151 & ( self::load_3( self::substr( $a, 26, 3 ) ) >> 2 );
+        $a11 = ( self::load_4( self::substr( $a, 28, 4 ) ) >> 7 );
 
         //    int64_t b0  = 2097151 & load_3(b);
         //    int64_t b1  = 2097151 & (load_4(b + 2) >> 5);
@@ -2927,18 +2927,18 @@ 
         //    int64_t b9  = 2097151 & (load_4(b + 23) >> 5);
         //    int64_t b10 = 2097151 & (load_3(b + 26) >> 2);
         //    int64_t b11 = (load_4(b + 28) >> 7);
-        $b0  = 2097151 &  self::load_3(self::substr($b, 0, 3));
-        $b1  = 2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5);
-        $b2  = 2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2);
-        $b3  = 2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7);
-        $b4  = 2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4);
-        $b5  = 2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1);
-        $b6  = 2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6);
-        $b7  = 2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3);
-        $b8  = 2097151 &  self::load_3(self::substr($b, 21, 3));
-        $b9  = 2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5);
-        $b10 = 2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2);
-        $b11 = (self::load_4(self::substr($b, 28, 4)) >> 7);
+        $b0  = 2097151 &  self::load_3( self::substr( $b, 0, 3 ) );
+        $b1  = 2097151 & ( self::load_4( self::substr( $b, 2, 4 ) ) >> 5 );
+        $b2  = 2097151 & ( self::load_3( self::substr( $b, 5, 3 ) ) >> 2 );
+        $b3  = 2097151 & ( self::load_4( self::substr( $b, 7, 4 ) ) >> 7 );
+        $b4  = 2097151 & ( self::load_4( self::substr( $b, 10, 4 ) ) >> 4 );
+        $b5  = 2097151 & ( self::load_3( self::substr( $b, 13, 3 ) ) >> 1 );
+        $b6  = 2097151 & ( self::load_4( self::substr( $b, 15, 4 ) ) >> 6 );
+        $b7  = 2097151 & ( self::load_3( self::substr( $b, 18, 3 ) ) >> 3 );
+        $b8  = 2097151 &  self::load_3( self::substr( $b, 21, 3 ) );
+        $b9  = 2097151 & ( self::load_4( self::substr( $b, 23, 4 ) ) >> 5 );
+        $b10 = 2097151 & ( self::load_3( self::substr( $b, 26, 3 ) ) >> 2 );
+        $b11 = ( self::load_4( self::substr( $b, 28, 4 ) ) >> 7 );
 
         //    s0 = a0 * b0;
         //    s1 = a0 * b1 + a1 * b0;
@@ -2974,192 +2974,192 @@ 
         //    s21 = a10 * b11 + a11 * b10;
         //    s22 = a11 * b11;
         //    s23 = 0;
-        $s0 = self::mul($a0, $b0, 22);
-        $s1 = self::mul($a0, $b1, 22) + self::mul($a1, $b0, 22);
-        $s2 = self::mul($a0, $b2, 22) + self::mul($a1, $b1, 22) + self::mul($a2, $b0, 22);
-        $s3 = self::mul($a0, $b3, 22) + self::mul($a1, $b2, 22) + self::mul($a2, $b1, 22) + self::mul($a3, $b0, 22);
-        $s4 = self::mul($a0, $b4, 22) + self::mul($a1, $b3, 22) + self::mul($a2, $b2, 22) + self::mul($a3, $b1, 22) +
-            self::mul($a4, $b0, 22);
-        $s5 = self::mul($a0, $b5, 22) + self::mul($a1, $b4, 22) + self::mul($a2, $b3, 22) + self::mul($a3, $b2, 22) +
-            self::mul($a4, $b1, 22) + self::mul($a5, $b0, 22);
-        $s6 = self::mul($a0, $b6, 22) + self::mul($a1, $b5, 22) + self::mul($a2, $b4, 22) + self::mul($a3, $b3, 22) +
-            self::mul($a4, $b2, 22) + self::mul($a5, $b1, 22) + self::mul($a6, $b0, 22);
-        $s7 = self::mul($a0, $b7, 22) + self::mul($a1, $b6, 22) + self::mul($a2, $b5, 22) + self::mul($a3, $b4, 22) +
-            self::mul($a4, $b3, 22) + self::mul($a5, $b2, 22) + self::mul($a6, $b1, 22) + self::mul($a7, $b0, 22);
-        $s8 = self::mul($a0, $b8, 22) + self::mul($a1, $b7, 22) + self::mul($a2, $b6, 22) + self::mul($a3, $b5, 22) +
-            self::mul($a4, $b4, 22) + self::mul($a5, $b3, 22) + self::mul($a6, $b2, 22) + self::mul($a7, $b1, 22) +
-            self::mul($a8, $b0, 22);
-        $s9 = self::mul($a0, $b9, 22) + self::mul($a1, $b8, 22) + self::mul($a2, $b7, 22) + self::mul($a3, $b6, 22) +
-            self::mul($a4, $b5, 22) + self::mul($a5, $b4, 22) + self::mul($a6, $b3, 22) + self::mul($a7, $b2, 22) +
-            self::mul($a8, $b1, 22) + self::mul($a9, $b0, 22);
-        $s10 = self::mul($a0, $b10, 22) + self::mul($a1, $b9, 22) + self::mul($a2, $b8, 22) + self::mul($a3, $b7, 22) +
-            self::mul($a4, $b6, 22) + self::mul($a5, $b5, 22) + self::mul($a6, $b4, 22) + self::mul($a7, $b3, 22) +
-            self::mul($a8, $b2, 22) + self::mul($a9, $b1, 22) + self::mul($a10, $b0, 22);
-        $s11 = self::mul($a0, $b11, 22) + self::mul($a1, $b10, 22) + self::mul($a2, $b9, 22) + self::mul($a3, $b8, 22) +
-            self::mul($a4, $b7, 22) + self::mul($a5, $b6, 22) + self::mul($a6, $b5, 22) + self::mul($a7, $b4, 22) +
-            self::mul($a8, $b3, 22) + self::mul($a9, $b2, 22) + self::mul($a10, $b1, 22) + self::mul($a11, $b0, 22);
-        $s12 = self::mul($a1, $b11, 22) + self::mul($a2, $b10, 22) + self::mul($a3, $b9, 22) + self::mul($a4, $b8, 22) +
-            self::mul($a5, $b7, 22) + self::mul($a6, $b6, 22) + self::mul($a7, $b5, 22) + self::mul($a8, $b4, 22) +
-            self::mul($a9, $b3, 22) + self::mul($a10, $b2, 22) + self::mul($a11, $b1, 22);
-        $s13 = self::mul($a2, $b11, 22) + self::mul($a3, $b10, 22) + self::mul($a4, $b9, 22) + self::mul($a5, $b8, 22) +
-            self::mul($a6, $b7, 22) + self::mul($a7, $b6, 22) + self::mul($a8, $b5, 22) + self::mul($a9, $b4, 22) +
-            self::mul($a10, $b3, 22) + self::mul($a11, $b2, 22);
-        $s14 = self::mul($a3, $b11, 22) + self::mul($a4, $b10, 22) + self::mul($a5, $b9, 22) + self::mul($a6, $b8, 22) +
-            self::mul($a7, $b7, 22) + self::mul($a8, $b6, 22) + self::mul($a9, $b5, 22) + self::mul($a10, $b4, 22) +
-            self::mul($a11, $b3, 22);
-        $s15 = self::mul($a4, $b11, 22) + self::mul($a5, $b10, 22) + self::mul($a6, $b9, 22) + self::mul($a7, $b8, 22) +
-            self::mul($a8, $b7, 22) + self::mul($a9, $b6, 22) + self::mul($a10, $b5, 22) + self::mul($a11, $b4, 22);
+        $s0 = self::mul( $a0, $b0, 22 );
+        $s1 = self::mul( $a0, $b1, 22 ) + self::mul( $a1, $b0, 22 );
+        $s2 = self::mul( $a0, $b2, 22 ) + self::mul( $a1, $b1, 22 ) + self::mul( $a2, $b0, 22 );
+        $s3 = self::mul( $a0, $b3, 22 ) + self::mul( $a1, $b2, 22 ) + self::mul( $a2, $b1, 22 ) + self::mul( $a3, $b0, 22 );
+        $s4 = self::mul( $a0, $b4, 22 ) + self::mul( $a1, $b3, 22 ) + self::mul( $a2, $b2, 22 ) + self::mul( $a3, $b1, 22 ) +
+            self::mul( $a4, $b0, 22 );
+        $s5 = self::mul( $a0, $b5, 22 ) + self::mul( $a1, $b4, 22 ) + self::mul( $a2, $b3, 22 ) + self::mul( $a3, $b2, 22 ) +
+            self::mul( $a4, $b1, 22 ) + self::mul( $a5, $b0, 22 );
+        $s6 = self::mul( $a0, $b6, 22 ) + self::mul( $a1, $b5, 22 ) + self::mul( $a2, $b4, 22 ) + self::mul( $a3, $b3, 22 ) +
+            self::mul( $a4, $b2, 22 ) + self::mul( $a5, $b1, 22 ) + self::mul( $a6, $b0, 22 );
+        $s7 = self::mul( $a0, $b7, 22 ) + self::mul( $a1, $b6, 22 ) + self::mul( $a2, $b5, 22 ) + self::mul( $a3, $b4, 22 ) +
+            self::mul( $a4, $b3, 22 ) + self::mul( $a5, $b2, 22 ) + self::mul( $a6, $b1, 22 ) + self::mul( $a7, $b0, 22 );
+        $s8 = self::mul( $a0, $b8, 22 ) + self::mul( $a1, $b7, 22 ) + self::mul( $a2, $b6, 22 ) + self::mul( $a3, $b5, 22 ) +
+            self::mul( $a4, $b4, 22 ) + self::mul( $a5, $b3, 22 ) + self::mul( $a6, $b2, 22 ) + self::mul( $a7, $b1, 22 ) +
+            self::mul( $a8, $b0, 22 );
+        $s9 = self::mul( $a0, $b9, 22 ) + self::mul( $a1, $b8, 22 ) + self::mul( $a2, $b7, 22 ) + self::mul( $a3, $b6, 22 ) +
+            self::mul( $a4, $b5, 22 ) + self::mul( $a5, $b4, 22 ) + self::mul( $a6, $b3, 22 ) + self::mul( $a7, $b2, 22 ) +
+            self::mul( $a8, $b1, 22 ) + self::mul( $a9, $b0, 22 );
+        $s10 = self::mul( $a0, $b10, 22 ) + self::mul( $a1, $b9, 22 ) + self::mul( $a2, $b8, 22 ) + self::mul( $a3, $b7, 22 ) +
+            self::mul( $a4, $b6, 22 ) + self::mul( $a5, $b5, 22 ) + self::mul( $a6, $b4, 22 ) + self::mul( $a7, $b3, 22 ) +
+            self::mul( $a8, $b2, 22 ) + self::mul( $a9, $b1, 22 ) + self::mul( $a10, $b0, 22 );
+        $s11 = self::mul( $a0, $b11, 22 ) + self::mul( $a1, $b10, 22 ) + self::mul( $a2, $b9, 22 ) + self::mul( $a3, $b8, 22 ) +
+            self::mul( $a4, $b7, 22 ) + self::mul( $a5, $b6, 22 ) + self::mul( $a6, $b5, 22 ) + self::mul( $a7, $b4, 22 ) +
+            self::mul( $a8, $b3, 22 ) + self::mul( $a9, $b2, 22 ) + self::mul( $a10, $b1, 22 ) + self::mul( $a11, $b0, 22 );
+        $s12 = self::mul( $a1, $b11, 22 ) + self::mul( $a2, $b10, 22 ) + self::mul( $a3, $b9, 22 ) + self::mul( $a4, $b8, 22 ) +
+            self::mul( $a5, $b7, 22 ) + self::mul( $a6, $b6, 22 ) + self::mul( $a7, $b5, 22 ) + self::mul( $a8, $b4, 22 ) +
+            self::mul( $a9, $b3, 22 ) + self::mul( $a10, $b2, 22 ) + self::mul( $a11, $b1, 22 );
+        $s13 = self::mul( $a2, $b11, 22 ) + self::mul( $a3, $b10, 22 ) + self::mul( $a4, $b9, 22 ) + self::mul( $a5, $b8, 22 ) +
+            self::mul( $a6, $b7, 22 ) + self::mul( $a7, $b6, 22 ) + self::mul( $a8, $b5, 22 ) + self::mul( $a9, $b4, 22 ) +
+            self::mul( $a10, $b3, 22 ) + self::mul( $a11, $b2, 22 );
+        $s14 = self::mul( $a3, $b11, 22 ) + self::mul( $a4, $b10, 22 ) + self::mul( $a5, $b9, 22 ) + self::mul( $a6, $b8, 22 ) +
+            self::mul( $a7, $b7, 22 ) + self::mul( $a8, $b6, 22 ) + self::mul( $a9, $b5, 22 ) + self::mul( $a10, $b4, 22 ) +
+            self::mul( $a11, $b3, 22 );
+        $s15 = self::mul( $a4, $b11, 22 ) + self::mul( $a5, $b10, 22 ) + self::mul( $a6, $b9, 22 ) + self::mul( $a7, $b8, 22 ) +
+            self::mul( $a8, $b7, 22 ) + self::mul( $a9, $b6, 22 ) + self::mul( $a10, $b5, 22 ) + self::mul( $a11, $b4, 22 );
         $s16 =
-            self::mul($a5, $b11, 22) + self::mul($a6, $b10, 22) + self::mul($a7, $b9, 22) + self::mul($a8, $b8, 22) +
-            self::mul($a9, $b7, 22) + self::mul($a10, $b6, 22) + self::mul($a11, $b5, 22);
-        $s17 = self::mul($a6, $b11, 22) + self::mul($a7, $b10, 22) + self::mul($a8, $b9, 22) + self::mul($a9, $b8, 22) +
-            self::mul($a10, $b7, 22) + self::mul($a11, $b6, 22);
-        $s18 = self::mul($a7, $b11, 22) + self::mul($a8, $b10, 22) + self::mul($a9, $b9, 22) + self::mul($a10, $b8, 22)
-            + self::mul($a11, $b7, 22);
-        $s19 = self::mul($a8, $b11, 22) + self::mul($a9, $b10, 22) + self::mul($a10, $b9, 22) +
-            self::mul($a11, $b8, 22);
-        $s20 = self::mul($a9, $b11, 22) + self::mul($a10, $b10, 22) + self::mul($a11, $b9, 22);
-        $s21 = self::mul($a10, $b11, 22) + self::mul($a11, $b10, 22);
-        $s22 = self::mul($a11, $b11, 22);
+            self::mul( $a5, $b11, 22 ) + self::mul( $a6, $b10, 22 ) + self::mul( $a7, $b9, 22 ) + self::mul( $a8, $b8, 22 ) +
+            self::mul( $a9, $b7, 22 ) + self::mul( $a10, $b6, 22 ) + self::mul( $a11, $b5, 22 );
+        $s17 = self::mul( $a6, $b11, 22 ) + self::mul( $a7, $b10, 22 ) + self::mul( $a8, $b9, 22 ) + self::mul( $a9, $b8, 22 ) +
+            self::mul( $a10, $b7, 22 ) + self::mul( $a11, $b6, 22 );
+        $s18 = self::mul( $a7, $b11, 22 ) + self::mul( $a8, $b10, 22 ) + self::mul( $a9, $b9, 22 ) + self::mul( $a10, $b8, 22 )
+            + self::mul( $a11, $b7, 22 );
+        $s19 = self::mul( $a8, $b11, 22 ) + self::mul( $a9, $b10, 22 ) + self::mul( $a10, $b9, 22 ) +
+            self::mul( $a11, $b8, 22 );
+        $s20 = self::mul( $a9, $b11, 22 ) + self::mul( $a10, $b10, 22 ) + self::mul( $a11, $b9, 22 );
+        $s21 = self::mul( $a10, $b11, 22 ) + self::mul( $a11, $b10, 22 );
+        $s22 = self::mul( $a11, $b11, 22 );
         $s23 = 0;
 
         //    carry0 = (s0 + (int64_t) (1L << 20)) >> 21;
         //    s1 += carry0;
         //    s0 -= carry0 * ((uint64_t) 1L << 21);
-        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $carry0 = ( $s0 + ( 1 << 20 ) ) >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
         //    carry2 = (s2 + (int64_t) (1L << 20)) >> 21;
         //    s3 += carry2;
         //    s2 -= carry2 * ((uint64_t) 1L << 21);
-        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $carry2 = ( $s2 + ( 1 << 20 ) ) >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
         //    carry4 = (s4 + (int64_t) (1L << 20)) >> 21;
         //    s5 += carry4;
         //    s4 -= carry4 * ((uint64_t) 1L << 21);
-        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $carry4 = ( $s4 + ( 1 << 20 ) ) >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
         //    carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
         //    s7 += carry6;
         //    s6 -= carry6 * ((uint64_t) 1L << 21);
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
         //    carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
         //    s9 += carry8;
         //    s8 -= carry8 * ((uint64_t) 1L << 21);
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
         //    carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
         //    s11 += carry10;
         //    s10 -= carry10 * ((uint64_t) 1L << 21);
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
         //    carry12 = (s12 + (int64_t) (1L << 20)) >> 21;
         //    s13 += carry12;
         //    s12 -= carry12 * ((uint64_t) 1L << 21);
-        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $carry12 = ( $s12 + ( 1 << 20 ) ) >> 21;
         $s13 += $carry12;
         $s12 -= $carry12 << 21;
         //    carry14 = (s14 + (int64_t) (1L << 20)) >> 21;
         //    s15 += carry14;
         //    s14 -= carry14 * ((uint64_t) 1L << 21);
-        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $carry14 = ( $s14 + ( 1 << 20 ) ) >> 21;
         $s15 += $carry14;
         $s14 -= $carry14 << 21;
         //    carry16 = (s16 + (int64_t) (1L << 20)) >> 21;
         //    s17 += carry16;
         //    s16 -= carry16 * ((uint64_t) 1L << 21);
-        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $carry16 = ( $s16 + ( 1 << 20 ) ) >> 21;
         $s17 += $carry16;
         $s16 -= $carry16 << 21;
         //    carry18 = (s18 + (int64_t) (1L << 20)) >> 21;
         //    s19 += carry18;
         //    s18 -= carry18 * ((uint64_t) 1L << 21);
-        $carry18 = ($s18 + (1 << 20)) >> 21;
+        $carry18 = ( $s18 + ( 1 << 20 ) ) >> 21;
         $s19 += $carry18;
         $s18 -= $carry18 << 21;
         //    carry20 = (s20 + (int64_t) (1L << 20)) >> 21;
         //    s21 += carry20;
         //    s20 -= carry20 * ((uint64_t) 1L << 21);
-        $carry20 = ($s20 + (1 << 20)) >> 21;
+        $carry20 = ( $s20 + ( 1 << 20 ) ) >> 21;
         $s21 += $carry20;
         $s20 -= $carry20 << 21;
         //    carry22 = (s22 + (int64_t) (1L << 20)) >> 21;
         //    s23 += carry22;
         //    s22 -= carry22 * ((uint64_t) 1L << 21);
-        $carry22 = ($s22 + (1 << 20)) >> 21;
+        $carry22 = ( $s22 + ( 1 << 20 ) ) >> 21;
         $s23 += $carry22;
         $s22 -= $carry22 << 21;
 
         //    carry1 = (s1 + (int64_t) (1L << 20)) >> 21;
         //    s2 += carry1;
         //    s1 -= carry1 * ((uint64_t) 1L << 21);
-        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $carry1 = ( $s1 + ( 1 << 20 ) ) >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
         //    carry3 = (s3 + (int64_t) (1L << 20)) >> 21;
         //    s4 += carry3;
         //    s3 -= carry3 * ((uint64_t) 1L << 21);
-        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $carry3 = ( $s3 + ( 1 << 20 ) ) >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
         //    carry5 = (s5 + (int64_t) (1L << 20)) >> 21;
         //    s6 += carry5;
         //    s5 -= carry5 * ((uint64_t) 1L << 21);
-        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $carry5 = ( $s5 + ( 1 << 20 ) ) >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
         //    carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
         //    s8 += carry7;
         //    s7 -= carry7 * ((uint64_t) 1L << 21);
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
         //    carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
         //    s10 += carry9;
         //    s9 -= carry9 * ((uint64_t) 1L << 21);
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
         //    carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
         //    s12 += carry11;
         //    s11 -= carry11 * ((uint64_t) 1L << 21);
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
         //    carry13 = (s13 + (int64_t) (1L << 20)) >> 21;
         //    s14 += carry13;
         //    s13 -= carry13 * ((uint64_t) 1L << 21);
-        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $carry13 = ( $s13 + ( 1 << 20 ) ) >> 21;
         $s14 += $carry13;
         $s13 -= $carry13 << 21;
         //    carry15 = (s15 + (int64_t) (1L << 20)) >> 21;
         //    s16 += carry15;
         //    s15 -= carry15 * ((uint64_t) 1L << 21);
-        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $carry15 = ( $s15 + ( 1 << 20 ) ) >> 21;
         $s16 += $carry15;
         $s15 -= $carry15 << 21;
         //    carry17 = (s17 + (int64_t) (1L << 20)) >> 21;
         //    s18 += carry17;
         //    s17 -= carry17 * ((uint64_t) 1L << 21);
-        $carry17 = ($s17 + (1 << 20)) >> 21;
+        $carry17 = ( $s17 + ( 1 << 20 ) ) >> 21;
         $s18 += $carry17;
         $s17 -= $carry17 << 21;
         //    carry19 = (s19 + (int64_t) (1L << 20)) >> 21;
         //    s20 += carry19;
         //    s19 -= carry19 * ((uint64_t) 1L << 21);
-        $carry19 = ($s19 + (1 << 20)) >> 21;
+        $carry19 = ( $s19 + ( 1 << 20 ) ) >> 21;
         $s20 += $carry19;
         $s19 -= $carry19 << 21;
         //    carry21 = (s21 + (int64_t) (1L << 20)) >> 21;
         //    s22 += carry21;
         //    s21 -= carry21 * ((uint64_t) 1L << 21);
-        $carry21 = ($s21 + (1 << 20)) >> 21;
+        $carry21 = ( $s21 + ( 1 << 20 ) ) >> 21;
         $s22 += $carry21;
         $s21 -= $carry21 << 21;
 
@@ -3169,12 +3169,12 @@ 
         //    s14 -= s23 * 997805;
         //    s15 += s23 * 136657;
         //    s16 -= s23 * 683901;
-        $s11 += self::mul($s23, 666643, 20);
-        $s12 += self::mul($s23, 470296, 19);
-        $s13 += self::mul($s23, 654183, 20);
-        $s14 -= self::mul($s23, 997805, 20);
-        $s15 += self::mul($s23, 136657, 18);
-        $s16 -= self::mul($s23, 683901, 20);
+        $s11 += self::mul( $s23, 666643, 20 );
+        $s12 += self::mul( $s23, 470296, 19 );
+        $s13 += self::mul( $s23, 654183, 20 );
+        $s14 -= self::mul( $s23, 997805, 20 );
+        $s15 += self::mul( $s23, 136657, 18 );
+        $s16 -= self::mul( $s23, 683901, 20 );
 
         //    s10 += s22 * 666643;
         //    s11 += s22 * 470296;
@@ -3182,12 +3182,12 @@ 
         //    s13 -= s22 * 997805;
         //    s14 += s22 * 136657;
         //    s15 -= s22 * 683901;
-        $s10 += self::mul($s22, 666643, 20);
-        $s11 += self::mul($s22, 470296, 19);
-        $s12 += self::mul($s22, 654183, 20);
-        $s13 -= self::mul($s22, 997805, 20);
-        $s14 += self::mul($s22, 136657, 18);
-        $s15 -= self::mul($s22, 683901, 20);
+        $s10 += self::mul( $s22, 666643, 20 );
+        $s11 += self::mul( $s22, 470296, 19 );
+        $s12 += self::mul( $s22, 654183, 20 );
+        $s13 -= self::mul( $s22, 997805, 20 );
+        $s14 += self::mul( $s22, 136657, 18 );
+        $s15 -= self::mul( $s22, 683901, 20 );
 
         //    s9 += s21 * 666643;
         //    s10 += s21 * 470296;
@@ -3195,12 +3195,12 @@ 
         //    s12 -= s21 * 997805;
         //    s13 += s21 * 136657;
         //    s14 -= s21 * 683901;
-        $s9 += self::mul($s21, 666643, 20);
-        $s10 += self::mul($s21, 470296, 19);
-        $s11 += self::mul($s21, 654183, 20);
-        $s12 -= self::mul($s21, 997805, 20);
-        $s13 += self::mul($s21, 136657, 18);
-        $s14 -= self::mul($s21, 683901, 20);
+        $s9 += self::mul( $s21, 666643, 20 );
+        $s10 += self::mul( $s21, 470296, 19 );
+        $s11 += self::mul( $s21, 654183, 20 );
+        $s12 -= self::mul( $s21, 997805, 20 );
+        $s13 += self::mul( $s21, 136657, 18 );
+        $s14 -= self::mul( $s21, 683901, 20 );
 
         //    s8 += s20 * 666643;
         //    s9 += s20 * 470296;
@@ -3208,12 +3208,12 @@ 
         //    s11 -= s20 * 997805;
         //    s12 += s20 * 136657;
         //    s13 -= s20 * 683901;
-        $s8 += self::mul($s20, 666643, 20);
-        $s9 += self::mul($s20, 470296, 19);
-        $s10 += self::mul($s20, 654183, 20);
-        $s11 -= self::mul($s20, 997805, 20);
-        $s12 += self::mul($s20, 136657, 18);
-        $s13 -= self::mul($s20, 683901, 20);
+        $s8 += self::mul( $s20, 666643, 20 );
+        $s9 += self::mul( $s20, 470296, 19 );
+        $s10 += self::mul( $s20, 654183, 20 );
+        $s11 -= self::mul( $s20, 997805, 20 );
+        $s12 += self::mul( $s20, 136657, 18 );
+        $s13 -= self::mul( $s20, 683901, 20 );
 
         //    s7 += s19 * 666643;
         //    s8 += s19 * 470296;
@@ -3221,12 +3221,12 @@ 
         //    s10 -= s19 * 997805;
         //    s11 += s19 * 136657;
         //    s12 -= s19 * 683901;
-        $s7 += self::mul($s19, 666643, 20);
-        $s8 += self::mul($s19, 470296, 19);
-        $s9 += self::mul($s19, 654183, 20);
-        $s10 -= self::mul($s19, 997805, 20);
-        $s11 += self::mul($s19, 136657, 18);
-        $s12 -= self::mul($s19, 683901, 20);
+        $s7 += self::mul( $s19, 666643, 20 );
+        $s8 += self::mul( $s19, 470296, 19 );
+        $s9 += self::mul( $s19, 654183, 20 );
+        $s10 -= self::mul( $s19, 997805, 20 );
+        $s11 += self::mul( $s19, 136657, 18 );
+        $s12 -= self::mul( $s19, 683901, 20 );
 
         //    s6 += s18 * 666643;
         //    s7 += s18 * 470296;
@@ -3234,78 +3234,78 @@ 
         //    s9 -= s18 * 997805;
         //    s10 += s18 * 136657;
         //    s11 -= s18 * 683901;
-        $s6 += self::mul($s18, 666643, 20);
-        $s7 += self::mul($s18, 470296, 19);
-        $s8 += self::mul($s18, 654183, 20);
-        $s9 -= self::mul($s18, 997805, 20);
-        $s10 += self::mul($s18, 136657, 18);
-        $s11 -= self::mul($s18, 683901, 20);
+        $s6 += self::mul( $s18, 666643, 20 );
+        $s7 += self::mul( $s18, 470296, 19 );
+        $s8 += self::mul( $s18, 654183, 20 );
+        $s9 -= self::mul( $s18, 997805, 20 );
+        $s10 += self::mul( $s18, 136657, 18 );
+        $s11 -= self::mul( $s18, 683901, 20 );
 
         //    carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
         //    s7 += carry6;
         //    s6 -= carry6 * ((uint64_t) 1L << 21);
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
         //    carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
         //    s9 += carry8;
         //    s8 -= carry8 * ((uint64_t) 1L << 21);
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
         //    carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
         //    s11 += carry10;
         //    s10 -= carry10 * ((uint64_t) 1L << 21);
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
         //    carry12 = (s12 + (int64_t) (1L << 20)) >> 21;
         //    s13 += carry12;
         //    s12 -= carry12 * ((uint64_t) 1L << 21);
-        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $carry12 = ( $s12 + ( 1 << 20 ) ) >> 21;
         $s13 += $carry12;
         $s12 -= $carry12 << 21;
         //    carry14 = (s14 + (int64_t) (1L << 20)) >> 21;
         //    s15 += carry14;
         //    s14 -= carry14 * ((uint64_t) 1L << 21);
-        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $carry14 = ( $s14 + ( 1 << 20 ) ) >> 21;
         $s15 += $carry14;
         $s14 -= $carry14 << 21;
         //    carry16 = (s16 + (int64_t) (1L << 20)) >> 21;
         //    s17 += carry16;
         //    s16 -= carry16 * ((uint64_t) 1L << 21);
-        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $carry16 = ( $s16 + ( 1 << 20 ) ) >> 21;
         $s17 += $carry16;
         $s16 -= $carry16 << 21;
 
         //    carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
         //    s8 += carry7;
         //    s7 -= carry7 * ((uint64_t) 1L << 21);
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
         //    carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
         //    s10 += carry9;
         //    s9 -= carry9 * ((uint64_t) 1L << 21);
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
         //    carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
         //    s12 += carry11;
         //    s11 -= carry11 * ((uint64_t) 1L << 21);
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
         //    carry13 = (s13 + (int64_t) (1L << 20)) >> 21;
         //    s14 += carry13;
         //    s13 -= carry13 * ((uint64_t) 1L << 21);
-        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $carry13 = ( $s13 + ( 1 << 20 ) ) >> 21;
         $s14 += $carry13;
         $s13 -= $carry13 << 21;
         //    carry15 = (s15 + (int64_t) (1L << 20)) >> 21;
         //    s16 += carry15;
         //    s15 -= carry15 * ((uint64_t) 1L << 21);
-        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $carry15 = ( $s15 + ( 1 << 20 ) ) >> 21;
         $s16 += $carry15;
         $s15 -= $carry15 << 21;
 
@@ -3315,12 +3315,12 @@ 
         //    s8 -= s17 * 997805;
         //    s9 += s17 * 136657;
         //    s10 -= s17 * 683901;
-        $s5 += self::mul($s17, 666643, 20);
-        $s6 += self::mul($s17, 470296, 19);
-        $s7 += self::mul($s17, 654183, 20);
-        $s8 -= self::mul($s17, 997805, 20);
-        $s9 += self::mul($s17, 136657, 18);
-        $s10 -= self::mul($s17, 683901, 20);
+        $s5 += self::mul( $s17, 666643, 20 );
+        $s6 += self::mul( $s17, 470296, 19 );
+        $s7 += self::mul( $s17, 654183, 20 );
+        $s8 -= self::mul( $s17, 997805, 20 );
+        $s9 += self::mul( $s17, 136657, 18 );
+        $s10 -= self::mul( $s17, 683901, 20 );
 
         //    s4 += s16 * 666643;
         //    s5 += s16 * 470296;
@@ -3328,12 +3328,12 @@ 
         //    s7 -= s16 * 997805;
         //    s8 += s16 * 136657;
         //    s9 -= s16 * 683901;
-        $s4 += self::mul($s16, 666643, 20);
-        $s5 += self::mul($s16, 470296, 19);
-        $s6 += self::mul($s16, 654183, 20);
-        $s7 -= self::mul($s16, 997805, 20);
-        $s8 += self::mul($s16, 136657, 18);
-        $s9 -= self::mul($s16, 683901, 20);
+        $s4 += self::mul( $s16, 666643, 20 );
+        $s5 += self::mul( $s16, 470296, 19 );
+        $s6 += self::mul( $s16, 654183, 20 );
+        $s7 -= self::mul( $s16, 997805, 20 );
+        $s8 += self::mul( $s16, 136657, 18 );
+        $s9 -= self::mul( $s16, 683901, 20 );
 
         //    s3 += s15 * 666643;
         //    s4 += s15 * 470296;
@@ -3341,12 +3341,12 @@ 
         //    s6 -= s15 * 997805;
         //    s7 += s15 * 136657;
         //    s8 -= s15 * 683901;
-        $s3 += self::mul($s15, 666643, 20);
-        $s4 += self::mul($s15, 470296, 19);
-        $s5 += self::mul($s15, 654183, 20);
-        $s6 -= self::mul($s15, 997805, 20);
-        $s7 += self::mul($s15, 136657, 18);
-        $s8 -= self::mul($s15, 683901, 20);
+        $s3 += self::mul( $s15, 666643, 20 );
+        $s4 += self::mul( $s15, 470296, 19 );
+        $s5 += self::mul( $s15, 654183, 20 );
+        $s6 -= self::mul( $s15, 997805, 20 );
+        $s7 += self::mul( $s15, 136657, 18 );
+        $s8 -= self::mul( $s15, 683901, 20 );
 
         //    s2 += s14 * 666643;
         //    s3 += s14 * 470296;
@@ -3354,12 +3354,12 @@ 
         //    s5 -= s14 * 997805;
         //    s6 += s14 * 136657;
         //    s7 -= s14 * 683901;
-        $s2 += self::mul($s14, 666643, 20);
-        $s3 += self::mul($s14, 470296, 19);
-        $s4 += self::mul($s14, 654183, 20);
-        $s5 -= self::mul($s14, 997805, 20);
-        $s6 += self::mul($s14, 136657, 18);
-        $s7 -= self::mul($s14, 683901, 20);
+        $s2 += self::mul( $s14, 666643, 20 );
+        $s3 += self::mul( $s14, 470296, 19 );
+        $s4 += self::mul( $s14, 654183, 20 );
+        $s5 -= self::mul( $s14, 997805, 20 );
+        $s6 += self::mul( $s14, 136657, 18 );
+        $s7 -= self::mul( $s14, 683901, 20 );
 
         //    s1 += s13 * 666643;
         //    s2 += s13 * 470296;
@@ -3367,12 +3367,12 @@ 
         //    s4 -= s13 * 997805;
         //    s5 += s13 * 136657;
         //    s6 -= s13 * 683901;
-        $s1 += self::mul($s13, 666643, 20);
-        $s2 += self::mul($s13, 470296, 19);
-        $s3 += self::mul($s13, 654183, 20);
-        $s4 -= self::mul($s13, 997805, 20);
-        $s5 += self::mul($s13, 136657, 18);
-        $s6 -= self::mul($s13, 683901, 20);
+        $s1 += self::mul( $s13, 666643, 20 );
+        $s2 += self::mul( $s13, 470296, 19 );
+        $s3 += self::mul( $s13, 654183, 20 );
+        $s4 -= self::mul( $s13, 997805, 20 );
+        $s5 += self::mul( $s13, 136657, 18 );
+        $s6 -= self::mul( $s13, 683901, 20 );
 
         //    s0 += s12 * 666643;
         //    s1 += s12 * 470296;
@@ -3381,85 +3381,85 @@ 
         //    s4 += s12 * 136657;
         //    s5 -= s12 * 683901;
         //    s12 = 0;
-        $s0 += self::mul($s12, 666643, 20);
-        $s1 += self::mul($s12, 470296, 19);
-        $s2 += self::mul($s12, 654183, 20);
-        $s3 -= self::mul($s12, 997805, 20);
-        $s4 += self::mul($s12, 136657, 18);
-        $s5 -= self::mul($s12, 683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
         $s12 = 0;
 
         //    carry0 = (s0 + (int64_t) (1L << 20)) >> 21;
         //    s1 += carry0;
         //    s0 -= carry0 * ((uint64_t) 1L << 21);
-        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $carry0 = ( $s0 + ( 1 << 20 ) ) >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
         //    carry2 = (s2 + (int64_t) (1L << 20)) >> 21;
         //    s3 += carry2;
         //    s2 -= carry2 * ((uint64_t) 1L << 21);
-        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $carry2 = ( $s2 + ( 1 << 20 ) ) >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
         //    carry4 = (s4 + (int64_t) (1L << 20)) >> 21;
         //    s5 += carry4;
         //    s4 -= carry4 * ((uint64_t) 1L << 21);
-        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $carry4 = ( $s4 + ( 1 << 20 ) ) >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
         //    carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
         //    s7 += carry6;
         //    s6 -= carry6 * ((uint64_t) 1L << 21);
-        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $carry6 = ( $s6 + ( 1 << 20 ) ) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
         //    carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
         //    s9 += carry8;
         //    s8 -= carry8 * ((uint64_t) 1L << 21);
-        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $carry8 = ( $s8 + ( 1 << 20 ) ) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
         //    carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
         //    s11 += carry10;
         //    s10 -= carry10 * ((uint64_t) 1L << 21);
-        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $carry10 = ( $s10 + ( 1 << 20 ) ) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
 
         //    carry1 = (s1 + (int64_t) (1L << 20)) >> 21;
         //    s2 += carry1;
         //    s1 -= carry1 * ((uint64_t) 1L << 21);
-        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $carry1 = ( $s1 + ( 1 << 20 ) ) >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
         //    carry3 = (s3 + (int64_t) (1L << 20)) >> 21;
         //    s4 += carry3;
         //    s3 -= carry3 * ((uint64_t) 1L << 21);
-        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $carry3 = ( $s3 + ( 1 << 20 ) ) >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
         //    carry5 = (s5 + (int64_t) (1L << 20)) >> 21;
         //    s6 += carry5;
         //    s5 -= carry5 * ((uint64_t) 1L << 21);
-        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $carry5 = ( $s5 + ( 1 << 20 ) ) >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
         //    carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
         //    s8 += carry7;
         //    s7 -= carry7 * ((uint64_t) 1L << 21);
-        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $carry7 = ( $s7 + ( 1 << 20 ) ) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
         //    carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
         //    s10 += carry9;
         //    s9 -= carry9 * ((uint64_t) 1L << 21);
-        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $carry9 = ( $s9 + ( 1 << 20 ) ) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
         //    carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
         //    s12 += carry11;
         //    s11 -= carry11 * ((uint64_t) 1L << 21);
-        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $carry11 = ( $s11 + ( 1 << 20 ) ) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
@@ -3470,12 +3470,12 @@ 
         //    s4 += s12 * 136657;
         //    s5 -= s12 * 683901;
         //    s12 = 0;
-        $s0 += self::mul($s12, 666643, 20);
-        $s1 += self::mul($s12, 470296, 19);
-        $s2 += self::mul($s12, 654183, 20);
-        $s3 -= self::mul($s12, 997805, 20);
-        $s4 += self::mul($s12, 136657, 18);
-        $s5 -= self::mul($s12, 683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
         $s12 = 0;
 
         //    carry0 = s0 >> 21;
@@ -3557,12 +3557,12 @@ 
         //    s3 -= s12 * 997805;
         //    s4 += s12 * 136657;
         //    s5 -= s12 * 683901;
-        $s0 += self::mul($s12, 666643, 20);
-        $s1 += self::mul($s12, 470296, 19);
-        $s2 += self::mul($s12, 654183, 20);
-        $s3 -= self::mul($s12, 997805, 20);
-        $s4 += self::mul($s12, 136657, 18);
-        $s5 -= self::mul($s12, 683901, 20);
+        $s0 += self::mul( $s12, 666643, 20 );
+        $s1 += self::mul( $s12, 470296, 19 );
+        $s2 += self::mul( $s12, 654183, 20 );
+        $s3 -= self::mul( $s12, 997805, 20 );
+        $s4 += self::mul( $s12, 136657, 18 );
+        $s5 -= self::mul( $s12, 683901, 20 );
 
         //    carry0 = s0 >> 21;
         //    s1 += carry0;
@@ -3631,81 +3631,81 @@ 
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
 
-        $s = array_fill(0, 32, 0);
+        $s = array_fill( 0, 32, 0 );
         // s[0]  = s0 >> 0;
-        $s[0]  = $s0 >> 0;
+        $s[ 0 ]  = $s0 >> 0;
         // s[1]  = s0 >> 8;
-        $s[1]  = $s0 >> 8;
+        $s[ 1 ]  = $s0 >> 8;
         // s[2]  = (s0 >> 16) | (s1 * ((uint64_t) 1 << 5));
-        $s[2]  = ($s0 >> 16) | ($s1 << 5);
+        $s[ 2 ]  = ( $s0 >> 16 ) | ( $s1 << 5 );
         // s[3]  = s1 >> 3;
-        $s[3]  = $s1 >> 3;
+        $s[ 3 ]  = $s1 >> 3;
         // s[4]  = s1 >> 11;
-        $s[4]  = $s1 >> 11;
+        $s[ 4 ]  = $s1 >> 11;
         // s[5]  = (s1 >> 19) | (s2 * ((uint64_t) 1 << 2));
-        $s[5]  = ($s1 >> 19) | ($s2 << 2);
+        $s[ 5 ]  = ( $s1 >> 19 ) | ( $s2 << 2 );
         // s[6]  = s2 >> 6;
-        $s[6]  = $s2 >> 6;
+        $s[ 6 ]  = $s2 >> 6;
         // s[7]  = (s2 >> 14) | (s3 * ((uint64_t) 1 << 7));
-        $s[7]  = ($s2 >> 14) | ($s3 << 7);
+        $s[ 7 ]  = ( $s2 >> 14 ) | ( $s3 << 7 );
         // s[8]  = s3 >> 1;
-        $s[8]  = $s3 >> 1;
+        $s[ 8 ]  = $s3 >> 1;
         // s[9]  = s3 >> 9;
-        $s[9]  = $s3 >> 9;
+        $s[ 9 ]  = $s3 >> 9;
         // s[10] = (s3 >> 17) | (s4 * ((uint64_t) 1 << 4));
-        $s[10] = ($s3 >> 17) | ($s4 << 4);
+        $s[ 10 ] = ( $s3 >> 17 ) | ( $s4 << 4 );
         // s[11] = s4 >> 4;
-        $s[11] = $s4 >> 4;
+        $s[ 11 ] = $s4 >> 4;
         // s[12] = s4 >> 12;
-        $s[12] = $s4 >> 12;
+        $s[ 12 ] = $s4 >> 12;
         // s[13] = (s4 >> 20) | (s5 * ((uint64_t) 1 << 1));
-        $s[13] = ($s4 >> 20) | ($s5 << 1);
+        $s[ 13 ] = ( $s4 >> 20 ) | ( $s5 << 1 );
         // s[14] = s5 >> 7;
-        $s[14] = $s5 >> 7;
+        $s[ 14 ] = $s5 >> 7;
         // s[15] = (s5 >> 15) | (s6 * ((uint64_t) 1 << 6));
-        $s[15] = ($s5 >> 15) | ($s6 << 6);
+        $s[ 15 ] = ( $s5 >> 15 ) | ( $s6 << 6 );
         // s[16] = s6 >> 2;
-        $s[16] = $s6 >> 2;
+        $s[ 16 ] = $s6 >> 2;
         // s[17] = s6 >> 10;
-        $s[17] = $s6 >> 10;
+        $s[ 17 ] = $s6 >> 10;
         // s[18] = (s6 >> 18) | (s7 * ((uint64_t) 1 << 3));
-        $s[18] = ($s6 >> 18) | ($s7 << 3);
+        $s[ 18 ] = ( $s6 >> 18 ) | ( $s7 << 3 );
         // s[19] = s7 >> 5;
-        $s[19] = $s7 >> 5;
+        $s[ 19 ] = $s7 >> 5;
         // s[20] = s7 >> 13;
-        $s[20] = $s7 >> 13;
+        $s[ 20 ] = $s7 >> 13;
         // s[21] = s8 >> 0;
-        $s[21] = $s8 >> 0;
+        $s[ 21 ] = $s8 >> 0;
         // s[22] = s8 >> 8;
-        $s[22] = $s8 >> 8;
+        $s[ 22 ] = $s8 >> 8;
         // s[23] = (s8 >> 16) | (s9 * ((uint64_t) 1 << 5));
-        $s[23] = ($s8 >> 16) | ($s9 << 5);
+        $s[ 23 ] = ( $s8 >> 16 ) | ( $s9 << 5 );
         // s[24] = s9 >> 3;
-        $s[24] = $s9 >> 3;
+        $s[ 24 ] = $s9 >> 3;
         // s[25] = s9 >> 11;
-        $s[25] = $s9 >> 11;
+        $s[ 25 ] = $s9 >> 11;
         // s[26] = (s9 >> 19) | (s10 * ((uint64_t) 1 << 2));
-        $s[26] = ($s9 >> 19) | ($s10 << 2);
+        $s[ 26 ] = ( $s9 >> 19 ) | ( $s10 << 2 );
         // s[27] = s10 >> 6;
-        $s[27] = $s10 >> 6;
+        $s[ 27 ] = $s10 >> 6;
         // s[28] = (s10 >> 14) | (s11 * ((uint64_t) 1 << 7));
-        $s[28] = ($s10 >> 14) | ($s11 << 7);
+        $s[ 28 ] = ( $s10 >> 14 ) | ( $s11 << 7 );
         // s[29] = s11 >> 1;
-        $s[29] = $s11 >> 1;
+        $s[ 29 ] = $s11 >> 1;
         // s[30] = s11 >> 9;
-        $s[30] = $s11 >> 9;
+        $s[ 30 ] = $s11 >> 9;
         // s[31] = s11 >> 17;
-        $s[31] = $s11 >> 17;
-        return self::intArrayToString($s);
+        $s[ 31 ] = $s11 >> 17;
+        return self::intArrayToString( $s );
     }
 
     /**
      * @param string $s
      * @return string
      */
-    public static function sc25519_sq($s)
+    public static function sc25519_sq( $s )
     {
-        return self::sc25519_mul($s, $s);
+        return self::sc25519_mul( $s, $s );
     }
 
     /**
@@ -3714,72 +3714,72 @@ 
      * @param string $a
      * @return string
      */
-    public static function sc25519_sqmul($s, $n, $a)
+    public static function sc25519_sqmul( $s, $n, $a )
     {
-        for ($i = 0; $i < $n; ++$i) {
-            $s = self::sc25519_sq($s);
+        for ( $i = 0; $i < $n; ++$i ) {
+            $s = self::sc25519_sq( $s );
         }
-        return self::sc25519_mul($s, $a);
+        return self::sc25519_mul( $s, $a );
     }
 
     /**
      * @param string $s
      * @return string
      */
-    public static function sc25519_invert($s)
+    public static function sc25519_invert( $s )
     {
-        $_10 = self::sc25519_sq($s);
-        $_11 = self::sc25519_mul($s, $_10);
-        $_100 = self::sc25519_mul($s, $_11);
-        $_1000 = self::sc25519_sq($_100);
-        $_1010 = self::sc25519_mul($_10, $_1000);
-        $_1011 = self::sc25519_mul($s, $_1010);
-        $_10000 = self::sc25519_sq($_1000);
-        $_10110 = self::sc25519_sq($_1011);
-        $_100000 = self::sc25519_mul($_1010, $_10110);
-        $_100110 = self::sc25519_mul($_10000, $_10110);
-        $_1000000 = self::sc25519_sq($_100000);
-        $_1010000 = self::sc25519_mul($_10000, $_1000000);
-        $_1010011 = self::sc25519_mul($_11, $_1010000);
-        $_1100011 = self::sc25519_mul($_10000, $_1010011);
-        $_1100111 = self::sc25519_mul($_100, $_1100011);
-        $_1101011 = self::sc25519_mul($_100, $_1100111);
-        $_10010011 = self::sc25519_mul($_1000000, $_1010011);
-        $_10010111 = self::sc25519_mul($_100, $_10010011);
-        $_10111101 = self::sc25519_mul($_100110, $_10010111);
-        $_11010011 = self::sc25519_mul($_10110, $_10111101);
-        $_11100111 = self::sc25519_mul($_1010000, $_10010111);
-        $_11101011 = self::sc25519_mul($_100, $_11100111);
-        $_11110101 = self::sc25519_mul($_1010, $_11101011);
-
-        $recip = self::sc25519_mul($_1011, $_11110101);
-        $recip = self::sc25519_sqmul($recip, 126, $_1010011);
-        $recip = self::sc25519_sqmul($recip, 9, $_10);
-        $recip = self::sc25519_mul($recip, $_11110101);
-        $recip = self::sc25519_sqmul($recip, 7, $_1100111);
-        $recip = self::sc25519_sqmul($recip, 9, $_11110101);
-        $recip = self::sc25519_sqmul($recip, 11, $_10111101);
-        $recip = self::sc25519_sqmul($recip, 8, $_11100111);
-        $recip = self::sc25519_sqmul($recip, 9, $_1101011);
-        $recip = self::sc25519_sqmul($recip, 6, $_1011);
-        $recip = self::sc25519_sqmul($recip, 14, $_10010011);
-        $recip = self::sc25519_sqmul($recip, 10, $_1100011);
-        $recip = self::sc25519_sqmul($recip, 9, $_10010111);
-        $recip = self::sc25519_sqmul($recip, 10, $_11110101);
-        $recip = self::sc25519_sqmul($recip, 8, $_11010011);
-        return self::sc25519_sqmul($recip, 8, $_11101011);
+        $_10 = self::sc25519_sq( $s );
+        $_11 = self::sc25519_mul( $s, $_10 );
+        $_100 = self::sc25519_mul( $s, $_11 );
+        $_1000 = self::sc25519_sq( $_100 );
+        $_1010 = self::sc25519_mul( $_10, $_1000 );
+        $_1011 = self::sc25519_mul( $s, $_1010 );
+        $_10000 = self::sc25519_sq( $_1000 );
+        $_10110 = self::sc25519_sq( $_1011 );
+        $_100000 = self::sc25519_mul( $_1010, $_10110 );
+        $_100110 = self::sc25519_mul( $_10000, $_10110 );
+        $_1000000 = self::sc25519_sq( $_100000 );
+        $_1010000 = self::sc25519_mul( $_10000, $_1000000 );
+        $_1010011 = self::sc25519_mul( $_11, $_1010000 );
+        $_1100011 = self::sc25519_mul( $_10000, $_1010011 );
+        $_1100111 = self::sc25519_mul( $_100, $_1100011 );
+        $_1101011 = self::sc25519_mul( $_100, $_1100111 );
+        $_10010011 = self::sc25519_mul( $_1000000, $_1010011 );
+        $_10010111 = self::sc25519_mul( $_100, $_10010011 );
+        $_10111101 = self::sc25519_mul( $_100110, $_10010111 );
+        $_11010011 = self::sc25519_mul( $_10110, $_10111101 );
+        $_11100111 = self::sc25519_mul( $_1010000, $_10010111 );
+        $_11101011 = self::sc25519_mul( $_100, $_11100111 );
+        $_11110101 = self::sc25519_mul( $_1010, $_11101011 );
+
+        $recip = self::sc25519_mul( $_1011, $_11110101 );
+        $recip = self::sc25519_sqmul( $recip, 126, $_1010011 );
+        $recip = self::sc25519_sqmul( $recip, 9, $_10 );
+        $recip = self::sc25519_mul( $recip, $_11110101 );
+        $recip = self::sc25519_sqmul( $recip, 7, $_1100111 );
+        $recip = self::sc25519_sqmul( $recip, 9, $_11110101 );
+        $recip = self::sc25519_sqmul( $recip, 11, $_10111101 );
+        $recip = self::sc25519_sqmul( $recip, 8, $_11100111 );
+        $recip = self::sc25519_sqmul( $recip, 9, $_1101011 );
+        $recip = self::sc25519_sqmul( $recip, 6, $_1011 );
+        $recip = self::sc25519_sqmul( $recip, 14, $_10010011 );
+        $recip = self::sc25519_sqmul( $recip, 10, $_1100011 );
+        $recip = self::sc25519_sqmul( $recip, 9, $_10010111 );
+        $recip = self::sc25519_sqmul( $recip, 10, $_11110101 );
+        $recip = self::sc25519_sqmul( $recip, 8, $_11010011 );
+        return self::sc25519_sqmul( $recip, 8, $_11101011 );
     }
 
     /**
      * @param string $s
      * @return string
      */
-    public static function clamp($s)
+    public static function clamp( $s )
     {
-        $s_ = self::stringToIntArray($s);
-        $s_[0] &= 248;
-        $s_[31] |= 64;
-        $s_[31] &= 128;
-        return self::intArrayToString($s_);
+        $s_ = self::stringToIntArray( $s );
+        $s_[ 0 ] &= 248;
+        $s_[ 31 ] |= 64;
+        $s_[ 31 ] &= 128;
+        return self::intArrayToString( $s_ );
     }
 }