mundschenk-at / php-typography

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

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

Spacing +49 added lines, -49 removed lines

@@ -126,11 +126,11 @@ 
 	 *
 	 * @param bool $feed_compatible Optional. Default false.
 	 */
-	public function __construct( $feed_compatible = false ) {
-		parent::__construct( $feed_compatible );
+	public function __construct($feed_compatible = false) {
+		parent::__construct($feed_compatible);
 
-		$this->apostrophe_exception_matches      = array_keys( self::APOSTROPHE_EXCEPTIONS );
-		$this->apostrophe_exception_replacements = array_values( self::APOSTROPHE_EXCEPTIONS );
+		$this->apostrophe_exception_matches      = array_keys(self::APOSTROPHE_EXCEPTIONS);
+		$this->apostrophe_exception_replacements = array_values(self::APOSTROPHE_EXCEPTIONS);
 	}
 
 	/**
@@ -140,19 +140,19 @@ 
 	 * @param Settings $settings Required.
 	 * @param bool     $is_title Optional. Default false.
 	 */
-	public function apply( \DOMText $textnode, Settings $settings, $is_title = false ) {
-		if ( empty( $settings['smartQuotes'] ) ) {
+	public function apply(\DOMText $textnode, Settings $settings, $is_title = false) {
+		if (empty($settings['smartQuotes'])) {
 			return;
 		}
 
 		// 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;
 		}
-		$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;
 		}
 
@@ -165,63 +165,63 @@ 
 		$single_open  = $single->open();
 		$single_close = $single->close();
 
-		if ( $double != $this->cached_primary_quotes || $single != $this->cached_secondary_quotes ) { // WPCS: loose comparison ok.
-			$this->update_smart_quotes_brackets( $double_open, $double_close, $single_open, $single_close );
+		if ($double != $this->cached_primary_quotes || $single != $this->cached_secondary_quotes) { // WPCS: loose comparison ok.
+			$this->update_smart_quotes_brackets($double_open, $double_close, $single_open, $single_close);
 			$this->cached_primary_quotes   = $double;
 			$this->cached_secondary_quotes = $single;
 		}
 
 		// Before primes, handle quoted numbers (and quotes ending in numbers).
-		$textnode->data = preg_replace( self::SINGLE_QUOTED_NUMBERS, "{$single_open}\$1{$single_close}", $textnode->data );
-		$textnode->data = preg_replace( self::DOUBLE_QUOTED_NUMBERS, "{$double_open}\$1{$double_close}", $textnode->data );
+		$textnode->data = preg_replace(self::SINGLE_QUOTED_NUMBERS, "{$single_open}\$1{$single_close}", $textnode->data);
+		$textnode->data = preg_replace(self::DOUBLE_QUOTED_NUMBERS, "{$double_open}\$1{$double_close}", $textnode->data);
 
 		// Guillemets.
-		$textnode->data = str_replace( '<<',       U::GUILLEMET_OPEN,  $textnode->data );
-		$textnode->data = str_replace( '&lt;&lt;', U::GUILLEMET_OPEN,  $textnode->data );
-		$textnode->data = str_replace( '>>',       U::GUILLEMET_CLOSE, $textnode->data );
-		$textnode->data = str_replace( '&gt;&gt;', U::GUILLEMET_CLOSE, $textnode->data );
+		$textnode->data = str_replace('<<', U::GUILLEMET_OPEN, $textnode->data);
+		$textnode->data = str_replace('&lt;&lt;', U::GUILLEMET_OPEN, $textnode->data);
+		$textnode->data = str_replace('>>', U::GUILLEMET_CLOSE, $textnode->data);
+		$textnode->data = str_replace('&gt;&gt;', U::GUILLEMET_CLOSE, $textnode->data);
 
 		// Primes.
-		$textnode->data = preg_replace( self::SINGLE_DOUBLE_PRIME,           '$1' . U::SINGLE_PRIME . '$2$3' . U::DOUBLE_PRIME, $textnode->data );
-		$textnode->data = preg_replace( self::SINGLE_DOUBLE_PRIME_1_GLYPH,   '$1' . U::SINGLE_PRIME . '$2$3' . U::DOUBLE_PRIME, $textnode->data );
-		$textnode->data = preg_replace( self::DOUBLE_PRIME,                  '$1' . U::DOUBLE_PRIME,                            $textnode->data ); // should not interfere with regular quote matching.
-		$textnode->data = preg_replace( self::SINGLE_PRIME,                  '$1' . U::SINGLE_PRIME,                            $textnode->data );
-		$textnode->data = preg_replace( self::SINGLE_PRIME_COMPOUND,         '$1' . U::SINGLE_PRIME,                            $textnode->data );
-		$textnode->data = preg_replace( self::DOUBLE_PRIME_COMPOUND,         '$1' . U::DOUBLE_PRIME,                            $textnode->data );
-		$textnode->data = preg_replace( self::DOUBLE_PRIME_1_GLYPH,          '$1' . U::DOUBLE_PRIME,                            $textnode->data ); // should not interfere with regular quote matching.
-		$textnode->data = preg_replace( self::DOUBLE_PRIME_1_GLYPH_COMPOUND, '$1' . U::DOUBLE_PRIME,                            $textnode->data );
+		$textnode->data = preg_replace(self::SINGLE_DOUBLE_PRIME, '$1' . U::SINGLE_PRIME . '$2$3' . U::DOUBLE_PRIME, $textnode->data);
+		$textnode->data = preg_replace(self::SINGLE_DOUBLE_PRIME_1_GLYPH, '$1' . U::SINGLE_PRIME . '$2$3' . U::DOUBLE_PRIME, $textnode->data);
+		$textnode->data = preg_replace(self::DOUBLE_PRIME, '$1' . U::DOUBLE_PRIME, $textnode->data); // should not interfere with regular quote matching.
+		$textnode->data = preg_replace(self::SINGLE_PRIME, '$1' . U::SINGLE_PRIME, $textnode->data);
+		$textnode->data = preg_replace(self::SINGLE_PRIME_COMPOUND, '$1' . U::SINGLE_PRIME, $textnode->data);
+		$textnode->data = preg_replace(self::DOUBLE_PRIME_COMPOUND, '$1' . U::DOUBLE_PRIME, $textnode->data);
+		$textnode->data = preg_replace(self::DOUBLE_PRIME_1_GLYPH, '$1' . U::DOUBLE_PRIME, $textnode->data); // should not interfere with regular quote matching.
+		$textnode->data = preg_replace(self::DOUBLE_PRIME_1_GLYPH_COMPOUND, '$1' . U::DOUBLE_PRIME, $textnode->data);
 
 		// Backticks.
-		$textnode->data = str_replace( '``', $double_open,  $textnode->data );
-		$textnode->data = str_replace( '`',  $single_open,  $textnode->data );
-		$textnode->data = str_replace( "''", $double_close, $textnode->data );
+		$textnode->data = str_replace('``', $double_open, $textnode->data);
+		$textnode->data = str_replace('`', $single_open, $textnode->data);
+		$textnode->data = str_replace("''", $double_close, $textnode->data);
 
 		// Comma quotes.
-		$textnode->data = str_replace( ',,', U::DOUBLE_LOW_9_QUOTE, $textnode->data );
-		$textnode->data = preg_replace( self::COMMA_QUOTE, U::SINGLE_LOW_9_QUOTE, $textnode->data ); // like _,¿hola?'_.
+		$textnode->data = str_replace(',,', U::DOUBLE_LOW_9_QUOTE, $textnode->data);
+		$textnode->data = preg_replace(self::COMMA_QUOTE, U::SINGLE_LOW_9_QUOTE, $textnode->data); // like _,¿hola?'_.
 
 		// Apostrophes.
-		$textnode->data = preg_replace( self::APOSTROPHE_WORDS,   U::APOSTROPHE,        $textnode->data );
-		$textnode->data = preg_replace( self::APOSTROPHE_DECADES, U::APOSTROPHE . '$1', $textnode->data ); // decades: '98.
-		$textnode->data = str_replace( $this->apostrophe_exception_matches, $this->apostrophe_exception_replacements, $textnode->data );
+		$textnode->data = preg_replace(self::APOSTROPHE_WORDS, U::APOSTROPHE, $textnode->data);
+		$textnode->data = preg_replace(self::APOSTROPHE_DECADES, U::APOSTROPHE . '$1', $textnode->data); // decades: '98.
+		$textnode->data = str_replace($this->apostrophe_exception_matches, $this->apostrophe_exception_replacements, $textnode->data);
 
 		// Quotes.
-		$textnode->data = str_replace( $this->brackets_matches, $this->brackets_replacements, $textnode->data );
-		$textnode->data = preg_replace( self::SINGLE_QUOTE_OPEN,          $single_open,  $textnode->data );
-		$textnode->data = preg_replace( self::SINGLE_QUOTE_CLOSE,         $single_close, $textnode->data );
-		$textnode->data = preg_replace( self::SINGLE_QUOTE_OPEN_SPECIAL,  $single_open,  $textnode->data ); // like _'¿hola?'_.
-		$textnode->data = preg_replace( self::SINGLE_QUOTE_CLOSE_SPECIAL, $single_close, $textnode->data );
-		$textnode->data = preg_replace( self::DOUBLE_QUOTE_OPEN,          $double_open,  $textnode->data );
-		$textnode->data = preg_replace( self::DOUBLE_QUOTE_CLOSE,         $double_close, $textnode->data );
-		$textnode->data = preg_replace( self::DOUBLE_QUOTE_OPEN_SPECIAL,  $double_open,  $textnode->data );
-		$textnode->data = preg_replace( self::DOUBLE_QUOTE_CLOSE_SPECIAL, $double_close, $textnode->data );
+		$textnode->data = str_replace($this->brackets_matches, $this->brackets_replacements, $textnode->data);
+		$textnode->data = preg_replace(self::SINGLE_QUOTE_OPEN, $single_open, $textnode->data);
+		$textnode->data = preg_replace(self::SINGLE_QUOTE_CLOSE, $single_close, $textnode->data);
+		$textnode->data = preg_replace(self::SINGLE_QUOTE_OPEN_SPECIAL, $single_open, $textnode->data); // like _'¿hola?'_.
+		$textnode->data = preg_replace(self::SINGLE_QUOTE_CLOSE_SPECIAL, $single_close, $textnode->data);
+		$textnode->data = preg_replace(self::DOUBLE_QUOTE_OPEN, $double_open, $textnode->data);
+		$textnode->data = preg_replace(self::DOUBLE_QUOTE_CLOSE, $double_close, $textnode->data);
+		$textnode->data = preg_replace(self::DOUBLE_QUOTE_OPEN_SPECIAL, $double_open, $textnode->data);
+		$textnode->data = preg_replace(self::DOUBLE_QUOTE_CLOSE_SPECIAL, $double_close, $textnode->data);
 
 		// Quote catch-alls - assume left over quotes are closing - as this is often the most complicated position, thus most likely to be missed.
-		$textnode->data = str_replace( "'", $single_close, $textnode->data );
-		$textnode->data = str_replace( '"', $double_close, $textnode->data );
+		$textnode->data = str_replace("'", $single_close, $textnode->data);
+		$textnode->data = str_replace('"', $double_close, $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);
 	}
 
 	/**
@@ -232,7 +232,7 @@ 
 	 * @param  string $secondary_open  Secondary quote style open.
 	 * @param  string $secondary_close Secondary quote style close.
 	 */
-	private function update_smart_quotes_brackets( $primary_open, $primary_close, $secondary_open, $secondary_close ) {
+	private function update_smart_quotes_brackets($primary_open, $primary_close, $secondary_open, $secondary_close) {
 		$brackets = [
 			// Single quotes.
 			"['"  => '[' . $secondary_open,
@@ -255,7 +255,7 @@ 
 			"'\"" => $secondary_close . $primary_close,
 		];
 
-		$this->brackets_matches      = array_keys( $brackets );
-		$this->brackets_replacements = array_values( $brackets );
+		$this->brackets_matches      = array_keys($brackets);
+		$this->brackets_replacements = array_values($brackets);
 	}
 }

src/bin/class-file-operations.php

Spacing +6 added lines, -6 removed lines

@@ -39,16 +39,16 @@
 	 *
 	 * @return int
 	 */
-	public static function get_http_response_code( $url ) {
+	public static function get_http_response_code($url) {
 
 		$curl = curl_init();
-		curl_setopt_array( $curl, [
+		curl_setopt_array($curl, [
 			CURLOPT_RETURNTRANSFER => true,
 			CURLOPT_URL            => $url,
-		] );
-		curl_exec( $curl );
-		$response_code = curl_getinfo( $curl, CURLINFO_HTTP_CODE );
-		curl_close( $curl );
+		]);
+		curl_exec($curl);
+		$response_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+		curl_close($curl);
 
 		return $response_code;
 	}

src/bin/class-pattern-converter.php

Spacing +65 added lines, -65 removed lines

@@ -63,14 +63,14 @@ 
 	 * @param string $url      The TeX pattern file URL.
 	 * @param string $language A human-readable language name.
 	 */
-	public function __construct( $url, $language ) {
+	public function __construct($url, $language) {
 		$this->url      = $url;
 		$this->language = $language;
 
-		$this->word_characters = join( [
+		$this->word_characters = join([
 			"\w.'ʼ᾽ʼ᾿’",
-			Strings::uchr( 8205, 8204, 768, 769, 771, 772, 775, 776, 784, 803, 805, 814, 817 ),
-			'\p{Devanagari}' . Strings::uchr( 2385, 2386 ),
+			Strings::uchr(8205, 8204, 768, 769, 771, 772, 775, 776, 784, 803, 805, 814, 817),
+			'\p{Devanagari}' . Strings::uchr(2385, 2386),
 			'\p{Bengali}',
 			'\p{Gujarati}',
 			'\p{Gurmukhi}',
@@ -81,7 +81,7 @@ 
 			'\p{Malayalam}',
 			'\p{Thai}',
 			'-',
-		] );
+		]);
 	}
 
 	/**
@@ -90,8 +90,8 @@ 
 	 * @param string $pattern TeX hyphenation pattern.
 	 * @return string
 	 */
-	protected function get_segment( $pattern ) {
-		return preg_replace( '/[0-9]/', '', str_replace( '.', '_', $pattern ) );
+	protected function get_segment($pattern) {
+		return preg_replace('/[0-9]/', '', str_replace('.', '_', $pattern));
 	}
 
 	/**
@@ -103,31 +103,31 @@ 
 	 *
 	 * @return string
 	 */
-	protected function get_sequence( $pattern ) {
-		$characters = Strings::mb_str_split( str_replace( '.', '_', $pattern ) );
+	protected function get_sequence($pattern) {
+		$characters = Strings::mb_str_split(str_replace('.', '_', $pattern));
 		$result = [];
 
-		foreach ( $characters as $index => $chr ) {
-			if ( ctype_digit( $chr ) ) {
+		foreach ($characters as $index => $chr) {
+			if (ctype_digit($chr)) {
 				$result[] = $chr;
 			} else {
-				if ( ! isset( $characters[ $index - 1 ] ) || ! ctype_digit( $characters[ $index - 1 ] ) ) {
+				if ( ! isset($characters[$index - 1]) || ! ctype_digit($characters[$index - 1])) {
 					$result[] = '0';
 				}
 
-				if ( ! isset( $characters[ $index + 1 ] ) && ! ctype_digit( $characters[ $index ] ) ) {
+				if ( ! isset($characters[$index + 1]) && ! ctype_digit($characters[$index])) {
 					$result[] = '0';
 				}
 			}
 		}
 
 		// Do some error checking.
-		$count = count( $result );
-		$count_seg = mb_strlen( $this->get_segment( $pattern ) );
-		$sequence = implode( $result );
+		$count = count($result);
+		$count_seg = mb_strlen($this->get_segment($pattern));
+		$sequence = implode($result);
 
-		if ( $count !== $count_seg + 1 ) {
-			throw new \RangeException( "Invalid segment length $count for pattern $pattern (result sequence $sequence)." );
+		if ($count !== $count_seg + 1) {
+			throw new \RangeException("Invalid segment length $count for pattern $pattern (result sequence $sequence).");
 		}
 
 		return $sequence;
@@ -146,32 +146,32 @@ 
 	 *
 	 * @return string
 	 */
-	protected function format_results( array $patterns, array $exceptions, array $comments ) {
+	protected function format_results(array $patterns, array $exceptions, array $comments) {
 		$pattern_mapping = [];
 
-		foreach ( $patterns as $pattern ) {
-			$segment = $this->get_segment( $pattern );
+		foreach ($patterns as $pattern) {
+			$segment = $this->get_segment($pattern);
 
-			if ( ! isset( $pattern_mapping[ $segment ] ) ) {
-				$pattern_mapping[ $segment ] = $this->get_sequence( $pattern );
+			if ( ! isset($pattern_mapping[$segment])) {
+				$pattern_mapping[$segment] = $this->get_sequence($pattern);
 			}
 		}
 
 		// Produce a nice exceptions mapping.
 		$json_exceptions = [];
-		foreach ( $exceptions as $exception ) {
-			$json_exceptions[ mb_strtolower( str_replace( '-', '', $exception ) ) ] = mb_strtolower( $exception );
+		foreach ($exceptions as $exception) {
+			$json_exceptions[mb_strtolower(str_replace('-', '', $exception))] = mb_strtolower($exception);
 		}
 
 		$json_results = [
 			'language'         => $this->language,
 			'source_url'       => $this->url,
-			'copyright'        => array_map( 'rtrim', $comments ),
+			'copyright'        => array_map('rtrim', $comments),
 			'exceptions'       => $json_exceptions,
 			'patterns'         => $pattern_mapping,
 		];
 
-		return json_encode( $json_results, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE );
+		return json_encode($json_results, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
 	}
 
 	/**
@@ -188,27 +188,27 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function match_exceptions( $line, array &$exceptions ) {
-		if ( preg_match( '/^\s*([\w-]+)\s*}\s*(?:%.*)?$/u', $line, $matches ) ) {
+	protected function match_exceptions($line, array &$exceptions) {
+		if (preg_match('/^\s*([\w-]+)\s*}\s*(?:%.*)?$/u', $line, $matches)) {
 			$exceptions[] = $matches[1];
 			return false;
-		} if ( preg_match( '/^\s*((?:[\w-]+\s*)+)\s*}\s*(?:%.*)?$/u', $line, $matches ) ) {
-			$this->match_exceptions( $matches[1], $exceptions );
+		} if (preg_match('/^\s*((?:[\w-]+\s*)+)\s*}\s*(?:%.*)?$/u', $line, $matches)) {
+			$this->match_exceptions($matches[1], $exceptions);
 			return false;
-		} elseif ( preg_match( '/^\s*}\s*(?:%.*)?$/u', $line, $matches ) ) {
+		} elseif (preg_match('/^\s*}\s*(?:%.*)?$/u', $line, $matches)) {
 			return false;
-		} elseif ( preg_match( '/^\s*([\w-]+)\s*(?:%.*)?$/u',  $line, $matches ) ) {
+		} elseif (preg_match('/^\s*([\w-]+)\s*(?:%.*)?$/u', $line, $matches)) {
 			$exceptions[] = $matches[1];
-		} elseif ( preg_match( '/^\s*((?:[\w-]+\s*)+)(?:%.*)?$/u',  $line, $matches ) ) {
+		} elseif (preg_match('/^\s*((?:[\w-]+\s*)+)(?:%.*)?$/u', $line, $matches)) {
 			// Sometimes there are multiple exceptions on a single line.
-			foreach ( self::split_at_whitespace( $matches[1] ) as $match ) {
+			foreach (self::split_at_whitespace($matches[1]) as $match) {
 				$exceptions[] = $match;
 			}
-		} elseif ( preg_match( '/^\s*(?:%.*)?$/u', $line, $matches ) ) {
+		} elseif (preg_match('/^\s*(?:%.*)?$/u', $line, $matches)) {
 			// Ignore comments and whitespace in exceptions.
 			return true;
 		} else {
-			throw new \RangeException( "Error: unknown exception line $line\n" );
+			throw new \RangeException("Error: unknown exception line $line\n");
 		}
 
 		return true;
@@ -224,24 +224,24 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function match_patterns( $line, array &$patterns ) {
-		if ( preg_match( '/^\s*([' . $this->word_characters . ']+)\s*}\s*(?:%.*)?$/u', $line, $matches ) ) {
+	protected function match_patterns($line, array &$patterns) {
+		if (preg_match('/^\s*([' . $this->word_characters . ']+)\s*}\s*(?:%.*)?$/u', $line, $matches)) {
 			$patterns[] = $matches[1];
 			return false;
-		} elseif ( preg_match( '/^\s*}\s*(?:%.*)?$/u', $line, $matches ) ) {
+		} elseif (preg_match('/^\s*}\s*(?:%.*)?$/u', $line, $matches)) {
 			return false;
-		} elseif ( preg_match( '/^\s*([' . $this->word_characters . ']+)\s*(?:%.*)?$/u',  $line, $matches ) ) {
+		} elseif (preg_match('/^\s*([' . $this->word_characters . ']+)\s*(?:%.*)?$/u', $line, $matches)) {
 			$patterns[] = $matches[1];
-		} elseif ( preg_match( '/^\s*((?:[' . $this->word_characters . ']+\s*)+)(?:%.*)?$/u',  $line, $matches ) ) {
+		} elseif (preg_match('/^\s*((?:[' . $this->word_characters . ']+\s*)+)(?:%.*)?$/u', $line, $matches)) {
 			// Sometimes there are multiple patterns on a single line.
-			foreach ( self::split_at_whitespace( $matches[1] ) as $match ) {
+			foreach (self::split_at_whitespace($matches[1]) as $match) {
 				$patterns[] = $match;
 			}
-		} elseif ( preg_match( '/^\s*(?:%.*)?$/u', $line, $matches ) ) {
+		} elseif (preg_match('/^\s*(?:%.*)?$/u', $line, $matches)) {
 			// Ignore comments and whitespace in patterns.
 			return true;
 		} else {
-			throw new \RangeException( 'Error: unknown pattern line ' . htmlentities( $line, ENT_NOQUOTES | ENT_HTML5 ) . "\n" );
+			throw new \RangeException('Error: unknown pattern line ' . htmlentities($line, ENT_NOQUOTES | ENT_HTML5) . "\n");
 		}
 
 		return true;
@@ -254,8 +254,8 @@ 
 	 *
 	 * @return array
 	 */
-	private static function split_at_whitespace( $line ) {
-		return preg_split( '/\s+/Su', $line, -1, PREG_SPLIT_NO_EMPTY );
+	private static function split_at_whitespace($line) {
+		return preg_split('/\s+/Su', $line, -1, PREG_SPLIT_NO_EMPTY);
 	}
 
 	/**
@@ -267,8 +267,8 @@ 
 	 * @return string
 	 */
 	public function convert() {
-		if ( ! file_exists( $this->url ) && 404 === File_Operations::get_http_response_code( $this->url ) ) {
-			throw new \RuntimeException( "Error: unknown pattern file '{$this->url}'\n" );
+		if ( ! file_exists($this->url) && 404 === File_Operations::get_http_response_code($this->url)) {
+			throw new \RuntimeException("Error: unknown pattern file '{$this->url}'\n");
 		}
 
 		// Results.
@@ -280,36 +280,36 @@ 
 		$reading_patterns   = false;
 		$reading_exceptions = false;
 
-		$file = new \SplFileObject( $this->url );
-		while ( ! $file->eof() ) {
+		$file = new \SplFileObject($this->url);
+		while ( ! $file->eof()) {
 			$line = $file->fgets();
 
-			if ( $reading_patterns ) {
-				$reading_patterns = $this->match_patterns( $line, $patterns );
-			} elseif ( $reading_exceptions ) {
-				$reading_exceptions = $this->match_exceptions( $line, $exceptions );
+			if ($reading_patterns) {
+				$reading_patterns = $this->match_patterns($line, $patterns);
+			} elseif ($reading_exceptions) {
+				$reading_exceptions = $this->match_exceptions($line, $exceptions);
 			} else {
 				// Not a pattern & not an exception.
-				if ( preg_match( '/^\s*%.*$/u', $line, $matches ) ) {
+				if (preg_match('/^\s*%.*$/u', $line, $matches)) {
 					$comments[] = $line;
-				} elseif ( preg_match( '/^\s*\\\patterns\s*\{\s*(.*)$/u', $line, $matches ) ) {
-					$reading_patterns = $this->match_patterns( $matches[1], $patterns );
-				} elseif ( preg_match( '/^\s*\\\hyphenation\s*{\s*(.*)$/u', $line, $matches ) ) {
-					$reading_exceptions = $this->match_exceptions( $matches[1], $exceptions );
-				} elseif ( preg_match( '/^\s*\\\endinput.*$/u', $line, $matches ) ) {
+				} elseif (preg_match('/^\s*\\\patterns\s*\{\s*(.*)$/u', $line, $matches)) {
+					$reading_patterns = $this->match_patterns($matches[1], $patterns);
+				} elseif (preg_match('/^\s*\\\hyphenation\s*{\s*(.*)$/u', $line, $matches)) {
+					$reading_exceptions = $this->match_exceptions($matches[1], $exceptions);
+				} elseif (preg_match('/^\s*\\\endinput.*$/u', $line, $matches)) {
 					// Ignore this line completely.
 					continue;
-				} elseif ( preg_match( '/^\s*\\\[\w]+.*$/u', $line, $matches ) ) {
+				} elseif (preg_match('/^\s*\\\[\w]+.*$/u', $line, $matches)) {
 					// Treat other commands as comments unless we are matching exceptions or patterns.
 					$comments[] = $line;
-				} elseif ( preg_match( '/^\s*$/u', $line, $matches ) ) {
+				} elseif (preg_match('/^\s*$/u', $line, $matches)) {
 					continue; // Do nothing.
 				} else {
-					throw new \RangeException( "Error: unknown line $line\n" );
+					throw new \RangeException("Error: unknown line $line\n");
 				}
 			}
 		}
 
-		return $this->format_results( $patterns, $exceptions, $comments );
+		return $this->format_results($patterns, $exceptions, $comments);
 	}
 }

src/bin/update-iana.php

Spacing +12 added lines, -12 removed lines

@@ -31,19 +31,19 @@ 
 /**
  * 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';
 }
 
 $source_file = 'https://data.iana.org/TLD/tlds-alpha-by-domain.txt';
-$target_file = dirname( __DIR__ ) . '/IANA/tlds-alpha-by-domain.txt';
+$target_file = dirname(__DIR__) . '/IANA/tlds-alpha-by-domain.txt';
 
-if ( ! file_exists( $source_file ) ) {
-	if ( 404 === File_Operations::get_http_response_code( $source_file ) ) {
+if ( ! file_exists($source_file)) {
+	if (404 === File_Operations::get_http_response_code($source_file)) {
 		echo "Error: unknown TLD file '{$source_file}'\n";
 		die( -3 );
 	}
@@ -51,19 +51,19 @@ 
 
 try {
 	echo 'Trying to update IANA top-level domain list ...';
-	$domain_list = file_get_contents( $source_file );
+	$domain_list = file_get_contents($source_file);
 
 	// Ensure directory exists.
-	if ( ! is_dir( dirname( $target_file ) ) ) {
-		mkdir( dirname( $target_file ), 0755, true );
+	if ( ! is_dir(dirname($target_file))) {
+		mkdir(dirname($target_file), 0755, true);
 	}
 
-	$file = new \SplFileObject( $target_file, 'w' );
-	if ( 0 === $file->fwrite( $domain_list ) ) {
+	$file = new \SplFileObject($target_file, 'w');
+	if (0 === $file->fwrite($domain_list)) {
 		echo " error writing file\n";
 	} else {
 		echo " done\n";
 	}
-} catch ( \Exception $e ) {
+} catch (\Exception $e) {
 	echo " error\n";
 }