mundschenk-at / php-typography

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

src/class-settings.php

Spacing +143 added lines, -143 removed lines

@@ -98,8 +98,8 @@ 
 	 *
 	 * @param bool $set_defaults If true, set default values for various properties. Defaults to true.
 	 */
-	public function __construct( $set_defaults = true ) {
-		$this->init( $set_defaults );
+	public function __construct($set_defaults = true) {
+		$this->init($set_defaults);
 	}
 
 	/**
@@ -109,8 +109,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function &__get( $key ) {
-		return $this->data[ $key ];
+	public function &__get($key) {
+		return $this->data[$key];
 	}
 
 	/**
@@ -119,8 +119,8 @@ 
 	 * @param string $key   The settings key.
 	 * @param mixed  $value The settings value.
 	 */
-	public function __set( $key, $value ) {
-		$this->data[ $key ] = $value;
+	public function __set($key, $value) {
+		$this->data[$key] = $value;
 	}
 
 	/**
@@ -128,8 +128,8 @@ 
 	 *
 	 * @param string $key The settings key.
 	 */
-	public function __isset( $key ) {
-		return isset( $this->data[ $key ] );
+	public function __isset($key) {
+		return isset($this->data[$key]);
 	}
 
 	/**
@@ -137,8 +137,8 @@ 
 	 *
 	 * @param string $key The settings key.
 	 */
-	public function __unset( $key ) {
-		unset( $this->data[ $key ] );
+	public function __unset($key) {
+		unset($this->data[$key]);
 	}
 
 	/**
@@ -147,11 +147,11 @@ 
 	 * @param string $offset The settings key.
 	 * @param mixed  $value  The settings value.
 	 */
-	public function offsetSet( $offset, $value ) {
-		if ( is_null( $offset ) ) {
+	public function offsetSet($offset, $value) {
+		if (is_null($offset)) {
 			$this->data[] = $value;
 		} else {
-			$this->data[ $offset ] = $value;
+			$this->data[$offset] = $value;
 		}
 	}
 
@@ -160,8 +160,8 @@ 
 	 *
 	 * @param string $offset The settings key.
 	 */
-	public function offsetExists( $offset ) {
-		return isset( $this->data[ $offset ] );
+	public function offsetExists($offset) {
+		return isset($this->data[$offset]);
 	}
 
 	/**
@@ -169,8 +169,8 @@ 
 	 *
 	 * @param string $offset The settings key.
 	 */
-	public function offsetUnset( $offset ) {
-		unset( $this->data[ $offset ] );
+	public function offsetUnset($offset) {
+		unset($this->data[$offset]);
 	}
 
 	/**
@@ -180,8 +180,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function offsetGet( $offset ) {
-		return isset( $this->data[ $offset ] ) ? $this->data[ $offset ] : null;
+	public function offsetGet($offset) {
+		return isset($this->data[$offset]) ? $this->data[$offset] : null;
 	}
 
 	/**
@@ -235,21 +235,21 @@ 
 	 *
 	 * @param bool $set_defaults If true, set default values for various properties. Defaults to true.
 	 */
-	private function init( $set_defaults = true ) {
-		$this->no_break_narrow_space = U::NO_BREAK_SPACE;  // used in unit spacing - can be changed to 8239 via set_true_no_break_narrow_space.
+	private function init($set_defaults = true) {
+		$this->no_break_narrow_space = U::NO_BREAK_SPACE; // used in unit spacing - can be changed to 8239 via set_true_no_break_narrow_space.
 
-		$this->dash_style = new Settings\Simple_Dashes( U::EM_DASH, U::THIN_SPACE, U::EN_DASH, U::THIN_SPACE );
+		$this->dash_style = new Settings\Simple_Dashes(U::EM_DASH, U::THIN_SPACE, U::EN_DASH, U::THIN_SPACE);
 
-		$this->primary_quote_style   = new Settings\Simple_Quotes( U::DOUBLE_QUOTE_OPEN, U::DOUBLE_QUOTE_CLOSE );
-		$this->secondary_quote_style = new Settings\Simple_Quotes( U::SINGLE_QUOTE_OPEN, U::SINGLE_QUOTE_CLOSE );
+		$this->primary_quote_style   = new Settings\Simple_Quotes(U::DOUBLE_QUOTE_OPEN, U::DOUBLE_QUOTE_CLOSE);
+		$this->secondary_quote_style = new Settings\Simple_Quotes(U::SINGLE_QUOTE_OPEN, U::SINGLE_QUOTE_CLOSE);
 
 		// Set up some arrays for quick HTML5 introspection.
-		$this->self_closing_tags = array_filter( array_keys( \Masterminds\HTML5\Elements::$html5 ), function( $tag ) {
-			return \Masterminds\HTML5\Elements::isA( $tag, \Masterminds\HTML5\Elements::VOID_TAG );
+		$this->self_closing_tags = array_filter(array_keys(\Masterminds\HTML5\Elements::$html5), function($tag) {
+			return \Masterminds\HTML5\Elements::isA($tag, \Masterminds\HTML5\Elements::VOID_TAG);
 		} );
-		$this->inappropriate_tags = [ 'iframe', 'textarea', 'button', 'select', 'optgroup', 'option', 'map', 'style', 'head', 'title', 'script', 'applet', 'object', 'param' ];
+		$this->inappropriate_tags = ['iframe', 'textarea', 'button', 'select', 'optgroup', 'option', 'map', 'style', 'head', 'title', 'script', 'applet', 'object', 'param'];
 
-		if ( $set_defaults ) {
+		if ($set_defaults) {
 			$this->set_defaults();
 		}
 	}
@@ -325,7 +325,7 @@ 
 	 *
 	 * @param bool $on Optional. Default false.
 	 */
-	public function set_ignore_parser_errors( $on = false ) {
+	public function set_ignore_parser_errors($on = false) {
 		$this->data['parserErrorsIgnore'] = $on;
 	}
 
@@ -334,8 +334,8 @@ 
 	 *
 	 * @param callable|null $handler Optional. A callable that takes an array of error strings as its parameter. Default null.
 	 */
-	public function set_parser_errors_handler( $handler = null ) {
-		if ( ! empty( $handler ) && ! is_callable( $handler ) ) {
+	public function set_parser_errors_handler($handler = null) {
+		if ( ! empty($handler) && ! is_callable($handler)) {
 			return; // Invalid handler, abort.
 		}
 
@@ -347,9 +347,9 @@ 
 	 *
 	 * @param bool $on Optional. Default false.
 	 */
-	public function set_true_no_break_narrow_space( $on = false ) {
+	public function set_true_no_break_narrow_space($on = false) {
 
-		if ( $on ) {
+		if ($on) {
 			$this->no_break_narrow_space = U::NO_BREAK_NARROW_SPACE;
 		} else {
 			$this->no_break_narrow_space = U::NO_BREAK_SPACE;
@@ -361,12 +361,12 @@ 
 	 *
 	 * @param string|array $tags A comma separated list or an array of tag names.
 	 */
-	public function set_tags_to_ignore( $tags = [ 'code', 'head', 'kbd', 'object', 'option', 'pre', 'samp', 'script', 'noscript', 'noembed', 'select', 'style', 'textarea', 'title', 'var', 'math' ] ) {
+	public function set_tags_to_ignore($tags = ['code', 'head', 'kbd', 'object', 'option', 'pre', 'samp', 'script', 'noscript', 'noembed', 'select', 'style', 'textarea', 'title', 'var', 'math']) {
 		// Ensure that we pass only lower-case tag names to XPath.
-		$tags = array_filter( array_map( 'strtolower', Strings::maybe_split_parameters( $tags ) ), 'ctype_alnum' );
+		$tags = array_filter(array_map('strtolower', Strings::maybe_split_parameters($tags)), 'ctype_alnum');
 
 		// Self closing tags shouldn't be in $tags.
-		$this->data['ignoreTags'] = array_unique( array_merge( array_diff( $tags, $this->self_closing_tags ), $this->inappropriate_tags ) );
+		$this->data['ignoreTags'] = array_unique(array_merge(array_diff($tags, $this->self_closing_tags), $this->inappropriate_tags));
 	}
 
 	/**
@@ -374,8 +374,8 @@ 
 	 *
 	 * @param string|array $classes A comma separated list or an array of class names.
 	 */
-	public function set_classes_to_ignore( $classes = [ 'vcard', 'noTypo' ] ) {
-		$this->data['ignoreClasses'] = Strings::maybe_split_parameters( $classes );
+	public function set_classes_to_ignore($classes = ['vcard', 'noTypo']) {
+		$this->data['ignoreClasses'] = Strings::maybe_split_parameters($classes);
 	}
 
 	/**
@@ -383,8 +383,8 @@ 
 	 *
 	 * @param string|array $ids A comma separated list or an array of tag names.
 	 */
-	public function set_ids_to_ignore( $ids = [] ) {
-		$this->data['ignoreIDs'] = Strings::maybe_split_parameters( $ids );
+	public function set_ids_to_ignore($ids = []) {
+		$this->data['ignoreIDs'] = Strings::maybe_split_parameters($ids);
 	}
 
 	/**
@@ -392,7 +392,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_smart_quotes( $on = true ) {
+	public function set_smart_quotes($on = true) {
 		$this->data['smartQuotes'] = $on;
 	}
 
@@ -420,8 +420,8 @@ 
 	 *
 	 * @throws \DomainException Thrown if $style constant is invalid.
 	 */
-	public function set_smart_quotes_primary( $style = Quote_Style::DOUBLE_CURLED ) {
-		$this->primary_quote_style = $this->get_quote_style( $style );
+	public function set_smart_quotes_primary($style = Quote_Style::DOUBLE_CURLED) {
+		$this->primary_quote_style = $this->get_quote_style($style);
 	}
 
 	/**
@@ -448,8 +448,8 @@ 
 	 *
 	 * @throws \DomainException Thrown if $style constant is invalid.
 	 */
-	public function set_smart_quotes_secondary( $style = Quote_Style::SINGLE_CURLED ) {
-		$this->secondary_quote_style = $this->get_quote_style( $style );
+	public function set_smart_quotes_secondary($style = Quote_Style::SINGLE_CURLED) {
+		$this->secondary_quote_style = $this->get_quote_style($style);
 	}
 
 	/**
@@ -461,8 +461,8 @@ 
 	 *
 	 * @return Settings\Quotes
 	 */
-	protected function get_quote_style( $style ) {
-		return $this->get_style( $style, Settings\Quotes::class, [ Quote_Style::class, 'get_styled_quotes' ], 'quote' );
+	protected function get_quote_style($style) {
+		return $this->get_style($style, Settings\Quotes::class, [Quote_Style::class, 'get_styled_quotes'], 'quote');
 	}
 
 	/**
@@ -477,15 +477,15 @@ 
 	 *
 	 * @return object An instance of $expected_class.
 	 */
-	protected function get_style( $style, $expected_class, callable $get_style, $description ) {
-		if ( $style instanceof $expected_class ) {
+	protected function get_style($style, $expected_class, callable $get_style, $description) {
+		if ($style instanceof $expected_class) {
 			$object = $style;
 		} else {
-			$object = $get_style( $style, $this );
+			$object = $get_style($style, $this);
 		}
 
-		if ( empty( $object ) ) {
-			throw new \DomainException( "Invalid $description style $style." );
+		if (empty($object)) {
+			throw new \DomainException("Invalid $description style $style.");
 		}
 
 		return $object;
@@ -496,7 +496,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_smart_dashes( $on = true ) {
+	public function set_smart_dashes($on = true) {
 		$this->data['smartDashes'] = $on;
 	}
 
@@ -511,8 +511,8 @@ 
 	 *
 	 * @throws \DomainException Thrown if $style constant is invalid.
 	 */
-	public function set_smart_dashes_style( $style = Dash_Style::TRADITIONAL_US ) {
-		$this->dash_style = $this->get_style( $style, Settings\Dashes::class, [ Dash_Style::class, 'get_styled_dashes' ], 'dash' );
+	public function set_smart_dashes_style($style = Dash_Style::TRADITIONAL_US) {
+		$this->dash_style = $this->get_style($style, Settings\Dashes::class, [Dash_Style::class, 'get_styled_dashes'], 'dash');
 	}
 
 	/**
@@ -520,7 +520,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_smart_ellipses( $on = true ) {
+	public function set_smart_ellipses($on = true) {
 		$this->data['smartEllipses'] = $on;
 	}
 
@@ -529,7 +529,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_smart_diacritics( $on = true ) {
+	public function set_smart_diacritics($on = true) {
 		$this->data['smartDiacritics'] = $on;
 	}
 
@@ -538,19 +538,19 @@ 
 	 *
 	 * @param string $lang Has to correspond to a filename in 'diacritics'. Optional. Default 'en-US'.
 	 */
-	public function set_diacritic_language( $lang = 'en-US' ) {
-		if ( isset( $this->data['diacriticLanguage'] ) && $this->data['diacriticLanguage'] === $lang ) {
+	public function set_diacritic_language($lang = 'en-US') {
+		if (isset($this->data['diacriticLanguage']) && $this->data['diacriticLanguage'] === $lang) {
 			return;
 		}
 
 		$this->data['diacriticLanguage'] = $lang;
-		$language_file_name = dirname( __FILE__ ) . '/diacritics/' . $lang . '.json';
+		$language_file_name = dirname(__FILE__) . '/diacritics/' . $lang . '.json';
 
-		if ( file_exists( $language_file_name ) ) {
-			$diacritics_file = json_decode( file_get_contents( $language_file_name ), true );
+		if (file_exists($language_file_name)) {
+			$diacritics_file = json_decode(file_get_contents($language_file_name), true);
 			$this->data['diacriticWords'] = $diacritics_file['diacritic_words'];
 		} else {
-			unset( $this->data['diacriticWords'] );
+			unset($this->data['diacriticWords']);
 		}
 
 		$this->update_diacritics_replacement_arrays();
@@ -562,21 +562,21 @@ 
 	 * @param string|array $custom_replacements An array formatted [needle=>replacement, needle=>replacement...],
 	 *                                          or a string formatted `"needle"=>"replacement","needle"=>"replacement",...
 	 */
-	public function set_diacritic_custom_replacements( $custom_replacements = [] ) {
-		if ( ! is_array( $custom_replacements ) ) {
-			$custom_replacements = $this->parse_diacritics_replacement_string( $custom_replacements );
+	public function set_diacritic_custom_replacements($custom_replacements = []) {
+		if ( ! is_array($custom_replacements)) {
+			$custom_replacements = $this->parse_diacritics_replacement_string($custom_replacements);
 		}
 
-		$this->data['diacriticCustomReplacements'] = Arrays::array_map_assoc( function( $key, $replacement ) {
-			$key         = strip_tags( trim( $key ) );
-			$replacement = strip_tags( trim( $replacement ) );
+		$this->data['diacriticCustomReplacements'] = Arrays::array_map_assoc(function($key, $replacement) {
+			$key         = strip_tags(trim($key));
+			$replacement = strip_tags(trim($replacement));
 
-			if ( ! empty( $key ) && ! empty( $replacement ) ) {
-				return [ $key, $replacement ];
+			if ( ! empty($key) && ! empty($replacement)) {
+				return [$key, $replacement];
 			} else {
 				return [];
 			}
-		}, $custom_replacements );
+		}, $custom_replacements);
 
 		$this->update_diacritics_replacement_arrays();
 	}
@@ -588,21 +588,21 @@ 
 	 *
 	 * @return array
 	 */
-	private function parse_diacritics_replacement_string( $custom_replacements ) {
-		return Arrays::array_map_assoc( function( $key, $replacement ) {
+	private function parse_diacritics_replacement_string($custom_replacements) {
+		return Arrays::array_map_assoc(function($key, $replacement) {
 
 			// Account for single and double quotes in keys ...
-			if ( preg_match( '/("|\')((?:(?!\1).)+)(?:\1\s*=>)/', $replacement, $match ) ) {
+			if (preg_match('/("|\')((?:(?!\1).)+)(?:\1\s*=>)/', $replacement, $match)) {
 				$key = $match[2];
 			}
 
 			// ... and values.
-			if ( preg_match( '/(?:=>\s*("|\'))((?:(?!\1).)+)(?:\1)/', $replacement, $match ) ) {
+			if (preg_match('/(?:=>\s*("|\'))((?:(?!\1).)+)(?:\1)/', $replacement, $match)) {
 				$replacement = $match[2];
 			}
 
-			return [ $key, $replacement ];
-		}, preg_split( '/,/', $custom_replacements, -1, PREG_SPLIT_NO_EMPTY ) );
+			return [$key, $replacement];
+		}, preg_split('/,/', $custom_replacements, -1, PREG_SPLIT_NO_EMPTY));
 	}
 
 	/**
@@ -615,11 +615,11 @@ 
 		$patterns = [];
 		$replacements = [];
 
-		if ( ! empty( $this->data['diacriticCustomReplacements'] ) ) {
-			$this->parse_diacritics_rules( $this->data['diacriticCustomReplacements'], $patterns, $replacements );
+		if ( ! empty($this->data['diacriticCustomReplacements'])) {
+			$this->parse_diacritics_rules($this->data['diacriticCustomReplacements'], $patterns, $replacements);
 		}
-		if ( ! empty( $this->data['diacriticWords'] ) ) {
-			$this->parse_diacritics_rules( $this->data['diacriticWords'], $patterns, $replacements );
+		if ( ! empty($this->data['diacriticWords'])) {
+			$this->parse_diacritics_rules($this->data['diacriticWords'], $patterns, $replacements);
 		}
 
 		$this->data['diacriticReplacement'] = [
@@ -635,11 +635,11 @@ 
 	 * @param array $patterns         Resulting patterns. Passed by reference.
 	 * @param array $replacements     Resulting replacements. Passed by reference.
 	 */
-	private function parse_diacritics_rules( array $diacritics_rules, array &$patterns, array &$replacements ) {
+	private function parse_diacritics_rules(array $diacritics_rules, array &$patterns, array &$replacements) {
 
-		foreach ( $diacritics_rules as $needle => $replacement ) {
+		foreach ($diacritics_rules as $needle => $replacement) {
 			$patterns[] = '/\b(?<!\w[' . U::NO_BREAK_SPACE . U::SOFT_HYPHEN . '])' . $needle . '\b(?![' . U::NO_BREAK_SPACE . U::SOFT_HYPHEN . ']\w)/u';
-			$replacements[ $needle ] = $replacement;
+			$replacements[$needle] = $replacement;
 		}
 	}
 
@@ -648,7 +648,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_smart_marks( $on = true ) {
+	public function set_smart_marks($on = true) {
 		$this->data['smartMarks'] = $on;
 	}
 
@@ -657,7 +657,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_smart_math( $on = true ) {
+	public function set_smart_math($on = true) {
 		$this->data['smartMath'] = $on;
 	}
 
@@ -666,7 +666,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_smart_exponents( $on = true ) {
+	public function set_smart_exponents($on = true) {
 		$this->data['smartExponents'] = $on;
 	}
 
@@ -675,7 +675,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_smart_fractions( $on = true ) {
+	public function set_smart_fractions($on = true) {
 		$this->data['smartFractions'] = $on;
 	}
 
@@ -684,7 +684,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_smart_ordinal_suffix( $on = true ) {
+	public function set_smart_ordinal_suffix($on = true) {
 		$this->data['smartOrdinalSuffix'] = $on;
 	}
 
@@ -693,7 +693,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_single_character_word_spacing( $on = true ) {
+	public function set_single_character_word_spacing($on = true) {
 		$this->data['singleCharacterWordSpacing'] = $on;
 	}
 
@@ -702,7 +702,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_fraction_spacing( $on = true ) {
+	public function set_fraction_spacing($on = true) {
 		$this->data['fractionSpacing'] = $on;
 	}
 
@@ -711,7 +711,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_unit_spacing( $on = true ) {
+	public function set_unit_spacing($on = true) {
 		$this->data['unitSpacing'] = $on;
 	}
 
@@ -720,7 +720,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_numbered_abbreviation_spacing( $on = true ) {
+	public function set_numbered_abbreviation_spacing($on = true) {
 		$this->data['numberedAbbreviationSpacing'] = $on;
 	}
 
@@ -729,7 +729,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_french_punctuation_spacing( $on = true ) {
+	public function set_french_punctuation_spacing($on = true) {
 		$this->data['frenchPunctuationSpacing'] = $on;
 	}
 
@@ -738,9 +738,9 @@ 
 	 *
 	 * @param string|array $units A comma separated list or an array of units.
 	 */
-	public function set_units( $units = [] ) {
-		$this->data['units'] = Strings::maybe_split_parameters( $units );
-		$this->update_unit_pattern( $this->data['units'] );
+	public function set_units($units = []) {
+		$this->data['units'] = Strings::maybe_split_parameters($units);
+		$this->update_unit_pattern($this->data['units']);
 	}
 
 	/**
@@ -748,14 +748,14 @@ 
 	 *
 	 * @param array $units An array of unit names.
 	 */
-	private function update_unit_pattern( array $units ) {
+	private function update_unit_pattern(array $units) {
 		// Update components & regex pattern.
-		foreach ( $units as $index => $unit ) {
+		foreach ($units as $index => $unit) {
 			// Escape special chars.
-			$units[ $index ] = preg_replace( '#([\[\\\^\$\.\|\?\*\+\(\)\{\}])#', '\\\\$1', $unit );
+			$units[$index] = preg_replace('#([\[\\\^\$\.\|\?\*\+\(\)\{\}])#', '\\\\$1', $unit);
 		}
-		$this->custom_units = implode( '|', $units );
-		$this->custom_units .= ( $this->custom_units ) ? '|' : '';
+		$this->custom_units = implode('|', $units);
+		$this->custom_units .= ($this->custom_units) ? '|' : '';
 	}
 
 	/**
@@ -763,7 +763,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_dash_spacing( $on = true ) {
+	public function set_dash_spacing($on = true) {
 		$this->data['dashSpacing'] = $on;
 	}
 
@@ -772,7 +772,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_space_collapse( $on = true ) {
+	public function set_space_collapse($on = true) {
 		$this->data['spaceCollapse'] = $on;
 	}
 
@@ -781,7 +781,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_dewidow( $on = true ) {
+	public function set_dewidow($on = true) {
 		$this->data['dewidow'] = $on;
 	}
 
@@ -790,8 +790,8 @@ 
 	 *
 	 * @param int $length Defaults to 5. Trying to set the value to less than 2 resets the length to the default.
 	 */
-	public function set_max_dewidow_length( $length = 5 ) {
-		$length = ( $length > 1 ) ? $length : 5;
+	public function set_max_dewidow_length($length = 5) {
+		$length = ($length > 1) ? $length : 5;
 
 		$this->data['dewidowMaxLength'] = $length;
 	}
@@ -801,8 +801,8 @@ 
 	 *
 	 * @param int $length Defaults to 5. Trying to set the value to less than 2 resets the length to the default.
 	 */
-	public function set_max_dewidow_pull( $length = 5 ) {
-		$length = ( $length > 1 ) ? $length : 5;
+	public function set_max_dewidow_pull($length = 5) {
+		$length = ($length > 1) ? $length : 5;
 
 		$this->data['dewidowMaxPull'] = $length;
 	}
@@ -812,7 +812,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_wrap_hard_hyphens( $on = true ) {
+	public function set_wrap_hard_hyphens($on = true) {
 		$this->data['hyphenHardWrap'] = $on;
 	}
 
@@ -821,7 +821,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_url_wrap( $on = true ) {
+	public function set_url_wrap($on = true) {
 		$this->data['urlWrap'] = $on;
 	}
 
@@ -830,7 +830,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_email_wrap( $on = true ) {
+	public function set_email_wrap($on = true) {
 		$this->data['emailWrap'] = $on;
 	}
 
@@ -839,8 +839,8 @@ 
 	 *
 	 * @param int $length Defaults to 5. Trying to set the value to less than 1 resets the length to the default.
 	 */
-	public function set_min_after_url_wrap( $length = 5 ) {
-		$length = ( $length > 0 ) ? $length : 5;
+	public function set_min_after_url_wrap($length = 5) {
+		$length = ($length > 0) ? $length : 5;
 
 		$this->data['urlMinAfterWrap'] = $length;
 	}
@@ -850,7 +850,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_style_ampersands( $on = true ) {
+	public function set_style_ampersands($on = true) {
 		$this->data['styleAmpersands'] = $on;
 	}
 
@@ -859,7 +859,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_style_caps( $on = true ) {
+	public function set_style_caps($on = true) {
 		$this->data['styleCaps'] = $on;
 	}
 
@@ -868,7 +868,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_style_initial_quotes( $on = true ) {
+	public function set_style_initial_quotes($on = true) {
 		$this->data['styleInitialQuotes'] = $on;
 	}
 
@@ -877,7 +877,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_style_numbers( $on = true ) {
+	public function set_style_numbers($on = true) {
 		$this->data['styleNumbers'] = $on;
 	}
 
@@ -886,7 +886,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_style_hanging_punctuation( $on = true ) {
+	public function set_style_hanging_punctuation($on = true) {
 		$this->data['styleHangingPunctuation'] = $on;
 	}
 
@@ -895,14 +895,14 @@ 
 	 *
 	 * @param string|array $tags A comma separated list or an array of tag names.
 	 */
-	public function set_initial_quote_tags( $tags = [ 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote', 'li', 'dd', 'dt' ] ) {
+	public function set_initial_quote_tags($tags = ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote', 'li', 'dd', 'dt']) {
 		// Make array if handed a list of tags as a string.
-		if ( ! is_array( $tags ) ) {
-			$tags = preg_split( '/[^a-z0-9]+/', $tags, -1, PREG_SPLIT_NO_EMPTY );
+		if ( ! is_array($tags)) {
+			$tags = preg_split('/[^a-z0-9]+/', $tags, -1, PREG_SPLIT_NO_EMPTY);
 		}
 
 		// Store the tag array inverted (with the tagName as its index for faster lookup).
-		$this->data['initialQuoteTags'] = array_change_key_case( array_flip( $tags ), CASE_LOWER );
+		$this->data['initialQuoteTags'] = array_change_key_case(array_flip($tags), CASE_LOWER);
 	}
 
 	/**
@@ -910,7 +910,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_hyphenation( $on = true ) {
+	public function set_hyphenation($on = true) {
 		$this->data['hyphenation'] = $on;
 	}
 
@@ -919,8 +919,8 @@ 
 	 *
 	 * @param string $lang Has to correspond to a filename in 'lang'. Optional. Default 'en-US'.
 	 */
-	public function set_hyphenation_language( $lang = 'en-US' ) {
-		if ( isset( $this->data['hyphenLanguage'] ) && $this->data['hyphenLanguage'] === $lang ) {
+	public function set_hyphenation_language($lang = 'en-US') {
+		if (isset($this->data['hyphenLanguage']) && $this->data['hyphenLanguage'] === $lang) {
 			return; // Bail out, no need to do anything.
 		}
 
@@ -932,8 +932,8 @@ 
 	 *
 	 * @param int $length Defaults to 5. Trying to set the value to less than 2 resets the length to the default.
 	 */
-	public function set_min_length_hyphenation( $length = 5 ) {
-		$length = ( $length > 1 ) ? $length : 5;
+	public function set_min_length_hyphenation($length = 5) {
+		$length = ($length > 1) ? $length : 5;
 
 		$this->data['hyphenMinLength'] = $length;
 	}
@@ -943,8 +943,8 @@ 
 	 *
 	 * @param int $length Defaults to 3. Trying to set the value to less than 1 resets the length to the default.
 	 */
-	public function set_min_before_hyphenation( $length = 3 ) {
-		$length = ( $length > 0 ) ? $length : 3;
+	public function set_min_before_hyphenation($length = 3) {
+		$length = ($length > 0) ? $length : 3;
 
 		$this->data['hyphenMinBefore'] = $length;
 	}
@@ -954,8 +954,8 @@ 
 	 *
 	 * @param int $length Defaults to 2. Trying to set the value to less than 1 resets the length to the default.
 	 */
-	public function set_min_after_hyphenation( $length = 2 ) {
-		$length = ( $length > 0 ) ? $length : 2;
+	public function set_min_after_hyphenation($length = 2) {
+		$length = ($length > 0) ? $length : 2;
 
 		$this->data['hyphenMinAfter'] = $length;
 	}
@@ -965,7 +965,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_hyphenate_headings( $on = true ) {
+	public function set_hyphenate_headings($on = true) {
 		$this->data['hyphenateTitle'] = $on;
 	}
 
@@ -974,7 +974,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_hyphenate_all_caps( $on = true ) {
+	public function set_hyphenate_all_caps($on = true) {
 		$this->data['hyphenateAllCaps'] = $on;
 	}
 
@@ -983,7 +983,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_hyphenate_title_case( $on = true ) {
+	public function set_hyphenate_title_case($on = true) {
 		$this->data['hyphenateTitleCase'] = $on;
 	}
 
@@ -992,7 +992,7 @@ 
 	 *
 	 * @param bool $on Optional. Default true.
 	 */
-	public function set_hyphenate_compounds( $on = true ) {
+	public function set_hyphenate_compounds($on = true) {
 		$this->data['hyphenateCompounds'] = $on;
 	}
 
@@ -1002,8 +1002,8 @@ 
 	 * @param string|array $exceptions An array of words with all hyphenation points marked with a hard hyphen (or a string list of such words).
 	 *        In the latter case, only alphanumeric characters and hyphens are recognized. The default is empty.
 	 */
-	public function set_hyphenation_exceptions( $exceptions = [] ) {
-		$this->data['hyphenationCustomExceptions'] = Strings::maybe_split_parameters( $exceptions );
+	public function set_hyphenation_exceptions($exceptions = []) {
+		$this->data['hyphenationCustomExceptions'] = Strings::maybe_split_parameters($exceptions);
 	}
 
 	/**
@@ -1013,11 +1013,11 @@ 
 	 *
 	 * @return string A binary hash value for the current settings limited to $max_length.
 	 */
-	public function get_hash( $max_length = 16 ) {
-		$hash = md5( json_encode( $this->data ), true );
+	public function get_hash($max_length = 16) {
+		$hash = md5(json_encode($this->data), true);
 
-		if ( $max_length < strlen( $hash ) ) {
-			$hash = substr( $hash, 0, $max_length );
+		if ($max_length < strlen($hash)) {
+			$hash = substr($hash, 0, $max_length);
 		}
 
 		return $hash;

src/fixes/node-fixes/class-process-words-fix.php

Spacing +16 added lines, -16 removed lines

@@ -67,33 +67,33 @@ 
 	 * @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) {
 		// Lazy-load text parser.
-		$text_parser  = $this->get_text_parser();
+		$text_parser = $this->get_text_parser();
 		$tokens = [];
 
 		// Set up parameters for word categories.
-		$mixed_caps       = empty( $settings['hyphenateAllCaps'] ) ? Text_Parser::ALLOW_ALL_CAPS : Text_Parser::NO_ALL_CAPS;
-		$letter_caps      = empty( $settings['hyphenateAllCaps'] ) ? Text_Parser::NO_ALL_CAPS : Text_Parser::ALLOW_ALL_CAPS;
-		$mixed_compounds  = empty( $settings['hyphenateCompounds'] ) ? Text_Parser::ALLOW_COMPOUNDS : Text_Parser::NO_COMPOUNDS;
-		$letter_compounds = empty( $settings['hyphenateCompounds'] ) ? Text_Parser::NO_COMPOUNDS : Text_Parser::ALLOW_COMPOUNDS;
+		$mixed_caps       = empty($settings['hyphenateAllCaps']) ? Text_Parser::ALLOW_ALL_CAPS : Text_Parser::NO_ALL_CAPS;
+		$letter_caps      = empty($settings['hyphenateAllCaps']) ? Text_Parser::NO_ALL_CAPS : Text_Parser::ALLOW_ALL_CAPS;
+		$mixed_compounds  = empty($settings['hyphenateCompounds']) ? Text_Parser::ALLOW_COMPOUNDS : Text_Parser::NO_COMPOUNDS;
+		$letter_compounds = empty($settings['hyphenateCompounds']) ? Text_Parser::NO_COMPOUNDS : Text_Parser::ALLOW_COMPOUNDS;
 
 		// Break text down for a bit more granularity.
-		$text_parser->load( $textnode->data );
-		$tokens[ Token_Fix::MIXED_WORDS ]    = $text_parser->get_words( Text_Parser::NO_ALL_LETTERS, $mixed_caps, $mixed_compounds );  // prohibit letter-only words, allow caps, allow compounds (or not).
-		$tokens[ Token_Fix::COMPOUND_WORDS ] = ! empty( $settings['hyphenateCompounds'] ) ? $text_parser->get_words( Text_Parser::NO_ALL_LETTERS, $letter_caps, Text_Parser::REQUIRE_COMPOUNDS ) : [];
-		$tokens[ Token_Fix::WORDS ]          = $text_parser->get_words( Text_Parser::REQUIRE_ALL_LETTERS, $letter_caps, $letter_compounds ); // require letter-only words allow/prohibit caps & compounds vice-versa.
-		$tokens[ Token_Fix::OTHER ]          = $text_parser->get_other();
+		$text_parser->load($textnode->data);
+		$tokens[Token_Fix::MIXED_WORDS]    = $text_parser->get_words(Text_Parser::NO_ALL_LETTERS, $mixed_caps, $mixed_compounds); // prohibit letter-only words, allow caps, allow compounds (or not).
+		$tokens[Token_Fix::COMPOUND_WORDS] = ! empty($settings['hyphenateCompounds']) ? $text_parser->get_words(Text_Parser::NO_ALL_LETTERS, $letter_caps, Text_Parser::REQUIRE_COMPOUNDS) : [];
+		$tokens[Token_Fix::WORDS]          = $text_parser->get_words(Text_Parser::REQUIRE_ALL_LETTERS, $letter_caps, $letter_compounds); // require letter-only words allow/prohibit caps & compounds vice-versa.
+		$tokens[Token_Fix::OTHER]          = $text_parser->get_other();
 
 		// Process individual text parts here.
-		foreach ( $this->token_fixes as $fix ) {
+		foreach ($this->token_fixes as $fix) {
 			$t = $fix->target();
 
-			$tokens[ $t ] = $fix->apply( $tokens[ $t ], $settings, $is_title, $textnode );
+			$tokens[$t] = $fix->apply($tokens[$t], $settings, $is_title, $textnode);
 		}
 
 		// Apply updates to our text.
-		$text_parser->update( $tokens[ Token_Fix::MIXED_WORDS ] + $tokens[ Token_Fix::COMPOUND_WORDS ] + $tokens[ Token_Fix::WORDS ] + $tokens[ Token_Fix::OTHER ] );
+		$text_parser->update($tokens[Token_Fix::MIXED_WORDS] + $tokens[Token_Fix::COMPOUND_WORDS] + $tokens[Token_Fix::WORDS] + $tokens[Token_Fix::OTHER]);
 		$textnode->data = $text_parser->unload();
 	}
 
@@ -104,7 +104,7 @@ 
 	 */
 	public function get_text_parser() {
 		// Lazy-load text parser.
-		if ( ! isset( $this->text_parser ) ) {
+		if ( ! isset($this->text_parser)) {
 			$this->text_parser = new Text_Parser();
 		}
 
@@ -116,7 +116,7 @@ 
 	 *
 	 * @param Token_Fix $fix Required.
 	 */
-	public function register_token_fix( Token_Fix $fix ) {
+	public function register_token_fix(Token_Fix $fix) {
 		$this->token_fixes[] = $fix;
 	}
 }

src/fixes/node-fixes/class-dash-spacing-fix.php

Spacing +8 added lines, -8 removed lines

@@ -103,22 +103,22 @@ 
 	 * @param Settings $settings Required.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	public function apply( \DOMText $textnode, Settings $settings, $is_title = false ) {
-		if ( empty( $settings['dashSpacing'] ) ) {
+	public function apply(\DOMText $textnode, Settings $settings, $is_title = false) {
+		if (empty($settings['dashSpacing'])) {
 			return;
 		}
 
 		// Various special characters and regular expressions.
 		$s = $settings->dash_style();
 
-		if ( $s != $this->cached_dash_style ) { // WPCS: loose comparison ok.
-			$this->update_dash_spacing_regex( $s->parenthetical_dash(), $s->parenthetical_space(), $s->interval_dash(), $s->interval_space() );
+		if ($s != $this->cached_dash_style) { // WPCS: loose comparison ok.
+			$this->update_dash_spacing_regex($s->parenthetical_dash(), $s->parenthetical_space(), $s->interval_dash(), $s->interval_space());
 			$this->cached_dash_style = $s;
 		}
 
-		$textnode->data = preg_replace( self::EM_DASH_SPACING,             $this->em_dash_replacement,            $textnode->data );
-		$textnode->data = preg_replace( $this->parenthetical_dash_spacing, $this->parenthetical_dash_replacement, $textnode->data );
-		$textnode->data = preg_replace( $this->interval_dash_spacing,      $this->interval_dash_replacement,      $textnode->data );
+		$textnode->data = preg_replace(self::EM_DASH_SPACING, $this->em_dash_replacement, $textnode->data);
+		$textnode->data = preg_replace($this->parenthetical_dash_spacing, $this->parenthetical_dash_replacement, $textnode->data);
+		$textnode->data = preg_replace($this->interval_dash_spacing, $this->interval_dash_replacement, $textnode->data);
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 * @param string $interval            The dash character used for interval dashes.
 	 * @param string $interval_space      The space character used around interval dashes.
 	 */
-	private function update_dash_spacing_regex( $parenthetical, $parenthetical_space, $interval, $interval_space ) {
+	private function update_dash_spacing_regex($parenthetical, $parenthetical_space, $interval, $interval_space) {
 		$this->parenthetical_dash_spacing = "/
 			(?:
 				\s