mundschenk-at / php-typography

src/fixes/token-fixes/class-wrap-urls-fix.php

Spacing +21 added lines, -21 removed lines

@@ -60,8 +60,8 @@ 
 	 * @param Hyphenator_Cache|null $cache           Optional. Default null.
 	 * @param bool                  $feed_compatible Optional. Default false.
 	 */
-	public function __construct( Hyphenator_Cache $cache = null, $feed_compatible = false ) {
-		parent::__construct( $cache, Token_Fix::OTHER, $feed_compatible );
+	public function __construct(Hyphenator_Cache $cache = null, $feed_compatible = false) {
+		parent::__construct($cache, Token_Fix::OTHER, $feed_compatible);
 
 		// Combined URL pattern.
 		$this->url_pattern = '`(?:
@@ -106,59 +106,59 @@ 
 	 *
 	 * @return array An array of tokens.
 	 */
-	public function apply( array $tokens, Settings $settings, $is_title = false, \DOMText $textnode = null ) {
-		if ( empty( $settings['urlWrap'] ) || empty( $settings['urlMinAfterWrap'] ) ) {
+	public function apply(array $tokens, Settings $settings, $is_title = false, \DOMText $textnode = null) {
+		if (empty($settings['urlWrap']) || empty($settings['urlMinAfterWrap'])) {
 			return $tokens;
 		}
 
 		// Test for and parse urls.
-		foreach ( $tokens as $token_index => $text_token ) {
-			if ( preg_match( $this->url_pattern, $text_token->value, $url_match ) ) {
+		foreach ($tokens as $token_index => $text_token) {
+			if (preg_match($this->url_pattern, $text_token->value, $url_match)) {
 
 				// $url_match['schema'] holds "http://".
 				// $url_match['domain'] holds "subdomains.domain.tld".
 				// $url_match['path']   holds the path after the domain.
-				$http = ( $url_match['schema'] ) ? $url_match[1] . U::ZERO_WIDTH_SPACE : '';
+				$http = ($url_match['schema']) ? $url_match[1] . U::ZERO_WIDTH_SPACE : '';
 
-				$domain_parts = preg_split( self::WRAP_URLS_DOMAIN_PARTS, $url_match['domain'], -1, PREG_SPLIT_DELIM_CAPTURE );
+				$domain_parts = preg_split(self::WRAP_URLS_DOMAIN_PARTS, $url_match['domain'], -1, PREG_SPLIT_DELIM_CAPTURE);
 
 				// This is a hack, but it works.
 				// First, we hyphenate each part, we need it formated like a group of words.
 				$parsed_words_like = [];
-				foreach ( $domain_parts as $key => $part ) {
-					$parsed_words_like[ $key ] = new Text_Parser\Token( $part, Text_Parser\Token::OTHER );
+				foreach ($domain_parts as $key => $part) {
+					$parsed_words_like[$key] = new Text_Parser\Token($part, Text_Parser\Token::OTHER);
 				}
 
 				// Do the hyphenation.
-				$parsed_words_like = $this->do_hyphenate( $parsed_words_like, $settings, U::ZERO_WIDTH_SPACE );
+				$parsed_words_like = $this->do_hyphenate($parsed_words_like, $settings, U::ZERO_WIDTH_SPACE);
 
 				// Restore format.
-				foreach ( $parsed_words_like as $key => $parsed_word ) {
+				foreach ($parsed_words_like as $key => $parsed_word) {
 					$value = $parsed_word->value;
 
-					if ( $key > 0 && 1 === strlen( $value ) ) {
-						$domain_parts[ $key ] = U::ZERO_WIDTH_SPACE . $value;
+					if ($key > 0 && 1 === strlen($value)) {
+						$domain_parts[$key] = U::ZERO_WIDTH_SPACE . $value;
 					} else {
-						$domain_parts[ $key ] = $value;
+						$domain_parts[$key] = $value;
 					}
 				}
 
 				// Lastly let's recombine.
-				$domain = implode( $domain_parts );
+				$domain = implode($domain_parts);
 
 				// Break up the URL path to individual characters.
-				$path_parts = str_split( $url_match['path'], 1 );
-				$path_count = count( $path_parts );
+				$path_parts = str_split($url_match['path'], 1);
+				$path_count = count($path_parts);
 				$path = '';
-				foreach ( $path_parts as $index => $path_part ) {
-					if ( 0 === $index || $path_count - $index < $settings['urlMinAfterWrap'] ) {
+				foreach ($path_parts as $index => $path_part) {
+					if (0 === $index || $path_count - $index < $settings['urlMinAfterWrap']) {
 						$path .= $path_part;
 					} else {
 						$path .= U::ZERO_WIDTH_SPACE . $path_part;
 					}
 				}
 
-				$tokens[ $token_index ] = $text_token->with_value( $http . $domain . $path );
+				$tokens[$token_index] = $text_token->with_value($http . $domain . $path);
 			}
 		}
 

src/fixes/token-fixes/class-abstract-token-fix.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 	 * @param int  $target          Required.
 	 * @param bool $feed_compatible Optional. Default false.
 	 */
-	protected function __construct( $target, $feed_compatible = false ) {
+	protected function __construct($target, $feed_compatible = false) {
 		$this->target          = $target;
 		$this->feed_compatible = $feed_compatible;
 	}
@@ -73,7 +73,7 @@ 
 	 *
 	 * @return array An array of tokens.
 	 */
-	abstract public function apply( array $tokens, Settings $settings, $is_title = false, \DOMText $textnode = null );
+	abstract public function apply(array $tokens, Settings $settings, $is_title = false, \DOMText $textnode = null);
 
 	/**
 	 * Determines whether the fix should be applied to (RSS) feeds.

src/fixes/node-fixes/class-smart-exponents-fix.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@
 	 *
 	 * @param bool $feed_compatible Optional. Default false.
 	 */
-	public function __construct( $feed_compatible = false ) {
-		parent::__construct( self::REGEX, self::REPLACEMENT, self::SETTING, $feed_compatible );
+	public function __construct($feed_compatible = false) {
+		parent::__construct(self::REGEX, self::REPLACEMENT, self::SETTING, $feed_compatible);
 	}
 }

src/fixes/node-fixes/class-style-caps-fix.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@
 	 * @param string $css_class       HTML class used in markup.
 	 * @param bool   $feed_compatible Optional. Default false.
 	 */
-	public function __construct( $css_class, $feed_compatible = false ) {
-		parent::__construct( self::REGEX, self::SETTINGS_SWITCH, $css_class, $feed_compatible );
+	public function __construct($css_class, $feed_compatible = false) {
+		parent::__construct(self::REGEX, self::SETTINGS_SWITCH, $css_class, $feed_compatible);
 	}
 }

src/fixes/node-fixes/class-style-ampersands-fix.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@
 	 * @param string $css_class       HTML class used in markup.
 	 * @param bool   $feed_compatible Optional. Default false.
 	 */
-	public function __construct( $css_class, $feed_compatible = false ) {
-		parent::__construct( self::REGEX, self::SETTINGS_SWITCH, $css_class, $feed_compatible );
+	public function __construct($css_class, $feed_compatible = false) {
+		parent::__construct(self::REGEX, self::SETTINGS_SWITCH, $css_class, $feed_compatible);
 	}
 }

src/class-strings.php

Spacing +18 added lines, -18 removed lines

@@ -45,7 +45,7 @@ 
 	 *
 	 * @var array
 	 */
-	const _ENCODINGS = [ 'ASCII', 'UTF-8' ];
+	const _ENCODINGS = ['ASCII', 'UTF-8'];
 
 	/**
 	 * A hash map for string functions according to encoding.
@@ -55,7 +55,7 @@ 
 	const _STRING_FUNCTIONS = [
 		'UTF-8' => [
 			'strlen'     => 'mb_strlen',
-			'str_split'  => [ __CLASS__, 'mb_str_split' ],
+			'str_split'  => [__CLASS__, 'mb_str_split'],
 			'strtolower' => 'mb_strtolower',
 			'strtoupper' => 'mb_strtoupper',
 			'substr'     => 'mb_substr',
@@ -87,8 +87,8 @@ 
 	 *         'u'          => modifier string
 	 * }
 	 */
-	public static function functions( $str ) {
-		return self::_STRING_FUNCTIONS[ mb_detect_encoding( $str, self::_ENCODINGS, true ) ];
+	public static function functions($str) {
+		return self::_STRING_FUNCTIONS[mb_detect_encoding($str, self::_ENCODINGS, true)];
 	}
 
 	/**
@@ -102,13 +102,13 @@ 
 	 *
 	 * @return array                An array of $split_length character chunks.
 	 */
-	public static function mb_str_split( $str, $split_length = 1 ) {
-		$result = preg_split( '//u', $str , -1, PREG_SPLIT_NO_EMPTY );
+	public static function mb_str_split($str, $split_length = 1) {
+		$result = preg_split('//u', $str, -1, PREG_SPLIT_NO_EMPTY);
 
-		if ( $split_length > 1 ) {
+		if ($split_length > 1) {
 			$splits = [];
-			foreach ( array_chunk( $result, $split_length ) as $chunk ) {
-				$splits[] = join( '', $chunk );
+			foreach (array_chunk($result, $split_length) as $chunk) {
+				$splits[] = join('', $chunk);
 			}
 
 			$result = $splits;
@@ -124,17 +124,17 @@ 
 	 *
 	 * @return string Unicode character(s).
 	 */
-	public static function uchr( $codes ) {
+	public static function uchr($codes) {
 
 		// Single character code.
-		if ( is_scalar( $codes ) ) {
+		if (is_scalar($codes)) {
 			$codes = func_get_args();
 		}
 
 		// Deal with an array of character codes.
 		$str = '';
-		foreach ( $codes as $code ) {
-			$str .= self::_uchr( (int) $code );
+		foreach ($codes as $code) {
+			$str .= self::_uchr((int) $code);
 		}
 
 		return $str;
@@ -148,8 +148,8 @@ 
 	 *
 	 * @return string Unicode character.
 	 */
-	public static function _uchr( $code ) {
-		return html_entity_decode( '&#' . $code . ';', ENT_NOQUOTES, 'UTF-8' );
+	public static function _uchr($code) {
+		return html_entity_decode('&#' . $code . ';', ENT_NOQUOTES, 'UTF-8');
 	}
 
 	/**
@@ -159,9 +159,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function maybe_split_parameters( $params ) {
-		if ( ! is_array( $params ) ) {
-			$params = preg_split( self::_RE_PARAMETER_SPLITTING, $params, -1, PREG_SPLIT_NO_EMPTY );
+	public static function maybe_split_parameters($params) {
+		if ( ! is_array($params)) {
+			$params = preg_split(self::_RE_PARAMETER_SPLITTING, $params, -1, PREG_SPLIT_NO_EMPTY);
 		}
 
 		return $params;

src/fixes/node-fixes/class-dewidow-fix.php

Spacing +15 added lines, -15 removed lines

@@ -74,40 +74,40 @@ 
 	 * @param Settings $settings Required.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	public function apply( \DOMText $textnode, Settings $settings, $is_title = false ) {
+	public function apply(\DOMText $textnode, Settings $settings, $is_title = false) {
 		// Intervening inline tags may interfere with widow identification, but that is a sacrifice of using the parser.
 		// Intervening tags will only interfere if they separate the widow from previous or preceding whitespace.
-		if ( empty( $settings['dewidow'] ) || empty( $settings['dewidowMaxPull'] ) || empty( $settings['dewidowMaxLength'] ) ) {
+		if (empty($settings['dewidow']) || empty($settings['dewidowMaxPull']) || empty($settings['dewidowMaxLength'])) {
 			return;
 		}
 
-		if ( '' === DOM::get_next_chr( $textnode ) ) {
+		if ('' === DOM::get_next_chr($textnode)) {
 			// We have the last type "text" child of a block level element.
-			$textnode->data = preg_replace_callback( self::REGEX, function( array $widow ) use ( $settings ) {
-				$func = Strings::functions( $widow[0] );
+			$textnode->data = preg_replace_callback(self::REGEX, function(array $widow) use ($settings) {
+				$func = Strings::functions($widow[0]);
 
 				// If we are here, we know that widows are being protected in some fashion
 				// with that, we will assert that widows should never be hyphenated or wrapped
 				// as such, we will strip soft hyphens and zero-width-spaces.
-				$widow['widow']    = str_replace( U::ZERO_WIDTH_SPACE, '', $widow['widow'] );
-				$widow['widow']    = str_replace( U::SOFT_HYPHEN,     '', $widow['widow'] );
-				$widow['trailing'] = preg_replace( "/\s+/{$func['u']}", U::NO_BREAK_SPACE, $widow['trailing'] );
-				$widow['trailing'] = str_replace( U::ZERO_WIDTH_SPACE, '', $widow['trailing'] );
-				$widow['trailing'] = str_replace( U::SOFT_HYPHEN,     '', $widow['trailing'] );
+				$widow['widow']    = str_replace(U::ZERO_WIDTH_SPACE, '', $widow['widow']);
+				$widow['widow']    = str_replace(U::SOFT_HYPHEN, '', $widow['widow']);
+				$widow['trailing'] = preg_replace("/\s+/{$func['u']}", U::NO_BREAK_SPACE, $widow['trailing']);
+				$widow['trailing'] = str_replace(U::ZERO_WIDTH_SPACE, '', $widow['trailing']);
+				$widow['trailing'] = str_replace(U::SOFT_HYPHEN, '', $widow['trailing']);
 
 				// Eject if widows neighbor is proceeded by a no break space (the pulled text would be too long).
-				if ( '' === $widow['space_before'] || strstr( U::NO_BREAK_SPACE, $widow['space_before'] ) ) {
+				if ('' === $widow['space_before'] || strstr(U::NO_BREAK_SPACE, $widow['space_before'])) {
 					return $widow['space_before'] . $widow['neighbor'] . $widow['space_between'] . $widow['widow'] . $widow['trailing'];
 				}
 
 				// Eject if widows neighbor length exceeds the max allowed or widow length exceeds max allowed.
-				if ( $func['strlen']( $widow['neighbor'] ) > $settings['dewidowMaxPull'] ||
-					 $func['strlen']( $widow['widow'] ) > $settings['dewidowMaxLength'] ) {
+				if ($func['strlen']($widow['neighbor']) > $settings['dewidowMaxPull'] ||
+					 $func['strlen']($widow['widow']) > $settings['dewidowMaxLength']) {
 						return $widow['space_before'] . $widow['neighbor'] . $widow['space_between'] . $widow['widow'] . $widow['trailing'];
 				}
 
 				// Never replace thin and hair spaces with  .
-				switch ( $widow['space_between'] ) {
+				switch ($widow['space_between']) {
 					case U::THIN_SPACE:
 					case U::HAIR_SPACE:
 						return $widow['space_before'] . $widow['neighbor'] . $widow['space_between'] . $widow['widow'] . $widow['trailing'];
@@ -115,7 +115,7 @@ 
 
 				// Let's protect some widows!
 				return $widow['space_before'] . $widow['neighbor'] . U::NO_BREAK_SPACE . $widow['widow'] . $widow['trailing'];
-			}, $textnode->data );
+			}, $textnode->data);
 		}
 	}
 }

src/class-php-typography.php

Spacing +118 added lines, -118 removed lines

@@ -53,7 +53,7 @@ 
 	const SPACING_POST_WORDS = 40;
 	const HTML_INSERTION     = 50;
 
-	const GROUPS = [ self::CHARACTERS, self::SPACING_PRE_WORDS, self::PROCESS_WORDS, self::SPACING_POST_WORDS, self::HTML_INSERTION ];
+	const GROUPS = [self::CHARACTERS, self::SPACING_PRE_WORDS, self::PROCESS_WORDS, self::SPACING_POST_WORDS, self::HTML_INSERTION];
 
 	/**
 	 * A DOM-based HTML5 parser.
@@ -114,7 +114,7 @@ 
 	 *
 	 * @var string
 	 */
-	const INIT_NOW  = 'now';
+	const INIT_NOW = 'now';
 
 	/**
 	 * Constant for signalling lazy (manual) initialization to the constructor.
@@ -128,8 +128,8 @@ 
 	 *
 	 * @param string $init Optional. Flag to control initialization. Valid inputs are INIT_NOW and INIT_LAZY. Default INIT_NOW.
 	 */
-	public function __construct( $init = self::INIT_NOW ) {
-		if ( self::INIT_NOW === $init ) {
+	public function __construct($init = self::INIT_NOW) {
+		if (self::INIT_NOW === $init) {
 			$this->init();
 		}
 	}
@@ -141,46 +141,46 @@ 
 		$this->process_words_fix = new Node_Fixes\Process_Words_Fix();
 
 		// Nodify anything that requires adjacent text awareness here.
-		$this->register_node_fix( new Node_Fixes\Smart_Maths_Fix(),          self::CHARACTERS );
-		$this->register_node_fix( new Node_Fixes\Smart_Diacritics_Fix(),     self::CHARACTERS );
-		$this->register_node_fix( new Node_Fixes\Smart_Quotes_Fix( true ),   self::CHARACTERS );
-		$this->register_node_fix( new Node_Fixes\Smart_Dashes_Fix( true ),   self::CHARACTERS );
-		$this->register_node_fix( new Node_Fixes\Smart_Ellipses_Fix( true ), self::CHARACTERS );
-		$this->register_node_fix( new Node_Fixes\Smart_Marks_Fix( true ),    self::CHARACTERS );
+		$this->register_node_fix(new Node_Fixes\Smart_Maths_Fix(), self::CHARACTERS);
+		$this->register_node_fix(new Node_Fixes\Smart_Diacritics_Fix(), self::CHARACTERS);
+		$this->register_node_fix(new Node_Fixes\Smart_Quotes_Fix(true), self::CHARACTERS);
+		$this->register_node_fix(new Node_Fixes\Smart_Dashes_Fix(true), self::CHARACTERS);
+		$this->register_node_fix(new Node_Fixes\Smart_Ellipses_Fix(true), self::CHARACTERS);
+		$this->register_node_fix(new Node_Fixes\Smart_Marks_Fix(true), self::CHARACTERS);
 
 		// Keep spacing after smart character replacement.
-		$this->register_node_fix( new Node_Fixes\Single_Character_Word_Spacing_Fix(), self::SPACING_PRE_WORDS );
-		$this->register_node_fix( new Node_Fixes\Dash_Spacing_Fix(),                  self::SPACING_PRE_WORDS );
-		$this->register_node_fix( new Node_Fixes\Unit_Spacing_Fix(),                  self::SPACING_PRE_WORDS );
-		$this->register_node_fix( new Node_Fixes\Numbered_Abbreviation_Spacing_Fix(), self::SPACING_PRE_WORDS );
-		$this->register_node_fix( new Node_Fixes\French_Punctuation_Spacing_Fix(),    self::SPACING_PRE_WORDS );
+		$this->register_node_fix(new Node_Fixes\Single_Character_Word_Spacing_Fix(), self::SPACING_PRE_WORDS);
+		$this->register_node_fix(new Node_Fixes\Dash_Spacing_Fix(), self::SPACING_PRE_WORDS);
+		$this->register_node_fix(new Node_Fixes\Unit_Spacing_Fix(), self::SPACING_PRE_WORDS);
+		$this->register_node_fix(new Node_Fixes\Numbered_Abbreviation_Spacing_Fix(), self::SPACING_PRE_WORDS);
+		$this->register_node_fix(new Node_Fixes\French_Punctuation_Spacing_Fix(), self::SPACING_PRE_WORDS);
 
 		// Parse and process individual words.
-		$this->register_node_fix( $this->process_words_fix, self::PROCESS_WORDS );
+		$this->register_node_fix($this->process_words_fix, self::PROCESS_WORDS);
 
 		// Some final space manipulation.
-		$this->register_node_fix( new Node_Fixes\Dewidow_Fix(),        self::SPACING_POST_WORDS );
-		$this->register_node_fix( new Node_Fixes\Space_Collapse_Fix(), self::SPACING_POST_WORDS );
+		$this->register_node_fix(new Node_Fixes\Dewidow_Fix(), self::SPACING_POST_WORDS);
+		$this->register_node_fix(new Node_Fixes\Space_Collapse_Fix(), self::SPACING_POST_WORDS);
 
 		// Everything that requires HTML injection occurs here (functions above assume tag-free content)
 		// pay careful attention to functions below for tolerance of injected tags.
-		$this->register_node_fix( new Node_Fixes\Smart_Ordinal_Suffix_Fix( $this->css_classes['ordinal'] ),                                 self::HTML_INSERTION ); // call before "style_numbers" and "smart_fractions".
-		$this->register_node_fix( new Node_Fixes\Smart_Exponents_Fix(),                                                                     self::HTML_INSERTION ); // call before "style_numbers".
-		$this->register_node_fix( new Node_Fixes\Smart_Fractions_Fix( $this->css_classes['numerator'], $this->css_classes['denominator'] ), self::HTML_INSERTION ); // call before "style_numbers" and after "smart_ordinal_suffix".
-		$this->register_node_fix( new Node_Fixes\Style_Caps_Fix( $this->css_classes['caps'] ),                                              self::HTML_INSERTION ); // Call before "style_numbers".
-		$this->register_node_fix( new Node_Fixes\Style_Numbers_Fix( $this->css_classes['numbers'] ),                                        self::HTML_INSERTION ); // Call after "smart_ordinal_suffix", "smart_exponents", "smart_fractions", and "style_caps".
-		$this->register_node_fix( new Node_Fixes\Style_Ampersands_Fix( $this->css_classes['amp'] ),                                         self::HTML_INSERTION );
-		$this->register_node_fix( new Node_Fixes\Style_Initial_Quotes_Fix( $this->css_classes['quo'], $this->css_classes['dquo'] ),         self::HTML_INSERTION );
-		$this->register_node_fix( new Node_Fixes\Style_Hanging_Punctuation_Fix( $this->css_classes['push-single'], $this->css_classes['push-double'], $this->css_classes['pull-single'], $this->css_classes['pull-double'] ), self::HTML_INSERTION );
+		$this->register_node_fix(new Node_Fixes\Smart_Ordinal_Suffix_Fix($this->css_classes['ordinal']), self::HTML_INSERTION); // call before "style_numbers" and "smart_fractions".
+		$this->register_node_fix(new Node_Fixes\Smart_Exponents_Fix(), self::HTML_INSERTION); // call before "style_numbers".
+		$this->register_node_fix(new Node_Fixes\Smart_Fractions_Fix($this->css_classes['numerator'], $this->css_classes['denominator']), self::HTML_INSERTION); // call before "style_numbers" and after "smart_ordinal_suffix".
+		$this->register_node_fix(new Node_Fixes\Style_Caps_Fix($this->css_classes['caps']), self::HTML_INSERTION); // Call before "style_numbers".
+		$this->register_node_fix(new Node_Fixes\Style_Numbers_Fix($this->css_classes['numbers']), self::HTML_INSERTION); // Call after "smart_ordinal_suffix", "smart_exponents", "smart_fractions", and "style_caps".
+		$this->register_node_fix(new Node_Fixes\Style_Ampersands_Fix($this->css_classes['amp']), self::HTML_INSERTION);
+		$this->register_node_fix(new Node_Fixes\Style_Initial_Quotes_Fix($this->css_classes['quo'], $this->css_classes['dquo']), self::HTML_INSERTION);
+		$this->register_node_fix(new Node_Fixes\Style_Hanging_Punctuation_Fix($this->css_classes['push-single'], $this->css_classes['push-double'], $this->css_classes['pull-single'], $this->css_classes['pull-double']), self::HTML_INSERTION);
 
 		// Register token fixes.
 		$cache = $this->get_hyphenator_cache();
 
-		$this->register_token_fix( new Token_Fixes\Wrap_Hard_Hyphens_Fix() );
-		$this->register_token_fix( new Token_Fixes\Hyphenate_Compounds_Fix( $cache ) );
-		$this->register_token_fix( new Token_Fixes\Hyphenate_Fix( $cache ) );
-		$this->register_token_fix( new Token_Fixes\Wrap_URLs_Fix( $cache ) );
-		$this->register_token_fix( new Token_Fixes\Wrap_Emails_Fix() );
+		$this->register_token_fix(new Token_Fixes\Wrap_Hard_Hyphens_Fix());
+		$this->register_token_fix(new Token_Fixes\Hyphenate_Compounds_Fix($cache));
+		$this->register_token_fix(new Token_Fixes\Hyphenate_Fix($cache));
+		$this->register_token_fix(new Token_Fixes\Wrap_URLs_Fix($cache));
+		$this->register_token_fix(new Token_Fixes\Wrap_Emails_Fix());
 	}
 
 	/**
@@ -192,8 +192,8 @@ 
 	 *
 	 * @return string The processed $html.
 	 */
-	public function process( $html, Settings $settings, $is_title = false ) {
-		return $this->process_textnodes( $html, [ $this, 'apply_fixes_to_html_node' ], $settings, $is_title );
+	public function process($html, Settings $settings, $is_title = false) {
+		return $this->process_textnodes($html, [$this, 'apply_fixes_to_html_node'], $settings, $is_title);
 	}
 
 	/**
@@ -206,8 +206,8 @@ 
 	 *
 	 * @return string The processed $html.
 	 */
-	public function process_feed( $html, Settings $settings, $is_title = false ) {
-		return $this->process_textnodes( $html, [ $this, 'apply_fixes_to_feed_node' ], $settings, $is_title );
+	public function process_feed($html, Settings $settings, $is_title = false) {
+		return $this->process_textnodes($html, [$this, 'apply_fixes_to_feed_node'], $settings, $is_title);
 	}
 
 	/**
@@ -220,8 +220,8 @@ 
 	 *
 	 * @return string The processed $html.
 	 */
-	public function process_textnodes( $html, callable $fixer, Settings $settings, $is_title = false ) {
-		if ( isset( $settings['ignoreTags'] ) && $is_title && ( in_array( 'h1', $settings['ignoreTags'], true ) || in_array( 'h2', $settings['ignoreTags'], true ) ) ) {
+	public function process_textnodes($html, callable $fixer, Settings $settings, $is_title = false) {
+		if (isset($settings['ignoreTags']) && $is_title && (in_array('h1', $settings['ignoreTags'], true) || in_array('h2', $settings['ignoreTags'], true))) {
 			return $html;
 		}
 
@@ -229,41 +229,41 @@ 
 		$html5_parser = $this->get_html5_parser();
 
 		// Parse the HTML.
-		$dom = $this->parse_html( $html5_parser, $html, $settings );
+		$dom = $this->parse_html($html5_parser, $html, $settings);
 
 		// Abort if there were parsing errors.
-		if ( empty( $dom ) ) {
+		if (empty($dom)) {
 			return $html;
 		}
 
 		// Query some nodes in the DOM.
-		$xpath = new \DOMXPath( $dom );
-		$body_node = $xpath->query( '/html/body' )->item( 0 );
-		$all_textnodes = $xpath->query( '//text()', $body_node );
-		$tags_to_ignore = $this->query_tags_to_ignore( $xpath, $body_node, $settings );
+		$xpath = new \DOMXPath($dom);
+		$body_node = $xpath->query('/html/body')->item(0);
+		$all_textnodes = $xpath->query('//text()', $body_node);
+		$tags_to_ignore = $this->query_tags_to_ignore($xpath, $body_node, $settings);
 
 		// Start processing.
-		foreach ( $all_textnodes as $textnode ) {
-			if ( self::arrays_intersect( DOM::get_ancestors( $textnode ), $tags_to_ignore ) ) {
+		foreach ($all_textnodes as $textnode) {
+			if (self::arrays_intersect(DOM::get_ancestors($textnode), $tags_to_ignore)) {
 				continue;
 			}
 
 			// We won't be doing anything with spaces, so we can jump ship if that is all we have.
-			if ( $textnode->isWhitespaceInElementContent() ) {
+			if ($textnode->isWhitespaceInElementContent()) {
 				continue;
 			}
 
 			// Decode all characters except < > &.
-			$textnode->data = htmlspecialchars( $textnode->data, ENT_NOQUOTES, 'UTF-8' ); // returns < > & to encoded HTML characters (&lt; &gt; and &amp; respectively).
+			$textnode->data = htmlspecialchars($textnode->data, ENT_NOQUOTES, 'UTF-8'); // returns < > & to encoded HTML characters (&lt; &gt; and &amp; respectively).
 
 			// Apply fixes.
-			call_user_func( $fixer, $textnode, $settings, $is_title );
+			call_user_func($fixer, $textnode, $settings, $is_title);
 
 			// Until now, we've only been working on a textnode: HTMLify result.
-			$this->replace_node_with_html( $textnode, $textnode->data );
+			$this->replace_node_with_html($textnode, $textnode->data);
 		}
 
-		return $html5_parser->saveHTML( $body_node->childNodes );
+		return $html5_parser->saveHTML($body_node->childNodes);
 	}
 
 	/**
@@ -275,9 +275,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected static function arrays_intersect( array $array1, array $array2 ) {
-		foreach ( $array1 as $value ) {
-			if ( isset( $array2[ spl_object_hash( $value ) ] ) ) {
+	protected static function arrays_intersect(array $array1, array $array2) {
+		foreach ($array1 as $value) {
+			if (isset($array2[spl_object_hash($value)])) {
 				return true;
 			}
 		}
@@ -292,10 +292,10 @@ 
 	 * @param Settings $settings The settings to apply.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	protected function apply_fixes_to_html_node( \DOMText $textnode, Settings $settings, $is_title = false ) {
-		foreach ( self::GROUPS as $group ) {
-			foreach ( $this->node_fixes[ $group ] as $fix ) {
-				$fix->apply( $textnode, $settings, $is_title );
+	protected function apply_fixes_to_html_node(\DOMText $textnode, Settings $settings, $is_title = false) {
+		foreach (self::GROUPS as $group) {
+			foreach ($this->node_fixes[$group] as $fix) {
+				$fix->apply($textnode, $settings, $is_title);
 			}
 		}
 	}
@@ -307,11 +307,11 @@ 
 	 * @param Settings $settings The settings to apply.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	protected function apply_fixes_to_feed_node( \DOMText $textnode, Settings $settings, $is_title = false ) {
-		foreach ( self::GROUPS as $group ) {
-			foreach ( $this->node_fixes[ $group ] as $fix ) {
-				if ( $fix->feed_compatible() ) {
-					$fix->apply( $textnode, $settings, $is_title );
+	protected function apply_fixes_to_feed_node(\DOMText $textnode, Settings $settings, $is_title = false) {
+		foreach (self::GROUPS as $group) {
+			foreach ($this->node_fixes[$group] as $fix) {
+				if ($fix->feed_compatible()) {
+					$fix->apply($textnode, $settings, $is_title);
 				}
 			}
 		}
@@ -326,28 +326,28 @@ 
 	 *
 	 * @return \DOMDocument|null The encoding has already been set to UTF-8. Returns null if there were parsing errors.
 	 */
-	public function parse_html( \Masterminds\HTML5 $parser, $html, Settings $settings ) {
+	public function parse_html(\Masterminds\HTML5 $parser, $html, Settings $settings) {
 		// Silence some parsing errors for invalid HTML.
-		set_error_handler( [ $this, 'handle_parsing_errors' ] ); // @codingStandardsIgnoreLine
-		$xml_error_handling = libxml_use_internal_errors( true );
+		set_error_handler([$this, 'handle_parsing_errors']); // @codingStandardsIgnoreLine
+		$xml_error_handling = libxml_use_internal_errors(true);
 
 		// Do the actual parsing.
-		$dom = $parser->loadHTML( '<!DOCTYPE html><html><body>' . $html . '</body></html>' );
+		$dom = $parser->loadHTML('<!DOCTYPE html><html><body>' . $html . '</body></html>');
 		$dom->encoding = 'UTF-8';
 
 		// Restore original error handling.
 		libxml_clear_errors();
-		libxml_use_internal_errors( $xml_error_handling );
+		libxml_use_internal_errors($xml_error_handling);
 		restore_error_handler();
 
 		// Handle any parser errors.
 		$errors = $parser->getErrors();
-		if ( ! empty( $settings['parserErrorsHandler'] ) && ! empty( $errors ) ) {
-			$errors = call_user_func( $settings['parserErrorsHandler'], $errors );
+		if ( ! empty($settings['parserErrorsHandler']) && ! empty($errors)) {
+			$errors = call_user_func($settings['parserErrorsHandler'], $errors);
 		}
 
 		// Return null if there are still unhandled parsing errors.
-		if ( ! empty( $errors ) && ! $settings['parserErrorsIgnore'] ) {
+		if ( ! empty($errors) && ! $settings['parserErrorsIgnore']) {
 			$dom = null;
 		}
 
@@ -365,13 +365,13 @@ 
 	 *
 	 * @return boolean Returns true if the error was handled, false otherwise.
 	 */
-	public function handle_parsing_errors( $errno, $errstr, $errfile, $errline, array $errcontext ) {
-		if ( ! ( error_reporting() & $errno ) ) { // @codingStandardsIgnoreLine.
+	public function handle_parsing_errors($errno, $errstr, $errfile, $errline, array $errcontext) {
+		if ( ! (error_reporting() & $errno)) { // @codingStandardsIgnoreLine.
 			return true; // not interesting.
 		}
 
 		// Ignore warnings from parser & let PHP handle the rest.
-		return $errno & E_USER_WARNING && 0 === substr_compare( $errfile, 'DOMTreeBuilder.php', -18 );
+		return $errno & E_USER_WARNING && 0 === substr_compare($errfile, 'DOMTreeBuilder.php', -18);
 	}
 
 	/**
@@ -383,25 +383,25 @@ 
 	 *
 	 * @return array An array of \DOMNode (can be empty).
 	 */
-	public function query_tags_to_ignore( \DOMXPath $xpath, \DOMNode $initial_node, Settings $settings ) {
+	public function query_tags_to_ignore(\DOMXPath $xpath, \DOMNode $initial_node, Settings $settings) {
 		$elements = [];
 		$query_parts = [];
-		if ( ! empty( $settings['ignoreTags'] ) ) {
-			$query_parts[] = '//' . implode( ' | //', $settings['ignoreTags'] );
+		if ( ! empty($settings['ignoreTags'])) {
+			$query_parts[] = '//' . implode(' | //', $settings['ignoreTags']);
 		}
-		if ( ! empty( $settings['ignoreClasses'] ) ) {
-			$query_parts[] = "//*[contains(concat(' ', @class, ' '), ' " . implode( " ') or contains(concat(' ', @class, ' '), ' ", $settings['ignoreClasses'] ) . " ')]";
+		if ( ! empty($settings['ignoreClasses'])) {
+			$query_parts[] = "//*[contains(concat(' ', @class, ' '), ' " . implode(" ') or contains(concat(' ', @class, ' '), ' ", $settings['ignoreClasses']) . " ')]";
 		}
-		if ( ! empty( $settings['ignoreIDs'] ) ) {
-			$query_parts[] = '//*[@id=\'' . implode( '\' or @id=\'', $settings['ignoreIDs'] ) . '\']';
+		if ( ! empty($settings['ignoreIDs'])) {
+			$query_parts[] = '//*[@id=\'' . implode('\' or @id=\'', $settings['ignoreIDs']) . '\']';
 		}
 
-		if ( ! empty( $query_parts ) ) {
-			$ignore_query = implode( ' | ', $query_parts );
+		if ( ! empty($query_parts)) {
+			$ignore_query = implode(' | ', $query_parts);
 
-			$nodelist = $xpath->query( $ignore_query, $initial_node );
-			if ( false !== $nodelist ) {
-				$elements = DOM::nodelist_to_array( $nodelist );
+			$nodelist = $xpath->query($ignore_query, $initial_node);
+			if (false !== $nodelist) {
+				$elements = DOM::nodelist_to_array($nodelist);
 			}
 		}
 
@@ -416,25 +416,25 @@ 
 	 *
 	 * @return \DOMNode|array An array of \DOMNode containing the new nodes or the old \DOMNode if the replacement failed.
 	 */
-	public function replace_node_with_html( \DOMNode $node, $content ) {
+	public function replace_node_with_html(\DOMNode $node, $content) {
 		$result = $node;
 
 		$parent = $node->parentNode;
-		if ( empty( $parent ) ) {
+		if (empty($parent)) {
 			return $node; // abort early to save cycles.
 		}
 
-		set_error_handler( [ $this, 'handle_parsing_errors' ] ); // @codingStandardsIgnoreLine.
+		set_error_handler([$this, 'handle_parsing_errors']); // @codingStandardsIgnoreLine.
 
-		$html_fragment = $this->get_html5_parser()->loadHTMLFragment( $content );
-		if ( ! empty( $html_fragment ) ) {
-			$imported_fragment = $node->ownerDocument->importNode( $html_fragment, true );
+		$html_fragment = $this->get_html5_parser()->loadHTMLFragment($content);
+		if ( ! empty($html_fragment)) {
+			$imported_fragment = $node->ownerDocument->importNode($html_fragment, true);
 
-			if ( ! empty( $imported_fragment ) ) {
+			if ( ! empty($imported_fragment)) {
 				// Save the children of the imported DOMDocumentFragment before replacement.
-				$children = DOM::nodelist_to_array( $imported_fragment->childNodes );
+				$children = DOM::nodelist_to_array($imported_fragment->childNodes);
 
-				if ( false !== $parent->replaceChild( $imported_fragment, $node ) ) {
+				if (false !== $parent->replaceChild($imported_fragment, $node)) {
 					// Success! We return the saved array of DOMNodes as
 					// $imported_fragment is just an empty DOMDocumentFragment now.
 					$result = $children;
@@ -454,10 +454,10 @@ 
 	 */
 	public function get_html5_parser() {
 		// Lazy-load HTML5 parser.
-		if ( ! isset( $this->html5_parser ) ) {
-			$this->html5_parser = new \Masterminds\HTML5( [
+		if ( ! isset($this->html5_parser)) {
+			$this->html5_parser = new \Masterminds\HTML5([
 				'disable_html_ns' => true,
-			] );
+			]);
 		}
 
 		return $this->html5_parser;
@@ -469,7 +469,7 @@ 
 	 * @return Hyphenator_Cache
 	 */
 	public function get_hyphenator_cache() {
-		if ( ! isset( $this->hyphenator_cache ) ) {
+		if ( ! isset($this->hyphenator_cache)) {
 			$this->hyphenator_cache = new Hyphenator_Cache();
 		}
 
@@ -481,7 +481,7 @@ 
 	 *
 	 * @param Hyphenator_Cache $cache A hyphenator cache instance.
 	 */
-	public function set_hyphenator_cache( Hyphenator_Cache $cache ) {
+	public function set_hyphenator_cache(Hyphenator_Cache $cache) {
 		$this->hyphenator_cache = $cache;
 	}
 
@@ -495,8 +495,8 @@ 
 	 *
 	 * @throws \InvalidArgumentException Group is invalid.
 	 */
-	public function register_node_fix( Node_Fix $fix, $group ) {
-		switch ( $group ) {
+	public function register_node_fix(Node_Fix $fix, $group) {
+		switch ($group) {
 			case self::CHARACTERS:
 			case self::SPACING_PRE_WORDS:
 			case self::PROCESS_WORDS: // Used internally.
@@ -505,10 +505,10 @@ 
 				break;
 
 			default:
-				throw new \InvalidArgumentException( "Invalid fixer group $group." );
+				throw new \InvalidArgumentException("Invalid fixer group $group.");
 		}
 
-		$this->node_fixes[ $group ][] = $fix;
+		$this->node_fixes[$group][] = $fix;
 	}
 
 	/**
@@ -518,8 +518,8 @@ 
 	 *
 	 * @param Token_Fix $fix Required.
 	 */
-	public function register_token_fix( Token_Fix $fix ) {
-		$this->process_words_fix->register_token_fix( $fix );
+	public function register_token_fix(Token_Fix $fix) {
+		$this->process_words_fix->register_token_fix($fix);
 	}
 
 	/**
@@ -529,27 +529,27 @@ 
 	 *
 	 * @return array An array in the form ( $language_code => $language_name ).
 	 */
-	private static function get_language_plugin_list( $path ) {
+	private static function get_language_plugin_list($path) {
 		$language_name_pattern = '/"language"\s*:\s*((".+")|(\'.+\'))\s*,/';
 		$languages = [];
-		$handler = opendir( $path );
+		$handler = opendir($path);
 
 		// Read all files in directory.
-		while ( $file = readdir( $handler ) ) {
+		while ($file = readdir($handler)) {
 			// We only want the JSON files.
-			if ( '.json' === substr( $file, -5 ) ) {
-				$file_content = file_get_contents( $path . $file );
-				if ( preg_match( $language_name_pattern, $file_content, $matches ) ) {
-					$language_name = substr( $matches[1], 1, -1 );
-					$language_code = substr( $file, 0, -5 );
-					$languages[ $language_code ] = $language_name;
+			if ('.json' === substr($file, -5)) {
+				$file_content = file_get_contents($path . $file);
+				if (preg_match($language_name_pattern, $file_content, $matches)) {
+					$language_name = substr($matches[1], 1, -1);
+					$language_code = substr($file, 0, -5);
+					$languages[$language_code] = $language_name;
 				}
 			}
 		}
-		closedir( $handler );
+		closedir($handler);
 
 		// Sort translated language names according to current locale.
-		asort( $languages );
+		asort($languages);
 
 		return $languages;
 	}
@@ -562,7 +562,7 @@ 
 	 * @return array An array in the form of ( LANG_CODE => LANGUAGE ).
 	 */
 	public static function get_hyphenation_languages() {
-		return self::get_language_plugin_list( __DIR__ . '/lang/' );
+		return self::get_language_plugin_list(__DIR__ . '/lang/');
 	}
 
 	/**
@@ -573,6 +573,6 @@ 
 	 * @return array An array in the form of ( LANG_CODE => LANGUAGE ).
 	 */
 	public static function get_diacritic_languages() {
-		return self::get_language_plugin_list( __DIR__ . '/diacritics/' );
+		return self::get_language_plugin_list(__DIR__ . '/diacritics/');
 	}
 }

src/bin/update-patterns.php

Spacing +9 added lines, -9 removed lines

@@ -31,31 +31,31 @@
 /**
  * Autoload parser classes
  */
-$autoload = dirname( dirname( __DIR__ ) ) . '/vendor/autoload.php';
-if ( file_exists( $autoload ) ) {
+$autoload = dirname(dirname(__DIR__)) . '/vendor/autoload.php';
+if (file_exists($autoload)) {
 	require_once $autoload;
 } else {
 	// We are a dependency of another project.
-	require_once dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . '/autoload.php';
+	require_once dirname(dirname(dirname(dirname(__DIR__)))) . '/autoload.php';
 }
 
-$target_directory = dirname( __DIR__ ) . '/lang';
-$patterns_list    = json_decode( file_get_contents( __DIR__ . '/patterns.json' ), true );
+$target_directory = dirname(__DIR__) . '/lang';
+$patterns_list    = json_decode(file_get_contents(__DIR__ . '/patterns.json'), true);
 
-foreach ( $patterns_list['list'] as $pattern ) {
+foreach ($patterns_list['list'] as $pattern) {
 	$language = $pattern['name'];
 	$url      = $pattern['url'];
 	$filename = $pattern['short'] . '.json';
 
-	$converter = new Pattern_Converter( $url, $language );
+	$converter = new Pattern_Converter($url, $language);
 
 	echo "Parsing $language TeX file and converting it to lang/$filename ..."; // phpcs: XSS ok.
 
 	try {
 		$json_pattern = $converter->convert();
-		file_put_contents( $target_directory . '/' . $filename, $json_pattern );
+		file_put_contents($target_directory . '/' . $filename, $json_pattern);
 		echo " done\n";
-	} catch ( \Exception $e ) {
+	} catch (\Exception $e) {
 		echo " error, skipping\n";
 	}
 }