mundschenk-at / php-typography

src/settings/class-dash-style.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 * @param string   $style    The dash style.
 	 * @param Settings $settings The current settings.
 	 *
-	 * @return Dashes|null Returns null in case of an invalid $style parameter.
+	 * @return Simple_Dashes|null Returns null in case of an invalid $style parameter.
 	 */
 	public static function get_styled_dashes( $style, Settings $settings ) {
 		if ( isset( self::$styles[ $style ] ) ) {

Spacing +7 added lines, -7 removed lines

@@ -46,7 +46,7 @@ 
 	/**
 	 * "International" dash style (using en dashes).
 	 */
-	const INTERNATIONAL  = 'international';
+	const INTERNATIONAL = 'international';
 
 	/**
 	 * Available dash styles.
@@ -112,13 +112,13 @@ 
 	 *
 	 * @return Dashes|null Returns null in case of an invalid $style parameter.
 	 */
-	public static function get_styled_dashes( $style, Settings $settings ) {
-		if ( isset( self::$styles[ $style ] ) ) {
+	public static function get_styled_dashes($style, Settings $settings) {
+		if (isset(self::$styles[$style])) {
 			return new Simple_Dashes(
-				self::$styles[ $style ][ self::_PARENTHETICAL ],
-				self::$styles[ $style ][ self::_PARENTHETICAL_SPACE ],
-				self::$styles[ $style ][ self::_INTERVAL ],
-				self::$styles[ $style ][ self::_INTERVAL_SPACE ]
+				self::$styles[$style][self::_PARENTHETICAL],
+				self::$styles[$style][self::_PARENTHETICAL_SPACE],
+				self::$styles[$style][self::_INTERVAL],
+				self::$styles[$style][self::_INTERVAL_SPACE]
 			);
 		}
 

src/hyphenator/class-trie-node.php

Spacing +11 added lines, -11 removed lines

@@ -67,12 +67,12 @@ 
 	 *
 	 * @return Trie_Node
 	 */
-	public function get_node( $char ) {
-		if ( ! isset( $this->links[ $char ] ) ) {
-			$this->links[ $char ] = new Trie_Node();
+	public function get_node($char) {
+		if ( ! isset($this->links[$char])) {
+			$this->links[$char] = new Trie_Node();
 		}
 
-		return $this->links[ $char ];
+		return $this->links[$char];
 	}
 
 	/**
@@ -82,8 +82,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function exists( $char ) {
-		return ! empty( $this->links[ $char ] );
+	public function exists($char) {
+		return ! empty($this->links[$char]);
 	}
 
 	/**
@@ -102,17 +102,17 @@ 
 	 *
 	 * @return Trie_Node The starting node of the trie.
 	 */
-	public static function build_trie( array $patterns ) {
+	public static function build_trie(array $patterns) {
 		$trie = new Trie_Node();
 
-		foreach ( $patterns as $key => $pattern ) {
+		foreach ($patterns as $key => $pattern) {
 			$node = $trie;
 
-			foreach ( Strings::mb_str_split( $key ) as $char ) {
-				$node = $node->get_node( $char );
+			foreach (Strings::mb_str_split($key) as $char) {
+				$node = $node->get_node($char);
 			}
 
-			preg_match_all( '/([1-9])/S', $pattern, $offsets, PREG_OFFSET_CAPTURE );
+			preg_match_all('/([1-9])/S', $pattern, $offsets, PREG_OFFSET_CAPTURE);
 			$node->offsets = $offsets[1];
 		}
 

src/class-hyphenator-cache.php

Spacing +5 added lines, -5 removed lines

@@ -48,8 +48,8 @@ 
 	 * @param string     $lang       A language code.
 	 * @param Hyphenator $hyphenator The object to cache.
 	 */
-	public function set_hyphenator( $lang, Hyphenator $hyphenator ) {
-		$this->cache[ $lang ] = $hyphenator;
+	public function set_hyphenator($lang, Hyphenator $hyphenator) {
+		$this->cache[$lang] = $hyphenator;
 	}
 
 	/**
@@ -59,9 +59,9 @@ 
 	 *
 	 * @return Hyphenator|null
 	 */
-	public function get_hyphenator( $lang ) {
-		if ( isset( $this->cache[ $lang ] ) ) {
-			return $this->cache[ $lang ];
+	public function get_hyphenator($lang) {
+		if (isset($this->cache[$lang])) {
+			return $this->cache[$lang];
 		}
 
 		return null;

src/text-parser/class-token.php

Spacing +16 added lines, -16 removed lines

@@ -79,12 +79,12 @@ 
 	 * @throws \BadMethodCallException   If the constructor is called twice.
 	 * @throws \UnexpectedValueException If the type attribute is outside the allowed range.
 	 */
-	public function __construct( $value, $type = self::WORD ) {
-		if ( false === $this->mutable ) {
-			throw new \BadMethodCallException( 'Constructor called twice.' );
+	public function __construct($value, $type = self::WORD) {
+		if (false === $this->mutable) {
+			throw new \BadMethodCallException('Constructor called twice.');
 		}
 
-		switch ( $type ) {
+		switch ($type) {
 			case self::SPACE:
 			case self::PUNCTUATION:
 			case self::WORD:
@@ -93,13 +93,13 @@ 
 				break;
 
 			default:
-				throw new \UnexpectedValueException( "Invalid type $type." );
+				throw new \UnexpectedValueException("Invalid type $type.");
 		}
 
-		if ( ! isset( $value ) || ! is_string( $value ) ) {
-			throw new \UnexpectedValueException( 'Value has to be a string.' );
+		if ( ! isset($value) || ! is_string($value)) {
+			throw new \UnexpectedValueException('Value has to be a string.');
 		} else {
-			$this->value   = $value;
+			$this->value = $value;
 		}
 
 		$this->mutable = false;
@@ -112,8 +112,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get( $property ) {
-		if ( property_exists( $this, $property ) ) {
+	public function __get($property) {
+		if (property_exists($this, $property)) {
 			return $this->$property;
 		}
 	}
@@ -127,8 +127,8 @@ 
 	 *
 	 * @throws \BadMethodCallException The Token class is immutable.
 	 */
-	public function __set( $id, $val ) {
-		throw new \BadMethodCallException( 'Object of class Text_Parser\Token is immutable.' );
+	public function __set($id, $val) {
+		throw new \BadMethodCallException('Object of class Text_Parser\Token is immutable.');
 	}
 
 	/**
@@ -139,8 +139,8 @@ 
 	 *
 	 * @throws \BadMethodCallException The Token class is immutable.
 	 */
-	public function __unset( $id ) {
-		throw new \BadMethodCallException( 'Object of class Text_Parser\Token is immutable.' );
+	public function __unset($id) {
+		throw new \BadMethodCallException('Object of class Text_Parser\Token is immutable.');
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 *
 	 * @return Token
 	 */
-	public function with_value( $value ) {
-		if ( $this->value === $value ) {
+	public function with_value($value) {
+		if ($this->value === $value) {
 			return $this;
 		}
 

src/class-arrays.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@
 	 *
 	 * @return array
 	 */
-	public static function array_map_assoc( callable $callable, array $array ) {
-		return array_column( array_map( $callable, array_keys( $array ), $array ), 1, 0 );
+	public static function array_map_assoc(callable $callable, array $array) {
+		return array_column(array_map($callable, array_keys($array), $array), 1, 0);
 	}
 }

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/bin/update-iana.php

Spacing +13 added lines, -13 removed lines

@@ -31,20 +31,20 @@ 
 /**
  * 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 ) ) {
-	$file_headers = @get_headers( $source_file );
-	if ( 'HTTP/1.0 404 Not Found' === $file_headers[0] ) {
+if ( ! file_exists($source_file)) {
+	$file_headers = @get_headers($source_file);
+	if ('HTTP/1.0 404 Not Found' === $file_headers[0]) {
 		echo "Error: unknown TLD file '{$source_file}'\n"; // xss ok.
 		die( -3 );
 	}
@@ -52,19 +52,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";
 }

src/class-dom.php

Indentation -1 removed lines

@@ -332,7 +332,6 @@
 	 * Retrieves the tag name of the nearest block-level parent.
 	 *
 	 * @param \DOMNode $element A node.
-
 	 * @return string The tag name (or the empty string).
 	 */
 	public static function get_block_parent_name( \DOMNode $element ) {

Spacing +70 added lines, -70 removed lines

@@ -48,13 +48,13 @@ 
 	 *
 	 * @return array
 	 */
-	public static function block_tags( $reset = false ) {
-		if ( empty( self::$block_tags ) || $reset ) {
+	public static function block_tags($reset = false) {
+		if (empty(self::$block_tags) || $reset) {
 			self::$block_tags = array_merge(
-				array_flip( array_filter( array_keys( \Masterminds\HTML5\Elements::$html5 ), function( $tag ) {
-					return \Masterminds\HTML5\Elements::isA( $tag, \Masterminds\HTML5\Elements::BLOCK_TAG );
-				} ) ),
-				array_flip( [ 'li', 'td', 'dt' ] ) // not included as "block tags" in current HTML5-PHP version.
+				array_flip(array_filter(array_keys(\Masterminds\HTML5\Elements::$html5), function($tag) {
+					return \Masterminds\HTML5\Elements::isA($tag, \Masterminds\HTML5\Elements::BLOCK_TAG);
+				} )),
+				array_flip(['li', 'td', 'dt']) // not included as "block tags" in current HTML5-PHP version.
 			);
 		}
 
@@ -69,11 +69,11 @@ 
 	 *
 	 * @return array An associative array in the form ( $spl_object_hash => $node ).
 	 */
-	public static function nodelist_to_array( \DOMNodeList $list ) {
+	public static function nodelist_to_array(\DOMNodeList $list) {
 		$out = [];
 
-		foreach ( $list as $node ) {
-			$out[ spl_object_hash( $node ) ] = $node;
+		foreach ($list as $node) {
+			$out[spl_object_hash($node)] = $node;
 		}
 
 		return $out;
@@ -87,10 +87,10 @@ 
 	 *
 	 * @return array An array of \DOMNode.
 	 */
-	public static function get_ancestors( \DOMNode $node ) {
+	public static function get_ancestors(\DOMNode $node) {
 		$result = [];
 
-		while ( ( $node = $node->parentNode ) && ( $node instanceof \DOMElement ) ) { // @codingStandardsIgnoreLine.
+		while (($node = $node->parentNode) && ($node instanceof \DOMElement)) { // @codingStandardsIgnoreLine.
 			$result[] = $node;
 		}
 
@@ -106,26 +106,26 @@ 
 	 *
 	 * @return boolean True if the element has any of the given class(es).
 	 */
-	public static function has_class( \DOMNode $tag, $classnames ) {
-		if ( $tag instanceof \DOMText ) {
+	public static function has_class(\DOMNode $tag, $classnames) {
+		if ($tag instanceof \DOMText) {
 			$tag = $tag->parentNode; // @codingStandardsIgnoreLine.
 		}
 
 		// Bail if we are not working with a tag or if there is no classname.
-		if ( ! ( $tag instanceof \DOMElement ) || empty( $classnames ) ) {
+		if ( ! ($tag instanceof \DOMElement) || empty($classnames)) {
 			return false;
 		}
 
 		// Ensure we always have an array of classnames.
-		if ( ! is_array( $classnames ) ) {
-			$classnames = [ $classnames ];
+		if ( ! is_array($classnames)) {
+			$classnames = [$classnames];
 		}
 
-		if ( $tag->hasAttribute( 'class' ) ) {
-			$tag_classes = array_flip( explode( ' ', $tag->getAttribute( 'class' ) ) );
+		if ($tag->hasAttribute('class')) {
+			$tag_classes = array_flip(explode(' ', $tag->getAttribute('class')));
 
-			foreach ( $classnames as $classname ) {
-				if ( isset( $tag_classes[ $classname ] ) ) {
+			foreach ($classnames as $classname) {
+				if (isset($tag_classes[$classname])) {
 					return true;
 				}
 			}
@@ -141,15 +141,15 @@ 
 	 *
 	 * @return string A single character (or the empty string).
 	 */
-	public static function get_prev_chr( \DOMNode $element ) {
-		$previous_textnode = self::get_previous_textnode( $element );
+	public static function get_prev_chr(\DOMNode $element) {
+		$previous_textnode = self::get_previous_textnode($element);
 
-		if ( isset( $previous_textnode ) && isset( $previous_textnode->data ) ) {
+		if (isset($previous_textnode) && isset($previous_textnode->data)) {
 			// First determine encoding.
-			$func = Strings::functions( $previous_textnode->data );
+			$func = Strings::functions($previous_textnode->data);
 
-			if ( ! empty( $func ) ) {
-				return preg_replace( '/\p{C}/Su', '', $func['substr']( $previous_textnode->data, - 1 ) );
+			if ( ! empty($func)) {
+				return preg_replace('/\p{C}/Su', '', $func['substr']($previous_textnode->data, - 1));
 			}
 		} // @codeCoverageIgnore
 
@@ -163,15 +163,15 @@ 
 	 *
 	 * @return string A single character (or the empty string).
 	 */
-	public static function get_next_chr( \DOMNode $element ) {
-		$next_textnode = self::get_next_textnode( $element );
+	public static function get_next_chr(\DOMNode $element) {
+		$next_textnode = self::get_next_textnode($element);
 
-		if ( isset( $next_textnode ) && isset( $next_textnode->data ) ) {
+		if (isset($next_textnode) && isset($next_textnode->data)) {
 			// First determine encoding.
-			$func = Strings::functions( $next_textnode->data );
+			$func = Strings::functions($next_textnode->data);
 
-			if ( ! empty( $func ) ) {
-				return preg_replace( '/\p{C}/Su', '', $func['substr']( $next_textnode->data, 0, 1 ) );
+			if ( ! empty($func)) {
+				return preg_replace('/\p{C}/Su', '', $func['substr']($next_textnode->data, 0, 1));
 			}
 		} // @codeCoverageIgnore
 
@@ -185,11 +185,11 @@ 
 	 *
 	 * @return \DOMText|null Null if $element is a block-level element or no text sibling exists.
 	 */
-	public static function get_previous_textnode( \DOMNode $element = null ) {
-		return self::get_adjacent_textnode( function( &$node = null ) {
+	public static function get_previous_textnode(\DOMNode $element = null) {
+		return self::get_adjacent_textnode(function(&$node = null) {
 			$node = $node->previousSibling;
-			return self::get_last_textnode( $node );
-		}, __METHOD__, $element );
+			return self::get_last_textnode($node);
+		}, __METHOD__, $element);
 	}
 
 	/**
@@ -199,11 +199,11 @@ 
 	 *
 	 * @return \DOMText|null Null if $element is a block-level element or no text sibling exists.
 	 */
-	public static function get_next_textnode( \DOMNode $element = null ) {
-		return self::get_adjacent_textnode( function( &$node = null ) {
+	public static function get_next_textnode(\DOMNode $element = null) {
+		return self::get_adjacent_textnode(function(&$node = null) {
 			$node = $node->nextSibling;
-			return self::get_first_textnode( $node );
-		}, __METHOD__, $element );
+			return self::get_first_textnode($node);
+		}, __METHOD__, $element);
 	}
 
 	/**
@@ -215,22 +215,22 @@ 
 	 *
 	 * @return \DOMText|null Null if $element is a block-level element or no text sibling exists.
 	 */
-	private static function get_adjacent_textnode( callable $iterate, callable $get_adjacent_parent, \DOMNode $element = null ) {
-		if ( ! isset( $element ) ) {
+	private static function get_adjacent_textnode(callable $iterate, callable $get_adjacent_parent, \DOMNode $element = null) {
+		if ( ! isset($element)) {
 			return null;
-		} elseif ( $element instanceof \DOMElement && isset( self::$block_tags[ $element->tagName ] ) ) {
+		} elseif ($element instanceof \DOMElement && isset(self::$block_tags[$element->tagName])) {
 			return null;
 		}
 
 		$adjacent = null;
 		$node     = $element;
 
-		while ( ! empty( $node ) && empty( $adjacent ) ) {
-			$adjacent = $iterate( $node );
+		while ( ! empty($node) && empty($adjacent)) {
+			$adjacent = $iterate($node);
 		}
 
-		if ( empty( $adjacent ) ) {
-			$adjacent = $get_adjacent_parent( $element->parentNode );
+		if (empty($adjacent)) {
+			$adjacent = $get_adjacent_parent($element->parentNode);
 		}
 
 		return $adjacent;
@@ -244,15 +244,15 @@ 
 	 *
 	 * @return \DOMText|null The first child of type \DOMText, the element itself if it is of type \DOMText or null.
 	 */
-	public static function get_first_textnode( \DOMNode $element = null, $recursive = false ) {
-		return self::get_edge_textnode( function( \DOMNodeList $children, \DOMText &$first_textnode = null ) {
+	public static function get_first_textnode(\DOMNode $element = null, $recursive = false) {
+		return self::get_edge_textnode(function(\DOMNodeList $children, \DOMText & $first_textnode = null) {
 			$i = 0;
 
-			while ( $i < $children->length && empty( $first_textnode ) ) {
-				$first_textnode = self::get_first_textnode( $children->item( $i ), true );
+			while ($i < $children->length && empty($first_textnode)) {
+				$first_textnode = self::get_first_textnode($children->item($i), true);
 				$i++;
 			}
-		}, $element, $recursive );
+		}, $element, $recursive);
 	}
 
 	/**
@@ -263,15 +263,15 @@ 
 	 *
 	 * @return \DOMText|null The last child of type \DOMText, the element itself if it is of type \DOMText or null.
 	 */
-	public static function get_last_textnode( \DOMNode $element = null, $recursive = false ) {
-		return self::get_edge_textnode( function( \DOMNodeList $children, \DOMText &$last_textnode = null ) {
+	public static function get_last_textnode(\DOMNode $element = null, $recursive = false) {
+		return self::get_edge_textnode(function(\DOMNodeList $children, \DOMText & $last_textnode = null) {
 			$i = $children->length - 1;
 
-			while ( $i >= 0 && empty( $last_textnode ) ) {
-				$last_textnode = self::get_last_textnode( $children->item( $i ), true );
+			while ($i >= 0 && empty($last_textnode)) {
+				$last_textnode = self::get_last_textnode($children->item($i), true);
 				$i--;
 			}
-		}, $element, $recursive );
+		}, $element, $recursive);
 	}
 
 	/**
@@ -285,24 +285,24 @@ 
 	 *
 	 * @return \DOMText|null The last child of type \DOMText, the element itself if it is of type \DOMText or null.
 	 */
-	private static function get_edge_textnode( callable $iteration, \DOMNode $element = null, $recursive = false ) {
-		if ( ! isset( $element ) ) {
+	private static function get_edge_textnode(callable $iteration, \DOMNode $element = null, $recursive = false) {
+		if ( ! isset($element)) {
 			return null;
 		}
 
-		if ( $element instanceof \DOMText ) {
+		if ($element instanceof \DOMText) {
 			return $element;
-		} elseif ( ! $element instanceof \DOMElement ) {
+		} elseif ( ! $element instanceof \DOMElement) {
 			// Return null if $element is neither \DOMText nor \DOMElement.
 			return null;
-		} elseif ( $recursive && isset( self::$block_tags[ $element->tagName ] ) ) {
+		} elseif ($recursive && isset(self::$block_tags[$element->tagName])) {
 			return null;
 		}
 
 		$edge_textnode = null;
 
-		if ( $element->hasChildNodes() ) {
-			$iteration( $element->childNodes, $edge_textnode );
+		if ($element->hasChildNodes()) {
+			$iteration($element->childNodes, $edge_textnode);
 		}
 
 		return $edge_textnode;
@@ -315,13 +315,13 @@ 
 	 *
 	 * @return \DOMElement|null
 	 */
-	public static function get_block_parent( \DOMNode $element ) {
+	public static function get_block_parent(\DOMNode $element) {
 		$parent = $element->parentNode;
-		if ( ! $parent instanceof \DOMElement ) {
+		if ( ! $parent instanceof \DOMElement) {
 			return null;
 		}
 
-		while ( ! isset( self::$block_tags[ $parent->tagName ] ) && ! empty( $parent->parentNode ) && $parent->parentNode instanceof \DOMElement ) {
+		while ( ! isset(self::$block_tags[$parent->tagName]) && ! empty($parent->parentNode) && $parent->parentNode instanceof \DOMElement) {
 			$parent = $parent->parentNode;
 		}
 
@@ -335,10 +335,10 @@ 
 
 	 * @return string The tag name (or the empty string).
 	 */
-	public static function get_block_parent_name( \DOMNode $element ) {
-		$parent = self::get_block_parent( $element );
+	public static function get_block_parent_name(\DOMNode $element) {
+		$parent = self::get_block_parent($element);
 
-		if ( ! empty( $parent ) ) {
+		if ( ! empty($parent)) {
 			return $parent->tagName;
 		} else {
 			return '';

src/class-text-parser.php

Spacing +64 added lines, -64 removed lines

@@ -299,28 +299,28 @@ 
 	 *
 	 * @return bool Returns `true` on successful completion, `false` otherwise.
 	 */
-	public function load( $raw_text ) {
-		if ( ! is_string( $raw_text ) ) {
+	public function load($raw_text) {
+		if ( ! is_string($raw_text)) {
 			return false; // we have an error, abort.
 		}
 
 		// Abort if a simple string exceeds 500 characters (security concern).
-		if ( preg_match( self::_RE_MAX_STRING_LENGTH, $raw_text ) ) {
+		if (preg_match(self::_RE_MAX_STRING_LENGTH, $raw_text)) {
 			return false;
 		}
 
 		// Detect encoding.
-		$str_functions = Strings::functions( $raw_text );
-		if ( empty( $str_functions ) ) {
+		$str_functions = Strings::functions($raw_text);
+		if (empty($str_functions)) {
 			return false; // unknown encoding.
 		}
 		$this->current_strtoupper = $str_functions['strtoupper'];
 
 		// Tokenize the raw text parts.
-		$this->text = self::tokenize( preg_split( self::_RE_ANY_TEXT, $raw_text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY ) );
+		$this->text = self::tokenize(preg_split(self::_RE_ANY_TEXT, $raw_text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY));
 
 		// The token array should never be empty.
-		return ! empty( $this->text );
+		return ! empty($this->text);
 	}
 
 	/**
@@ -334,23 +334,23 @@ 
 	 *         @type Token $index A token may combine several input parts.
 	 * }
 	 */
-	protected static function tokenize( array $parts ) {
+	protected static function tokenize(array $parts) {
 		$tokens = [];
 		$index  = 0;
 
-		foreach ( $parts as $part ) {
-			if ( preg_match( self::_RE_SPACE, $part ) ) {
-				$tokens[ $index ] = new Token( $part, Token::SPACE );
-			} elseif ( preg_match( self::_RE_PUNCTUATION, $part ) ) {
-				$tokens[ $index ] = new Token( $part, Token::PUNCTUATION );
-			} elseif ( preg_match( self::_RE_WORD, $part ) ) {
+		foreach ($parts as $part) {
+			if (preg_match(self::_RE_SPACE, $part)) {
+				$tokens[$index] = new Token($part, Token::SPACE);
+			} elseif (preg_match(self::_RE_PUNCTUATION, $part)) {
+				$tokens[$index] = new Token($part, Token::PUNCTUATION);
+			} elseif (preg_match(self::_RE_WORD, $part)) {
 				// Make sure that things like email addresses and URLs are not broken up
 				// into words and punctuation not preceeded by an 'other'.
-				self::parse_ambiguous_token( Token::WORD, $part, $tokens, $index );
+				self::parse_ambiguous_token(Token::WORD, $part, $tokens, $index);
 			} else {
 				// Make sure that things like email addresses and URLs are not broken up into words
 				// and punctuation not preceeded by an 'other' or 'word'.
-				self::parse_ambiguous_token( Token::OTHER, $part, $tokens, $index );
+				self::parse_ambiguous_token(Token::OTHER, $part, $tokens, $index);
 			}
 
 			$index++;
@@ -367,25 +367,25 @@ 
 	 * @param array  $tokens        The token array. Passed by reference.
 	 * @param int    $index         The current index. Passed by reference.
 	 */
-	protected static function parse_ambiguous_token( $expected_type, $part, array &$tokens, &$index ) {
+	protected static function parse_ambiguous_token($expected_type, $part, array &$tokens, &$index) {
 
 		// Make sure that things like email addresses and URLs are not broken up incorrectly.
-		if ( self::is_preceeded_by( Token::OTHER, $tokens, $index ) || ( Token::OTHER === $expected_type && self::is_preceeded_by( Token::WORD, $tokens, $index ) ) ) {
+		if (self::is_preceeded_by(Token::OTHER, $tokens, $index) || (Token::OTHER === $expected_type && self::is_preceeded_by(Token::WORD, $tokens, $index))) {
 			$index--;
-			$old_part = $tokens[ $index ]->value;
-			$tokens[ $index ] = new Token( $old_part . $part, Token::OTHER );
+			$old_part = $tokens[$index]->value;
+			$tokens[$index] = new Token($old_part . $part, Token::OTHER);
 
 		// Not preceeded by a non-space + punctuation.
-		} elseif ( self::is_preceeded_by( Token::PUNCTUATION, $tokens, $index ) && self::is_not_preceeded_by( Token::SPACE, $tokens, $index, 2 ) ) {
-			$old_part   = $tokens[ $index - 1 ]->value;
-			$older_part = $tokens[ $index - 2 ]->value;
-			$tokens[ $index - 2 ] = new Token( $older_part . $old_part . $part, Token::OTHER );
-			unset( $tokens[ $index - 1 ] );
+		} elseif (self::is_preceeded_by(Token::PUNCTUATION, $tokens, $index) && self::is_not_preceeded_by(Token::SPACE, $tokens, $index, 2)) {
+			$old_part   = $tokens[$index - 1]->value;
+			$older_part = $tokens[$index - 2]->value;
+			$tokens[$index - 2] = new Token($older_part . $old_part . $part, Token::OTHER);
+			unset($tokens[$index - 1]);
 			$index = $index - 2;
 
 		// All good.
 		} else {
-			$tokens[ $index ] = new Token( $part, $expected_type );
+			$tokens[$index] = new Token($part, $expected_type);
 		}
 	}
 
@@ -399,8 +399,8 @@ 
 	 *
 	 * @return bool
 	 */
-	protected static function is_preceeded_by( $type, array $tokens, $index, $steps = 1 ) {
-		return $index - $steps >= 0 && $type === $tokens[ $index - $steps ]->type;
+	protected static function is_preceeded_by($type, array $tokens, $index, $steps = 1) {
+		return $index - $steps >= 0 && $type === $tokens[$index - $steps]->type;
 	}
 
 	/**
@@ -413,8 +413,8 @@ 
 	 *
 	 * @return bool
 	 */
-	protected static function is_not_preceeded_by( $type, array $tokens, $index, $steps = 1 ) {
-		return $index - $steps >= 0 && $type !== $tokens[ $index - $steps ]->type;
+	protected static function is_not_preceeded_by($type, array $tokens, $index, $steps = 1) {
+		return $index - $steps >= 0 && $type !== $tokens[$index - $steps]->type;
 	}
 
 
@@ -426,7 +426,7 @@ 
 	 * @return bool Returns true on successful completion.
 	 */
 	public function reload() {
-		return $this->load( $this->unload() );
+		return $this->load($this->unload());
 	}
 
 	/**
@@ -437,7 +437,7 @@ 
 	public function unload() {
 		$reassembled_text = '';
 
-		foreach ( $this->text as $token ) {
+		foreach ($this->text as $token) {
 			$reassembled_text .= $token->value;
 		}
 
@@ -463,9 +463,9 @@ 
 	 *      @type Text_Parser\Token $index
 	 * }
 	 */
-	public function update( $tokens ) {
-		foreach ( $tokens as $index => $token ) {
-			$this->text[ $index ] = $this->text[ $index ]->with_value( $token->value );
+	public function update($tokens) {
+		foreach ($tokens as $index => $token) {
+			$this->text[$index] = $this->text[$index]->with_value($token->value);
 		}
 	}
 
@@ -484,7 +484,7 @@ 
 	 * @return array    An array of Text_Parser\Token.
 	 */
 	public function get_spaces() {
-		return $this->get_type( Token::SPACE );
+		return $this->get_type(Token::SPACE);
 	}
 
 	/**
@@ -493,7 +493,7 @@ 
 	 * @return array    An array of Text_Parser\Token.
 	 */
 	public function get_punctuation() {
-		return $this->get_type( Token::PUNCTUATION );
+		return $this->get_type(Token::PUNCTUATION);
 	}
 
 	/**
@@ -505,22 +505,22 @@ 
 	 *
 	 * @return array    An array of Text_Parser\Token.
 	 */
-	public function get_words( $abc = self::ALLOW_ALL_LETTERS, $caps = self::ALLOW_ALL_CAPS, $comps = self::ALLOW_COMPOUNDS ) {
+	public function get_words($abc = self::ALLOW_ALL_LETTERS, $caps = self::ALLOW_ALL_CAPS, $comps = self::ALLOW_COMPOUNDS) {
 		// Return early if no text has been loaded.
-		if ( ! isset( $this->text ) || ! is_callable( $this->current_strtoupper ) ) {
+		if ( ! isset($this->text) || ! is_callable($this->current_strtoupper)) {
 			return []; // abort.
 		}
 
 		// Result set.
 		$tokens = [];
 
-		foreach ( $this->get_type( Token::WORD ) as $index => $token ) {
+		foreach ($this->get_type(Token::WORD) as $index => $token) {
 
-			if ( $this->conforms_to_letters_policy( $token, $abc ) &&
-				 $this->conforms_to_caps_policy( $token, $caps ) &&
-				 $this->conforms_to_compounds_policy( $token, $comps ) ) {
+			if ($this->conforms_to_letters_policy($token, $abc) &&
+				 $this->conforms_to_caps_policy($token, $caps) &&
+				 $this->conforms_to_compounds_policy($token, $comps)) {
 
-				$tokens[ $index ] = $token;
+				$tokens[$index] = $token;
 			}
 		}
 
@@ -535,18 +535,18 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function conforms_to_letters_policy( Token $token, $policy ) {
+	protected function conforms_to_letters_policy(Token $token, $policy) {
 
 		// Short circuit.
-		if ( self::ALLOW_ALL_LETTERS === $policy ) {
+		if (self::ALLOW_ALL_LETTERS === $policy) {
 			return true;
 		}
 
-		$lettered = preg_replace( self::_RE_HTML_LETTER_CONNECTORS, '', $token->value );
+		$lettered = preg_replace(self::_RE_HTML_LETTER_CONNECTORS, '', $token->value);
 
 		return
-			( self::REQUIRE_ALL_LETTERS === $policy && $lettered === $token->value ) ||
-			( self::NO_ALL_LETTERS === $policy && $lettered !== $token->value );
+			(self::REQUIRE_ALL_LETTERS === $policy && $lettered === $token->value) ||
+			(self::NO_ALL_LETTERS === $policy && $lettered !== $token->value);
 	}
 
 	/**
@@ -557,19 +557,19 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function conforms_to_caps_policy( Token $token, $policy ) {
+	protected function conforms_to_caps_policy(Token $token, $policy) {
 
 		// Short circuit.
-		if ( self::ALLOW_ALL_CAPS === $policy ) {
+		if (self::ALLOW_ALL_CAPS === $policy) {
 			return true;
 		}
 
 		// Token value in all-caps.
-		$capped = call_user_func( $this->current_strtoupper, $token->value );
+		$capped = call_user_func($this->current_strtoupper, $token->value);
 
 		return
-			( self::REQUIRE_ALL_CAPS === $policy && $capped === $token->value ) ||
-			( self::NO_ALL_CAPS === $policy && $capped !== $token->value );
+			(self::REQUIRE_ALL_CAPS === $policy && $capped === $token->value) ||
+			(self::NO_ALL_CAPS === $policy && $capped !== $token->value);
 	}
 
 	/**
@@ -580,18 +580,18 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function conforms_to_compounds_policy( Token $token, $policy ) {
+	protected function conforms_to_compounds_policy(Token $token, $policy) {
 
 		// Short circuit.
-		if ( self::ALLOW_COMPOUNDS === $policy ) {
+		if (self::ALLOW_COMPOUNDS === $policy) {
 			return true;
 		}
 
-		$uncompound = preg_replace( '/-/S', '', $token->value );
+		$uncompound = preg_replace('/-/S', '', $token->value);
 
 		return
-			( self::REQUIRE_COMPOUNDS === $policy && $uncompound !== $token->value ) ||
-			( self::NO_COMPOUNDS === $policy && $uncompound === $token->value );
+			(self::REQUIRE_COMPOUNDS === $policy && $uncompound !== $token->value) ||
+			(self::NO_COMPOUNDS === $policy && $uncompound === $token->value);
 	}
 
 	/**
@@ -600,7 +600,7 @@ 
 	 * @return array    An array of Text_Parser\Token.
 	 */
 	public function get_other() {
-		return $this->get_type( Token::OTHER );
+		return $this->get_type(Token::OTHER);
 	}
 
 	/**
@@ -610,12 +610,12 @@ 
 	 *
 	 * @return array    An array of Text_Parser\Token.
 	 */
-	public function get_type( $type ) {
+	public function get_type($type) {
 		$tokens = [];
 
-		foreach ( $this->text as $index => $token ) {
-			if ( $token->type === $type ) {
-				$tokens[ $index ] = $token;
+		foreach ($this->text as $index => $token) {
+			if ($token->type === $type) {
+				$tokens[$index] = $token;
 			}
 		}