mundschenk-at / php-typography

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