mundschenk-at / php-typography

src/fixes/node-fixes/class-style-initial-quotes-fix.php

Spacing +17 added lines, -17 removed lines

@@ -61,8 +61,8 @@ 
 	 * @param string $css_double      Required.
 	 * @param bool   $feed_compatible Optional. Default false.
 	 */
-	public function __construct( $css_single, $css_double, $feed_compatible = false ) {
-		parent::__construct( [ $css_single, $css_double ], $feed_compatible );
+	public function __construct($css_single, $css_double, $feed_compatible = false) {
+		parent::__construct([$css_single, $css_double], $feed_compatible);
 
 		$this->single_quote_class = $css_single;
 		$this->double_quote_class = $css_double;
@@ -75,32 +75,32 @@ 
 	 * @param Settings $settings Required.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	public function apply_internal( \DOMText $textnode, Settings $settings, $is_title = false ) {
-		if ( empty( $settings['styleInitialQuotes'] ) || empty( $settings['initialQuoteTags'] ) ) {
+	public function apply_internal(\DOMText $textnode, Settings $settings, $is_title = false) {
+		if (empty($settings['styleInitialQuotes']) || empty($settings['initialQuoteTags'])) {
 			return;
 		}
 
-		if ( '' === DOM::get_prev_chr( $textnode ) ) { // we have the first text in a block level element.
+		if ('' === DOM::get_prev_chr($textnode)) { // we have the first text in a block level element.
 
-			$func            = Strings::functions( $textnode->data );
-			$first_character = $func['substr']( $textnode->data, 0, 1 );
+			$func            = Strings::functions($textnode->data);
+			$first_character = $func['substr']($textnode->data, 0, 1);
 
-			if ( self::is_single_quote( $first_character ) || self::is_double_quote( $first_character ) ) {
-				$block_level_parent = DOM::get_block_parent_name( $textnode );
+			if (self::is_single_quote($first_character) || self::is_double_quote($first_character)) {
+				$block_level_parent = DOM::get_block_parent_name($textnode);
 
-				if ( $is_title ) {
+				if ($is_title) {
 					// Assume page title is h2.
 					$block_level_parent = 'h2';
 				}
 
-				if ( ! empty( $block_level_parent ) && isset( $settings['initialQuoteTags'][ $block_level_parent ] ) ) {
-					if ( self::is_single_quote( $first_character ) ) {
+				if ( ! empty($block_level_parent) && isset($settings['initialQuoteTags'][$block_level_parent])) {
+					if (self::is_single_quote($first_character)) {
 						$span_class = $this->single_quote_class;
 					} else {
 						$span_class = $this->double_quote_class;
 					}
 
-					$textnode->data = '<span class="' . $span_class . '">' . $first_character . '</span>' . $func['substr']( $textnode->data, 1, $func['strlen']( $textnode->data ) );
+					$textnode->data = '<span class="' . $span_class . '">' . $first_character . '</span>' . $func['substr']($textnode->data, 1, $func['strlen']($textnode->data));
 				}
 			}
 		}
@@ -113,8 +113,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private static function is_single_quote( $quote ) {
-		return ( "'" === $quote || U::SINGLE_QUOTE_OPEN === $quote || U::SINGLE_LOW_9_QUOTE === $quote || U::SINGLE_ANGLE_QUOTE_OPEN === $quote || U::SINGLE_ANGLE_QUOTE_CLOSE === $quote || ',' === $quote );
+	private static function is_single_quote($quote) {
+		return ("'" === $quote || U::SINGLE_QUOTE_OPEN === $quote || U::SINGLE_LOW_9_QUOTE === $quote || U::SINGLE_ANGLE_QUOTE_OPEN === $quote || U::SINGLE_ANGLE_QUOTE_CLOSE === $quote || ',' === $quote);
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 *
 	 * @return bool
 	 */
-	private static function is_double_quote( $quote ) {
-		return ( '"' === $quote || U::DOUBLE_QUOTE_OPEN === $quote || U::GUILLEMET_OPEN === $quote || U::GUILLEMET_CLOSE === $quote || U::DOUBLE_LOW_9_QUOTE === $quote );
+	private static function is_double_quote($quote) {
+		return ('"' === $quote || U::DOUBLE_QUOTE_OPEN === $quote || U::GUILLEMET_OPEN === $quote || U::GUILLEMET_CLOSE === $quote || U::DOUBLE_LOW_9_QUOTE === $quote);
 	}
 }

src/fixes/node-fixes/class-style-hanging-punctuation-fix.php

Spacing +16 added lines, -16 removed lines

@@ -99,8 +99,8 @@ 
 	 * @param string $pull_double_class Required.
 	 * @param bool   $feed_compatible   Optional. Default false.
 	 */
-	public function __construct( $push_single_class, $push_double_class, $pull_single_class, $pull_double_class, $feed_compatible = false ) {
-		parent::__construct( [ $pull_single_class, $pull_double_class ], $feed_compatible );
+	public function __construct($push_single_class, $push_double_class, $pull_single_class, $pull_double_class, $feed_compatible = false) {
+		parent::__construct([$pull_single_class, $pull_double_class], $feed_compatible);
 
 		$this->push_single_class = $push_single_class;
 		$this->push_double_class = $push_double_class;
@@ -115,34 +115,34 @@ 
 	 * @param Settings $settings Required.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	public function apply_internal( \DOMText $textnode, Settings $settings, $is_title = false ) {
-		if ( empty( $settings['styleHangingPunctuation'] ) ) {
+	public function apply_internal(\DOMText $textnode, Settings $settings, $is_title = false) {
+		if (empty($settings['styleHangingPunctuation'])) {
 			return;
 		}
 
 		// We need the parent.
-		$block = DOM::get_block_parent( $textnode );
-		$firstnode = ! empty( $block ) ? DOM::get_first_textnode( $block ) : null;
+		$block = DOM::get_block_parent($textnode);
+		$firstnode = ! empty($block) ? DOM::get_first_textnode($block) : null;
 
 		// Need to get context of adjacent characters outside adjacent inline tags or HTML comment
 		// if we have adjacent characters add them to the text.
-		$next_character = DOM::get_next_chr( $textnode );
-		if ( '' !== $next_character ) {
+		$next_character = DOM::get_next_chr($textnode);
+		if ('' !== $next_character) {
 			$textnode->data = $textnode->data . $next_character;
 		}
 
-		$textnode->data = preg_replace( self::STYLE_DOUBLE, '$1<span class="' . $this->push_double_class . '"></span>' . U::ZERO_WIDTH_SPACE . '<span class="' . $this->pull_double_class . '">$2</span>$3', $textnode->data );
-		$textnode->data = preg_replace( self::STYLE_SINGLE, '$1<span class="' . $this->push_single_class . '"></span>' . U::ZERO_WIDTH_SPACE . '<span class="' . $this->pull_single_class . '">$2</span>$3', $textnode->data );
+		$textnode->data = preg_replace(self::STYLE_DOUBLE, '$1<span class="' . $this->push_double_class . '"></span>' . U::ZERO_WIDTH_SPACE . '<span class="' . $this->pull_double_class . '">$2</span>$3', $textnode->data);
+		$textnode->data = preg_replace(self::STYLE_SINGLE, '$1<span class="' . $this->push_single_class . '"></span>' . U::ZERO_WIDTH_SPACE . '<span class="' . $this->pull_single_class . '">$2</span>$3', $textnode->data);
 
-		if ( empty( $block ) || $firstnode === $textnode ) {
-			$textnode->data = preg_replace( self::STYLE_INITIAL_DOUBLE, '<span class="' . $this->pull_double_class . '">$1</span>$2', $textnode->data );
-			$textnode->data = preg_replace( self::STYLE_INITIAL_SINGLE, '<span class="' . $this->pull_single_class . '">$1</span>$2', $textnode->data );
+		if (empty($block) || $firstnode === $textnode) {
+			$textnode->data = preg_replace(self::STYLE_INITIAL_DOUBLE, '<span class="' . $this->pull_double_class . '">$1</span>$2', $textnode->data);
+			$textnode->data = preg_replace(self::STYLE_INITIAL_SINGLE, '<span class="' . $this->pull_single_class . '">$1</span>$2', $textnode->data);
 		} else {
-			$textnode->data = preg_replace( self::STYLE_INITIAL_DOUBLE, '<span class="' . $this->push_double_class . '"></span>' . U::ZERO_WIDTH_SPACE . '<span class="' . $this->pull_double_class . '">$1</span>$2', $textnode->data );
-			$textnode->data = preg_replace( self::STYLE_INITIAL_SINGLE, '<span class="' . $this->push_single_class . '"></span>' . U::ZERO_WIDTH_SPACE . '<span class="' . $this->pull_single_class . '">$1</span>$2', $textnode->data );
+			$textnode->data = preg_replace(self::STYLE_INITIAL_DOUBLE, '<span class="' . $this->push_double_class . '"></span>' . U::ZERO_WIDTH_SPACE . '<span class="' . $this->pull_double_class . '">$1</span>$2', $textnode->data);
+			$textnode->data = preg_replace(self::STYLE_INITIAL_SINGLE, '<span class="' . $this->push_single_class . '"></span>' . U::ZERO_WIDTH_SPACE . '<span class="' . $this->pull_single_class . '">$1</span>$2', $textnode->data);
 		}
 
 		// Remove any added characters.
-		$textnode->data = self::remove_adjacent_characters( $textnode->data, '', $next_character );
+		$textnode->data = self::remove_adjacent_characters($textnode->data, '', $next_character);
 	}
 }

src/fixes/node-fixes/class-smart-ordinal-suffix-fix.php

Spacing +6 added lines, -6 removed lines

@@ -54,10 +54,10 @@ 
 	 * @param string|null $css_class       Optional. Default null.
 	 * @param bool        $feed_compatible Optional. Default false.
 	 */
-	public function __construct( $css_class = null, $feed_compatible = false ) {
-		parent::__construct( $feed_compatible );
+	public function __construct($css_class = null, $feed_compatible = false) {
+		parent::__construct($feed_compatible);
 
-		$ordinal_class     = empty( $css_class ) ? '' : ' class="' . $css_class . '"';
+		$ordinal_class     = empty($css_class) ? '' : ' class="' . $css_class . '"';
 		$this->replacement = "\$1<sup{$ordinal_class}>\$2</sup>";
 	}
 
@@ -68,11 +68,11 @@ 
 	 * @param Settings $settings Required.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	public function apply( \DOMText $textnode, Settings $settings, $is_title = false ) {
-		if ( empty( $settings['smartOrdinalSuffix'] ) ) {
+	public function apply(\DOMText $textnode, Settings $settings, $is_title = false) {
+		if (empty($settings['smartOrdinalSuffix'])) {
 			return;
 		}
 
-		$textnode->data = preg_replace( "/\b(\d+)(st|nd|rd|th)\b/", $this->replacement, $textnode->data );
+		$textnode->data = preg_replace("/\b(\d+)(st|nd|rd|th)\b/", $this->replacement, $textnode->data);
 	}
 }

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

Spacing +4 added lines, -4 removed lines

@@ -77,8 +77,8 @@ 
 	 *
 	 * @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);
 	}
 
 	/**
@@ -88,13 +88,13 @@ 
 	 * @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) {
 		// Update replacement with current non-breaking narrow space.
 		$this->replacement = "\$1{$settings->no_break_narrow_space()}\$2";
 
 		// Update regex with custom units.
 		$this->regex = "/(\d\.?)\s({$settings->custom_units()}" . self::_STANDARD_UNITS . ')\b/x';
 
-		parent::apply( $textnode, $settings, $is_title );
+		parent::apply($textnode, $settings, $is_title);
 	}
 }

src/fixes/node-fixes/class-french-punctuation-spacing-fix.php

Spacing +12 added lines, -12 removed lines

@@ -58,8 +58,8 @@ 
 	 * @param Settings $settings Required.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	public function apply( \DOMText $textnode, Settings $settings, $is_title = false ) {
-		if ( empty( $settings['frenchPunctuationSpacing'] ) ) {
+	public function apply(\DOMText $textnode, Settings $settings, $is_title = false) {
+		if (empty($settings['frenchPunctuationSpacing'])) {
 			return;
 		}
 
@@ -68,25 +68,25 @@ 
 
 		// Need to get context of adjacent characters outside adjacent inline tags or HTML comment
 		// if we have adjacent characters add them to the text.
-		$previous_character = DOM::get_prev_chr( $textnode );
-		if ( '' !== $previous_character ) {
+		$previous_character = DOM::get_prev_chr($textnode);
+		if ('' !== $previous_character) {
 			$textnode->data = $previous_character . $textnode->data;
 		}
 
-		$textnode->data = preg_replace( self::INSERT_SPACE_BEFORE_CLOSING_QUOTE, '$1' . $no_break_narrow_space . '$3$4', $textnode->data );
-		$textnode->data = preg_replace( self::INSERT_NARROW_SPACE,               '$1' . $no_break_narrow_space . '$3$4', $textnode->data );
-		$textnode->data = preg_replace( self::INSERT_FULL_SPACE,                 '$1' . U::NO_BREAK_SPACE . '$3$4',      $textnode->data );
-		$textnode->data = preg_replace( self::INSERT_SPACE_BEFORE_SEMICOLON,     '$1' . $no_break_narrow_space . '$3$4', $textnode->data );
+		$textnode->data = preg_replace(self::INSERT_SPACE_BEFORE_CLOSING_QUOTE, '$1' . $no_break_narrow_space . '$3$4', $textnode->data);
+		$textnode->data = preg_replace(self::INSERT_NARROW_SPACE, '$1' . $no_break_narrow_space . '$3$4', $textnode->data);
+		$textnode->data = preg_replace(self::INSERT_FULL_SPACE, '$1' . U::NO_BREAK_SPACE . '$3$4', $textnode->data);
+		$textnode->data = preg_replace(self::INSERT_SPACE_BEFORE_SEMICOLON, '$1' . $no_break_narrow_space . '$3$4', $textnode->data);
 
 		// The next rule depends on the following characters as well.
-		$next_character = DOM::get_next_chr( $textnode );
-		if ( '' !== $next_character ) {
+		$next_character = DOM::get_next_chr($textnode);
+		if ('' !== $next_character) {
 			$textnode->data = $textnode->data . $next_character;
 		}
 
-		$textnode->data = preg_replace( self::INSERT_SPACE_AFTER_OPENING_QUOTE,  '$1$2' . $no_break_narrow_space . '$4', $textnode->data );
+		$textnode->data = preg_replace(self::INSERT_SPACE_AFTER_OPENING_QUOTE, '$1$2' . $no_break_narrow_space . '$4', $textnode->data);
 
 		// If we have adjacent characters remove them from the text.
-		$textnode->data = self::remove_adjacent_characters( $textnode->data, $previous_character, $next_character );
+		$textnode->data = self::remove_adjacent_characters($textnode->data, $previous_character, $next_character);
 	}
 }

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

Spacing +16 added lines, -16 removed lines

@@ -67,23 +67,23 @@ 
 	 * @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();
 
 		/*
 		$parsed_mixed_words    = $this->wrap_hard_hyphens( $parsed_mixed_words, $settings );
@@ -94,14 +94,14 @@ 
 		*/
 
 		// 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();
 	}
 
@@ -112,7 +112,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();
 		}
 
@@ -124,7 +124,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-smart-dashes-fix.php

Spacing +14 added lines, -14 removed lines

@@ -43,7 +43,7 @@ 
 
 	// Standard dashes.
 	const PARENTHETICAL_DOUBLE_DASH = '/(\s|' . RE::HTML_SPACES . ')--(\s|' . RE::HTML_SPACES . ')/xui'; // ' -- '.
-	const PARENTHETICAL_SINGLE_DASH = '/(\s|' . RE::HTML_SPACES . ')-(\s|' . RE::HTML_SPACES . ')/xui';  // ' - '.
+	const PARENTHETICAL_SINGLE_DASH = '/(\s|' . RE::HTML_SPACES . ')-(\s|' . RE::HTML_SPACES . ')/xui'; // ' - '.
 	const EN_DASH_WORDS             = '/([\w])\-(' . U::THIN_SPACE . '|' . U::HAIR_SPACE . '|' . U::NO_BREAK_NARROW_SPACE . '|' . U::NO_BREAK_SPACE . ')/u';
 	const EN_DASH_NUMBERS           = "/(\b\d+(\.?))\-(\d+\\2)/";
 	const EN_DASH_PHONE_NUMBERS     = "/(\b\d{3})" . U::EN_DASH . "(\d{4}\b)/";
@@ -119,30 +119,30 @@ 
 	 * @param Settings $settings Required.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	public function apply( \DOMText $textnode, Settings $settings, $is_title = false ) {
-		if ( empty( $settings['smartDashes'] ) ) {
+	public function apply(\DOMText $textnode, Settings $settings, $is_title = false) {
+		if (empty($settings['smartDashes'])) {
 			return;
 		}
 
 		// Various special characters and regular expressions.
 		$s = $settings->dash_style();
 
-		$textnode->data = str_replace( '---', U::EM_DASH, $textnode->data );
-		$textnode->data = preg_replace( self::PARENTHETICAL_DOUBLE_DASH, "\$1{$s->parenthetical_dash()}\$2", $textnode->data );
-		$textnode->data = str_replace( '--', U::EN_DASH, $textnode->data );
-		$textnode->data = preg_replace( self::PARENTHETICAL_SINGLE_DASH, "\$1{$s->parenthetical_dash()}\$2", $textnode->data );
+		$textnode->data = str_replace('---', U::EM_DASH, $textnode->data);
+		$textnode->data = preg_replace(self::PARENTHETICAL_DOUBLE_DASH, "\$1{$s->parenthetical_dash()}\$2", $textnode->data);
+		$textnode->data = str_replace('--', U::EN_DASH, $textnode->data);
+		$textnode->data = preg_replace(self::PARENTHETICAL_SINGLE_DASH, "\$1{$s->parenthetical_dash()}\$2", $textnode->data);
 
-		$textnode->data = preg_replace( self::EN_DASH_WORDS ,        '$1' . U::EN_DASH . '$2',         $textnode->data );
-		$textnode->data = preg_replace( self::EN_DASH_NUMBERS,       "\$1{$s->interval_dash()}\$3",    $textnode->data );
-		$textnode->data = preg_replace( self::EN_DASH_PHONE_NUMBERS, '$1' . U::NO_BREAK_HYPHEN . '$2', $textnode->data ); // phone numbers.
-		$textnode->data = str_replace( 'xn' . U::EN_DASH,            'xn--',                           $textnode->data ); // revert messed-up punycode.
+		$textnode->data = preg_replace(self::EN_DASH_WORDS, '$1' . U::EN_DASH . '$2', $textnode->data);
+		$textnode->data = preg_replace(self::EN_DASH_NUMBERS, "\$1{$s->interval_dash()}\$3", $textnode->data);
+		$textnode->data = preg_replace(self::EN_DASH_PHONE_NUMBERS, '$1' . U::NO_BREAK_HYPHEN . '$2', $textnode->data); // phone numbers.
+		$textnode->data = str_replace('xn' . U::EN_DASH, 'xn--', $textnode->data); // revert messed-up punycode.
 
 		// Revert dates back to original formats
 		// YYYY-MM-DD.
-		$textnode->data = preg_replace( self::DATE_YYYY_MM_DD, '$1-$2-$3',     $textnode->data );
+		$textnode->data = preg_replace(self::DATE_YYYY_MM_DD, '$1-$2-$3', $textnode->data);
 		// MM-DD-YYYY or DD-MM-YYYY.
-		$textnode->data = preg_replace( self::DATE_MM_DD_YYYY, '$1$3-$2$4-$5', $textnode->data );
+		$textnode->data = preg_replace(self::DATE_MM_DD_YYYY, '$1$3-$2$4-$5', $textnode->data);
 		// YYYY-MM or YYYY-DDDD next.
-		$textnode->data = preg_replace( self::DATE_YYYY_MM,    '$1-$2',        $textnode->data );
+		$textnode->data = preg_replace(self::DATE_YYYY_MM, '$1-$2', $textnode->data);
 	}
 }

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

Spacing +9 added lines, -9 removed lines

@@ -45,24 +45,24 @@
 	 * @param Settings $settings Required.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	public function apply( \DOMText $textnode, Settings $settings, $is_title = false ) {
-		if ( empty( $settings['smartDiacritics'] ) ) {
+	public function apply(\DOMText $textnode, Settings $settings, $is_title = false) {
+		if (empty($settings['smartDiacritics'])) {
 			return; // abort.
 		}
 
-		if ( ! empty( $settings['diacriticReplacement'] ) &&
-			 ! empty( $settings['diacriticReplacement']['patterns'] ) &&
-			 ! empty( $settings['diacriticReplacement']['replacements'] ) ) {
+		if ( ! empty($settings['diacriticReplacement']) &&
+			 ! empty($settings['diacriticReplacement']['patterns']) &&
+			 ! empty($settings['diacriticReplacement']['replacements'])) {
 
 			// Uses "word" => "replacement" pairs from an array to make fast preg_* replacements.
 			$replacements = $settings['diacriticReplacement']['replacements'];
-			$textnode->data = preg_replace_callback( $settings['diacriticReplacement']['patterns'], function( $match ) use ( $replacements ) {
-				if ( isset( $replacements[ $match[0] ] ) ) {
-					return $replacements[ $match[0] ];
+			$textnode->data = preg_replace_callback($settings['diacriticReplacement']['patterns'], function($match) use ($replacements) {
+				if (isset($replacements[$match[0]])) {
+					return $replacements[$match[0]];
 				} else {
 					return $match[0];
 				}
-			}, $textnode->data );
+			}, $textnode->data);
 		}
 	}
 }

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

Spacing +8 added lines, -8 removed lines

@@ -51,7 +51,7 @@ 
 	 *
 	 * @param bool $feed_compatible Optional. Default false.
 	 */
-	public function __construct( $feed_compatible = false ) {
+	public function __construct($feed_compatible = false) {
 		$this->feed_compatible = $feed_compatible;
 	}
 
@@ -64,7 +64,7 @@ 
 	 *
 	 * @return void
 	 */
-	abstract public function apply( \DOMText $textnode, Settings $settings, $is_title = false );
+	abstract public function apply(\DOMText $textnode, Settings $settings, $is_title = false);
 
 	/**
 	 * Determines whether the fix should be applied to (RSS) feeds.
@@ -86,18 +86,18 @@ 
 	 *
 	 * @return string            The string without `$prev_char` and `$next_char`.
 	 */
-	protected static function remove_adjacent_characters( $string, $prev_char = '', $next_char = '' ) {
+	protected static function remove_adjacent_characters($string, $prev_char = '', $next_char = '') {
 		// Use the most efficient string functions.
-		$func = Strings::functions( $string );
+		$func = Strings::functions($string);
 
 		// Remove previous character.
-		if ( '' !== $prev_char ) {
-			$string = $func['substr']( $string, 1, $func['strlen']( $string ) );
+		if ('' !== $prev_char) {
+			$string = $func['substr']($string, 1, $func['strlen']($string));
 		}
 
 		// Remove next character.
-		if ( '' !== $next_char ) {
-			$string = $func['substr']( $string, 0, $func['strlen']( $string ) - 1 );
+		if ('' !== $next_char) {
+			$string = $func['substr']($string, 0, $func['strlen']($string) - 1);
 		}
 
 		return $string;