elkarte / Elkarte

sources/ElkArte/SettingsForm/SettingsFormAdapter/File.php

Spacing +1 added lines, -1 removed lines

@@ -486,7 +486,7 @@
 	{
 		// Now loop through the remaining (database-based) settings.
 		$this->configVars = array_map(
-			static function ($configVar) {
+			static function($configVar) {
 				// We just saved the file-based settings, so skip their definitions.
 				if (!is_array($configVar) || $configVar[2] === 'file')
 				{

sources/ElkArte/Search/API/Sphinxql.php

Spacing +1 added lines, -1 removed lines

@@ -275,7 +275,7 @@
 	{
 		global $modSettings;
 
-		set_error_handler(static function () { /* ignore errors */ });
+		set_error_handler(static function() { /* ignore errors */ });
 		try
 		{
 			$mySphinx = mysqli_connect(($modSettings['sphinx_searchd_server'] === 'localhost' ? '127.0.0.1' : $modSettings['sphinx_searchd_server']), '', '', '', (int) $modSettings['sphinxql_searchd_port']);

sources/ElkArte/Http/FsockFetchWebdata.php

Spacing +1 added lines, -1 removed lines

@@ -210,7 +210,7 @@
 		// no socket, then we need to open one to do much
 		if (!is_resource($this->_fp))
 		{
-			set_error_handler(static function () { /* ignore errors */ });
+			set_error_handler(static function() { /* ignore errors */ });
 			try
 			{
 				$this->_fp = fsockopen($this->_url['host'], $this->_url['port'], $errno, $errstr, 5);

sources/ElkArte/Emoji.php

Spacing +2 added lines, -2 removed lines

@@ -163,7 +163,7 @@ 
 	public function emojiFromHTML($string)
 	{
 		// If there are 4byte encoded values &#x1f123, change those back to utf8 characters
-		return preg_replace_callback(self::POSSIBLE_HTML_EMOJI, static function ($match) {
+		return preg_replace_callback(self::POSSIBLE_HTML_EMOJI, static function($match) {
 			$replace = html_entity_decode($match[0], ENT_NOQUOTES | ENT_SUBSTITUTE | ENT_HTML401, 'UTF-8');
 
 			// The Fitzpatrick Scale modifiers are not (well) supported across all graphics sets.  For now
@@ -264,7 +264,7 @@ 
 			return $string;
 		}
 
-		$result = preg_replace_callback($this->emoji_regex, function ($match) {
+		$result = preg_replace_callback($this->emoji_regex, function($match) {
 			$hex_str = $this->unicodeCharacterToNumber($match[0]);
 			$found = $this->findEmojiByCode($hex_str);
 

sources/ElkArte/Controller/MessageIndex.php

Spacing +1 added lines, -1 removed lines

@@ -777,7 +777,7 @@
 		updateTopicStats();
 		require_once(SUBSDIR . '/Messages.subs.php');
 		updateMessageStats();
-		updateSettings(['calendar_updated' => time(),]);
+		updateSettings(['calendar_updated' => time(), ]);
 
 		if (!empty($affectedBoards))
 		{

themes/default/PersonalMessage.template.php

Spacing +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
 								</div>';
 		}
 
-		$has_top_border =(!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled'])
+		$has_top_border = (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled'])
 			|| (!empty($message['member']['custom_fields']) && empty($options['show_no_signatures']) && $context['signature_enabled']);
 
 		echo '

sources/ElkArte/Menu/Menu.php

Braces +1 added lines, -2 removed lines

@@ -607,8 +607,7 @@
 		if ($subIdCheck === $subId
 			|| (empty($this->currentSubaction) && $sub->isDefault())
 			|| in_array($subIdCheck, $sub->getActive(), true)
-		)
-		{
+		) {
 			$this->currentSubaction = $subId;
 		}
 	}

sources/ElkArte/Mail/Mail.php

Spacing +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
 		global $txt;
 
 		// Try to connect to the SMTP server... if it doesn't exist, only wait three seconds.
-		set_error_handler(static function () { /* ignore errors */ });
+		set_error_handler(static function() { /* ignore errors */ });
 		try
 		{
 			$socket = fsockopen($smtp_host, $smtp_port, $errno, $errstr, 3);

sources/ext/JavaScriptMinifier.php

Spacing +110 added lines, -111 removed lines

@@ -1205,7 +1205,7 @@ 
 	 */
 	private static function ensureExpandedStates() {
 		// Already done?
-		if ( self::$expandedStates ) {
+		if (self::$expandedStates) {
 			return;
 		}
 		self::$expandedStates = true;
@@ -1213,12 +1213,12 @@ 
 		// Add copies of all states (except FUNC and GENFUNC) with negative numbers.
 		// These negative states represent states inside generator functions. When in these states,
 		// TYPE_YIELD is treated as TYPE_RETURN, otherwise as TYPE_LITERAL
-		foreach ( self::$model as $state => $transitions ) {
-			if ( $state !== self::FUNC && $state !== self::GENFUNC ) {
-				foreach ( $transitions as $tokenType => $actions ) {
-					foreach ( $actions as $action => $target ) {
-						if ( is_array( $target ) ) {
-							foreach ( $target as $subaction => $subtarget ) {
+		foreach (self::$model as $state => $transitions) {
+			if ($state !== self::FUNC && $state !== self::GENFUNC) {
+				foreach ($transitions as $tokenType => $actions) {
+					foreach ($actions as $action => $target) {
+						if (is_array($target)) {
+							foreach ($target as $subaction => $subtarget) {
 								self::$model[-$state][$tokenType][$action][$subaction] =
 									$subtarget === self::FUNC || $subtarget === true || $subtarget === self::GENFUNC
 									? $subtarget : -$subtarget;
@@ -1237,10 +1237,10 @@ 
 		self::$model[-self::PROPERTY_ASSIGNMENT][self::TYPE_BRACE_OPEN][self::ACTION_GOTO] = self::STATEMENT;
 
 		// Also add negative versions of states to the other arrays
-		foreach ( self::$semicolon as $state => $value ) {
+		foreach (self::$semicolon as $state => $value) {
 			self::$semicolon[-$state] = $value;
 		}
-		foreach ( self::$divStates as $state => $value ) {
+		foreach (self::$divStates as $state => $value) {
 			self::$divStates[-$state] = $value;
 		}
 	}
@@ -1251,8 +1251,8 @@ 
 	 * @param string $s JavaScript code to minify
 	 * @return string|bool Minified code or false on failure
 	 */
-	public static function minify( $s ) {
-		return self::minifyInternal( $s );
+	public static function minify($s) {
+		return self::minifyInternal($s);
 	}
 
 	/**
@@ -1297,14 +1297,14 @@ 
 	 * @param MappingsGenerator|null $mapGenerator
 	 * @return bool|string
 	 */
-	public static function minifyInternal( $s, $mapGenerator = null ) {
+	public static function minifyInternal($s, $mapGenerator = null) {
 		self::ensureExpandedStates();
 
 		// Here's where the minifying takes place: Loop through the input, looking for tokens
 		// and output them to $out, taking actions to the above defined rules when appropriate.
 		$out = '';
 		$pos = 0;
-		$length = strlen( $s );
+		$length = strlen($s);
 		$lineLength = 0;
 		$dotlessNum = false;
 		$lastDotlessNum = false;
@@ -1313,26 +1313,26 @@ 
 		$stack = [];
 		$topOfStack = null; // Optimization: calling end( $stack ) repeatedly is expensive
 		$last = ';'; // Pretend that we have seen a semicolon yet
-		while ( $pos < $length ) {
+		while ($pos < $length) {
 			// First, skip over any whitespace and multiline comments, recording whether we
 			// found any newline character
-			$skip = strspn( $s, " \t\n\r\xb\xc", $pos );
-			if ( !$skip ) {
+			$skip = strspn($s, " \t\n\r\xb\xc", $pos);
+			if (!$skip) {
 				$ch = $s[$pos];
-				if ( $ch === '/' && substr( $s, $pos, 2 ) === '/*' ) {
+				if ($ch === '/' && substr($s, $pos, 2) === '/*') {
 					// Multiline comment. Search for the end token or EOT.
-					$end = strpos( $s, '*/', $pos + 2 );
+					$end = strpos($s, '*/', $pos + 2);
 					$skip = $end === false ? $length - $pos : $end - $pos + 2;
 				}
 			}
-			if ( $skip ) {
+			if ($skip) {
 				// The semicolon insertion mechanism needs to know whether there was a newline
 				// between two tokens, so record it now.
-				if ( !$newlineFound && strcspn( $s, "\r\n", $pos, $skip ) !== $skip ) {
+				if (!$newlineFound && strcspn($s, "\r\n", $pos, $skip) !== $skip) {
 					$newlineFound = true;
 				}
-				if ( $mapGenerator ) {
-					$mapGenerator->consumeSource( $skip );
+				if ($mapGenerator) {
+					$mapGenerator->consumeSource($skip);
 				}
 				$pos += $skip;
 				continue;
@@ -1341,13 +1341,13 @@ 
 			// comments by the browser, regardless of whether the end tag is on the same line.
 			// Handle --> the same way, but only if it's at the beginning of the line
 			// @phan-suppress-next-line PhanPossiblyUndeclaredVariable
-			if ( ( $ch === '/' && substr( $s, $pos, 2 ) === '//' )
-				|| ( $ch === '<' && substr( $s, $pos, 4 ) === '<!--' )
-				|| ( $ch === '-' && $newlineFound && substr( $s, $pos, 3 ) === '-->' )
+			if (($ch === '/' && substr($s, $pos, 2) === '//')
+				|| ($ch === '<' && substr($s, $pos, 4) === '<!--')
+				|| ($ch === '-' && $newlineFound && substr($s, $pos, 3) === '-->')
 			) {
-				$skip = strcspn( $s, "\r\n", $pos );
-				if ( $mapGenerator ) {
-					$mapGenerator->consumeSource( $skip );
+				$skip = strcspn($s, "\r\n", $pos);
+				if ($mapGenerator) {
+					$mapGenerator->consumeSource($skip);
 				}
 				$pos += $skip;
 				continue;
@@ -1361,7 +1361,7 @@ 
 			// of any next token in the stream.
 			$end = $pos + 1;
 			// Handle string literals
-			if ( $ch === "'" || $ch === '"' ) {
+			if ($ch === "'" || $ch === '"') {
 				// Search to the end of the string literal, skipping over backslash escapes
 				$search = $ch . '\\';
 				do {
@@ -1369,13 +1369,13 @@ 
 					// the next iteration will start 2 characters further (one for the
 					// backslash, one for the escaped character).
 					// We'll correct this outside the loop.
-					$end += strcspn( $s, $search, $end ) + 2;
+					$end += strcspn($s, $search, $end) + 2;
 					// If the last character in our search for a quote or a backlash
 					// matched a backslash and we haven't reached the end, keep searching..
-				} while ( $end - 2 < $length && $s[$end - 2] === '\\' );
+				} while ($end - 2 < $length && $s[$end - 2] === '\\');
 				// Correction (1): Undo speculative add, keep only one (end of string literal)
 				$end--;
-				if ( $end > $length ) {
+				if ($end > $length) {
 					// Correction (2): Loop wrongly assumed an end quote ended the search,
 					// but search ended because we've reached the end. Correct $end.
 					// TODO: This is invalid and should throw.
@@ -1384,33 +1384,33 @@ 
 
 			// Handle template strings, either from "`" to begin a new string,
 			// or continuation after the "}" that ends a "${"-expression.
-			} elseif ( $ch === '`' || ( $ch === '}' && $topOfStack === self::TEMPLATE_STRING_TAIL ) ) {
-				if ( $ch === '}' ) {
+			} elseif ($ch === '`' || ($ch === '}' && $topOfStack === self::TEMPLATE_STRING_TAIL)) {
+				if ($ch === '}') {
 					// Pop the TEMPLATE_STRING_TAIL state off the stack
 					// We don't let it get popped off the stack the normal way, to avoid the newline
 					// and comment stripping code above running on the continuation of the literal
-					array_pop( $stack );
+					array_pop($stack);
 					// Also pop the previous state off the stack
-					$state = array_pop( $stack );
-					$topOfStack = end( $stack );
+					$state = array_pop($stack);
+					$topOfStack = end($stack);
 				}
 				// Search until we reach either a closing ` or a ${, skipping over backslash escapes
 				// and $ characters followed by something other than { or `
 				do {
-					$end += strcspn( $s, '`$\\', $end ) + 1;
-					if ( $end - 1 < $length && $s[$end - 1] === '`' ) {
+					$end += strcspn($s, '`$\\', $end) + 1;
+					if ($end - 1 < $length && $s[$end - 1] === '`') {
 						// End of the string, stop
 						// We don't do this in the while() condition because the $end++ in the
 						// backslash escape branch makes it difficult to do so without incorrectly
 						// considering an escaped backtick (\`) the end of the string
 						break;
 					}
-					if ( $end - 1 < $length && $s[$end - 1] === '\\' ) {
+					if ($end - 1 < $length && $s[$end - 1] === '\\') {
 						// Backslash escape. Skip the next character, and keep going
 						$end++;
 						continue;
 					}
-					if ( $end < $length && $s[$end - 1] === '$' && $s[$end] === '{' ) {
+					if ($end < $length && $s[$end - 1] === '$' && $s[$end] === '{') {
 						// Beginning of an expression in ${ ... }. Skip the {, and stop
 						$end++;
 						// Push the current state to the stack. We'll pop this off later when hitting
@@ -1423,8 +1423,8 @@ 
 						$state = self::TEMPLATE_STRING_HEAD;
 						break;
 					}
-				} while ( $end - 1 < $length );
-				if ( $end > $length ) {
+				} while ($end - 1 < $length);
+				if ($end > $length) {
 					// Loop wrongly assumed an end quote or ${ ended the search,
 					// but search ended because we've reached the end. Correct $end.
 					// TODO: This is invalid and should throw.
@@ -1433,28 +1433,28 @@ 
 
 			// We have to distinguish between regexp literals and division operators
 			// A division operator is only possible in certain states
-			} elseif ( $ch === '/' && !isset( self::$divStates[$state] ) ) {
+			} elseif ($ch === '/' && !isset(self::$divStates[$state])) {
 				// Regexp literal
-				for ( ; ; ) {
+				for (;;) {
 					// Search until we find "/" (end of regexp), "\" (backslash escapes),
 					// or "[" (start of character classes).
 					do {
 						// Speculatively add 2 to ensure next iteration skips
 						// over backslash and escaped character.
 						// We'll correct this outside the loop.
-						$end += strcspn( $s, '/[\\', $end ) + 2;
+						$end += strcspn($s, '/[\\', $end) + 2;
 						// If backslash escape, keep searching...
-					} while ( $end - 2 < $length && $s[$end - 2] === '\\' );
+					} while ($end - 2 < $length && $s[$end - 2] === '\\');
 					// Correction (1): Undo speculative add, keep only one (end of regexp)
 					$end--;
-					if ( $end > $length ) {
+					if ($end > $length) {
 						// Correction (2): Loop wrongly assumed end slash was seen
 						// String ended without end of regexp. Correct $end.
 						// TODO: This is invalid and should throw.
 						$end--;
 						break;
 					}
-					if ( $s[$end - 1] === '/' ) {
+					if ($s[$end - 1] === '/') {
 						break;
 					}
 					// (Implicit else), we must've found the start of a char class,
@@ -1462,12 +1462,12 @@ 
 					do {
 						// Speculatively add 2 for backslash escape.
 						// We'll substract one outside the loop.
-						$end += strcspn( $s, ']\\', $end ) + 2;
+						$end += strcspn($s, ']\\', $end) + 2;
 						// If backslash escape, keep searching...
-					} while ( $end - 2 < $length && $s[$end - 2] === '\\' );
+					} while ($end - 2 < $length && $s[$end - 2] === '\\');
 					// Correction (1): Undo speculative add, keep only one (end of regexp)
 					$end--;
-					if ( $end > $length ) {
+					if ($end > $length) {
 						// Correction (2): Loop wrongly assumed "]" was seen
 						// String ended without ending char class or regexp. Correct $end.
 						// TODO: This is invalid and should throw.
@@ -1476,21 +1476,21 @@ 
 					}
 				}
 				// Search past the regexp modifiers (gi)
-				while ( $end < $length && ctype_alpha( $s[$end] ) ) {
+				while ($end < $length && ctype_alpha($s[$end])) {
 					$end++;
 				}
 			} elseif (
 				$ch === '0'
-				&& ( $pos + 1 < $length ) && ( $s[$pos + 1] === 'x' || $s[$pos + 1] === 'X' )
+				&& ($pos + 1 < $length) && ($s[$pos + 1] === 'x' || $s[$pos + 1] === 'X')
 			) {
 				// Hex numeric literal
 				$end++; // x or X
-				$len = strspn( $s, '0123456789ABCDEFabcdef', $end );
-				if ( !$len ) {
+				$len = strspn($s, '0123456789ABCDEFabcdef', $end);
+				if (!$len) {
 					return self::parseError(
 						$s,
 						$pos,
-						'Expected a hexadecimal number but found ' . substr( $s, $pos, 5 ) . '...'
+						'Expected a hexadecimal number but found ' . substr($s, $pos, 5) . '...'
 					);
 				}
 				$end += $len;
@@ -1501,30 +1501,30 @@ 
 				// numbers, and exponents (e.g. strings like "+012.34e6"). But, it is fine here
 				// because we know $ch is a single character, and we believe the only single
 				// characters that is_numeric() accepts are ASCII digits 0-9.
-				is_numeric( $ch )
-				|| ( $ch === '.' && $pos + 1 < $length && is_numeric( $s[$pos + 1] ) )
+				is_numeric($ch)
+				|| ($ch === '.' && $pos + 1 < $length && is_numeric($s[$pos + 1]))
 			) {
-				$end += strspn( $s, '0123456789', $end );
-				$decimal = strspn( $s, '.', $end );
-				if ( $decimal ) {
-					if ( $decimal > 2 ) {
-						return self::parseError( $s, $end, 'The number has too many decimal points' );
+				$end += strspn($s, '0123456789', $end);
+				$decimal = strspn($s, '.', $end);
+				if ($decimal) {
+					if ($decimal > 2) {
+						return self::parseError($s, $end, 'The number has too many decimal points');
 					}
-					$end += strspn( $s, '0123456789', $end + 1 ) + $decimal;
+					$end += strspn($s, '0123456789', $end + 1) + $decimal;
 				} else {
 					$dotlessNum = true;
 				}
-				$exponent = strspn( $s, 'eE', $end );
-				if ( $exponent ) {
-					if ( $exponent > 1 ) {
-						return self::parseError( $s, $end, 'Number with several E' );
+				$exponent = strspn($s, 'eE', $end);
+				if ($exponent) {
+					if ($exponent > 1) {
+						return self::parseError($s, $end, 'Number with several E');
 					}
 					$end++;
 
 					// + sign is optional; - sign is required.
-					$end += strspn( $s, '-+', $end );
-					$len = strspn( $s, '0123456789', $end );
-					if ( !$len ) {
+					$end += strspn($s, '-+', $end);
+					$len = strspn($s, '0123456789', $end);
+					if (!$len) {
 						return self::parseError(
 							$s,
 							$pos,
@@ -1533,12 +1533,12 @@ 
 					}
 					$end += $len;
 				}
-			} elseif ( isset( self::$opChars[$ch] ) ) {
+			} elseif (isset(self::$opChars[$ch])) {
 				// Punctuation character. Search for the longest matching operator.
-				for ( $tokenLength = self::LONGEST_PUNCTUATION_TOKEN; $tokenLength > 1; $tokenLength-- ) {
+				for ($tokenLength = self::LONGEST_PUNCTUATION_TOKEN; $tokenLength > 1; $tokenLength--) {
 					if (
 						$pos + $tokenLength <= $length &&
-						isset( self::$tokenTypes[ substr( $s, $pos, $tokenLength ) ] )
+						isset(self::$tokenTypes[substr($s, $pos, $tokenLength)])
 					) {
 						$end = $pos + $tokenLength;
 						break;
@@ -1547,29 +1547,29 @@ 
 			} else {
 				// Identifier or reserved word. Search for the end by excluding whitespace and
 				// punctuation.
-				$end += strcspn( $s, " \t\n.;,=<>+-{}()[]?:*/%'\"`!&|^~\xb\xc\r", $end );
+				$end += strcspn($s, " \t\n.;,=<>+-{}()[]?:*/%'\"`!&|^~\xb\xc\r", $end);
 			}
 
 			// Now get the token type from our type array
-			$token = substr( $s, $pos, $end - $pos ); // so $end - $pos == strlen( $token )
-			$type = isset( self::$model[$state][self::TYPE_SPECIAL][$token] )
+			$token = substr($s, $pos, $end - $pos); // so $end - $pos == strlen( $token )
+			$type = isset(self::$model[$state][self::TYPE_SPECIAL][$token])
 				? self::TYPE_SPECIAL
 				: self::$tokenTypes[$token] ?? self::TYPE_LITERAL;
-			if ( $type === self::TYPE_YIELD ) {
+			if ($type === self::TYPE_YIELD) {
 				// yield is treated as TYPE_RETURN inside a generator function (negative state)
 				// but as TYPE_LITERAL when not in a generator function (positive state)
 				$type = $state < 0 ? self::TYPE_RETURN : self::TYPE_LITERAL;
 			}
 
 			$pad = '';
-			if ( $newlineFound && isset( self::$semicolon[$state][$type] ) ) {
+			if ($newlineFound && isset(self::$semicolon[$state][$type])) {
 				// This token triggers the semicolon insertion mechanism of javascript. While we
 				// could add the ; token here ourselves, keeping the newline has a few advantages.
 				$pad = "\n";
 				$state = $state < 0 ? -self::STATEMENT : self::STATEMENT;
 				$lineLength = 0;
-			} elseif ( $lineLength + $end - $pos > self::$maxLineLength &&
-				!isset( self::$semicolon[$state][$type] ) &&
+			} elseif ($lineLength + $end - $pos > self::$maxLineLength &&
+				!isset(self::$semicolon[$state][$type]) &&
 				$type !== self::TYPE_INCR_OP &&
 				$type !== self::TYPE_ARROW
 			) {
@@ -1580,27 +1580,27 @@ 
 				$pad = "\n";
 				$lineLength = 0;
 			// Check, whether we have to separate the token from the last one with whitespace
-			} elseif ( !isset( self::$opChars[$last] ) && !isset( self::$opChars[$ch] ) ) {
+			} elseif (!isset(self::$opChars[$last]) && !isset(self::$opChars[$ch])) {
 				$pad = ' ';
 				$lineLength++;
 			// Don't accidentally create ++, -- or // tokens
-			} elseif ( $last === $ch && ( $ch === '+' || $ch === '-' || $ch === '/' ) ) {
+			} elseif ($last === $ch && ($ch === '+' || $ch === '-' || $ch === '/')) {
 				$pad = ' ';
 				$lineLength++;
 			// Don't create invalid dot notation after number literal (T303827).
 			// Keep whitespace in "42. foo".
 			// But keep minifying "foo.bar", "42..foo", and "42.0.foo" per $opChars.
-			} elseif ( $lastDotlessNum && $type === self::TYPE_DOT ) {
+			} elseif ($lastDotlessNum && $type === self::TYPE_DOT) {
 				$pad = ' ';
 				$lineLength++;
 			}
 
 			// self::debug( $topOfStack, $last, $lastType, $state, $ch, $token, $type, );
 
-			if ( $mapGenerator ) {
-				$mapGenerator->outputSpace( $pad );
-				$mapGenerator->outputToken( $token );
-				$mapGenerator->consumeSource( $end - $pos );
+			if ($mapGenerator) {
+				$mapGenerator->outputSpace($pad);
+				$mapGenerator->outputToken($token);
+				$mapGenerator->consumeSource($end - $pos);
 			}
 			$out .= $pad;
 			$out .= $token;
@@ -1613,18 +1613,17 @@ 
 
 			// Now that we have output our token, transition into the new state.
 			$actions = $type === self::TYPE_SPECIAL ?
-				self::$model[$state][$type][$token] :
-				self::$model[$state][$type] ?? [];
-			if ( isset( $actions[self::ACTION_PUSH] ) &&
-				count( $stack ) < self::STACK_LIMIT
+				self::$model[$state][$type][$token] : self::$model[$state][$type] ?? [];
+			if (isset($actions[self::ACTION_PUSH]) &&
+				count($stack) < self::STACK_LIMIT
 			) {
 				$topOfStack = $actions[self::ACTION_PUSH];
 				$stack[] = $topOfStack;
 			}
-			if ( $stack && isset( $actions[self::ACTION_POP] ) ) {
-				$state = array_pop( $stack );
-				$topOfStack = end( $stack );
-			} elseif ( isset( $actions[self::ACTION_GOTO] ) ) {
+			if ($stack && isset($actions[self::ACTION_POP])) {
+				$state = array_pop($stack);
+				$topOfStack = end($stack);
+			} elseif (isset($actions[self::ACTION_GOTO])) {
 				$state = $actions[self::ACTION_GOTO];
 			}
 		}
@@ -1637,7 +1636,7 @@ 
 	 * @param string $errorMsg
 	 * @return bool
 	 */
-	public static function parseError( $fullJavascript, $position, $errorMsg ) {
+	public static function parseError($fullJavascript, $position, $errorMsg) {
 		// TODO: Handle the error: trigger_error, throw exception, return false...
 		return false;
 	}
@@ -1656,32 +1655,32 @@ 
 		int $state, string $ch, string $token, int $type
 	) {
 		static $first = true;
-		$self = new \ReflectionClass( self::class );
+		$self = new \ReflectionClass(self::class);
 		$constants = $self->getConstants();
 
-		foreach ( $self->getConstants() as $name => $value ) {
-			if ( $value === $top ) {
+		foreach ($self->getConstants() as $name => $value) {
+			if ($value === $top) {
 				$top = $name;
 			}
-			if ( $value === $lastType ) {
+			if ($value === $lastType) {
 				$lastType = $name;
 			}
-			if ( $value === $state ) {
+			if ($value === $state) {
 				$state = $name;
 			}
-			if ( $value === $type ) {
+			if ($value === $type) {
 				$type = $name;
 			}
 		}
 
-		if ( $first ) {
-			print sprintf( "| %-29s | %-4s | %-29s | %-29s | %-2s | %-10s | %-29s\n",
-				'topOfStack', 'last', 'lastType', 'state', 'ch', 'token', 'type' );
-			print sprintf( "| %'-29s | %'-4s | %'-29s | %'-29s | %'-2s | %'-10s | %'-29s\n",
-				'', '', '', '', '', '', '' );
+		if ($first) {
+			print sprintf("| %-29s | %-4s | %-29s | %-29s | %-2s | %-10s | %-29s\n",
+				'topOfStack', 'last', 'lastType', 'state', 'ch', 'token', 'type');
+			print sprintf("| %'-29s | %'-4s | %'-29s | %'-29s | %'-2s | %'-10s | %'-29s\n",
+				'', '', '', '', '', '', '');
 			$first = false;
 		}
-		print sprintf( "| %-29s | %-4s | %-29s | %-29s | %-2s | %-10s | %-29s\n",
-			(string)$top, $last, $lastType, $state, $ch, $token, $type );
+		print sprintf("| %-29s | %-4s | %-29s | %-29s | %-2s | %-10s | %-29s\n",
+			(string) $top, $last, $lastType, $state, $ch, $token, $type);
 	}
 }

Braces +148 added lines, -69 removed lines

@@ -44,7 +44,8 @@ 
  * - <https://262.ecma-international.org/7.0/>
  * - <https://262.ecma-international.org/6.0/>
  */
-class JavaScriptMinifier {
+class JavaScriptMinifier
+{
 
 	/* Parsing states.
 	 * The state machine is necessary to decide whether to parse a slash as division
@@ -1203,9 +1204,11 @@ 
 	 * Add copies of all states but with negative numbers to self::$model (if not already present),
 	 * to represent generator function states.
 	 */
-	private static function ensureExpandedStates() {
+	private static function ensureExpandedStates()
+	{
 		// Already done?
-		if ( self::$expandedStates ) {
+		if ( self::$expandedStates )
+		{
 			return;
 		}
 		self::$expandedStates = true;
@@ -1213,17 +1216,25 @@ 
 		// Add copies of all states (except FUNC and GENFUNC) with negative numbers.
 		// These negative states represent states inside generator functions. When in these states,
 		// TYPE_YIELD is treated as TYPE_RETURN, otherwise as TYPE_LITERAL
-		foreach ( self::$model as $state => $transitions ) {
-			if ( $state !== self::FUNC && $state !== self::GENFUNC ) {
-				foreach ( $transitions as $tokenType => $actions ) {
-					foreach ( $actions as $action => $target ) {
-						if ( is_array( $target ) ) {
-							foreach ( $target as $subaction => $subtarget ) {
+		foreach ( self::$model as $state => $transitions )
+		{
+			if ( $state !== self::FUNC && $state !== self::GENFUNC )
+			{
+				foreach ( $transitions as $tokenType => $actions )
+				{
+					foreach ( $actions as $action => $target )
+					{
+						if ( is_array( $target ) )
+						{
+							foreach ( $target as $subaction => $subtarget )
+							{
 								self::$model[-$state][$tokenType][$action][$subaction] =
 									$subtarget === self::FUNC || $subtarget === true || $subtarget === self::GENFUNC
 									? $subtarget : -$subtarget;
 							}
-						} else {
+						}
+						else
+						{
 							self::$model[-$state][$tokenType][$action] =
 								$target === self::FUNC || $target === true || $target === self::GENFUNC
 								? $target : -$target;
@@ -1237,10 +1248,12 @@ 
 		self::$model[-self::PROPERTY_ASSIGNMENT][self::TYPE_BRACE_OPEN][self::ACTION_GOTO] = self::STATEMENT;
 
 		// Also add negative versions of states to the other arrays
-		foreach ( self::$semicolon as $state => $value ) {
+		foreach ( self::$semicolon as $state => $value )
+		{
 			self::$semicolon[-$state] = $value;
 		}
-		foreach ( self::$divStates as $state => $value ) {
+		foreach ( self::$divStates as $state => $value )
+		{
 			self::$divStates[-$state] = $value;
 		}
 	}
@@ -1251,7 +1264,8 @@ 
 	 * @param string $s JavaScript code to minify
 	 * @return string|bool Minified code or false on failure
 	 */
-	public static function minify( $s ) {
+	public static function minify( $s )
+	{
 		return self::minifyInternal( $s );
 	}
 
@@ -1266,7 +1280,8 @@ 
 	 *
 	 * @return JavaScriptMinifierState
 	 */
-	public static function createMinifier() {
+	public static function createMinifier()
+	{
 		return new JavaScriptMinifierState;
 	}
 
@@ -1284,7 +1299,8 @@ 
 	 *
 	 * @return JavaScriptMapperState
 	 */
-	public static function createSourceMapState() {
+	public static function createSourceMapState()
+	{
 		return new JavaScriptMapperState;
 	}
 
@@ -1297,7 +1313,8 @@ 
 	 * @param MappingsGenerator|null $mapGenerator
 	 * @return bool|string
 	 */
-	public static function minifyInternal( $s, $mapGenerator = null ) {
+	public static function minifyInternal( $s, $mapGenerator = null )
+	{
 		self::ensureExpandedStates();
 
 		// Here's where the minifying takes place: Loop through the input, looking for tokens
@@ -1313,25 +1330,31 @@ 
 		$stack = [];
 		$topOfStack = null; // Optimization: calling end( $stack ) repeatedly is expensive
 		$last = ';'; // Pretend that we have seen a semicolon yet
-		while ( $pos < $length ) {
+		while ( $pos < $length )
+		{
 			// First, skip over any whitespace and multiline comments, recording whether we
 			// found any newline character
 			$skip = strspn( $s, " \t\n\r\xb\xc", $pos );
-			if ( !$skip ) {
+			if ( !$skip )
+			{
 				$ch = $s[$pos];
-				if ( $ch === '/' && substr( $s, $pos, 2 ) === '/*' ) {
+				if ( $ch === '/' && substr( $s, $pos, 2 ) === '/*' )
+				{
 					// Multiline comment. Search for the end token or EOT.
 					$end = strpos( $s, '*/', $pos + 2 );
 					$skip = $end === false ? $length - $pos : $end - $pos + 2;
 				}
 			}
-			if ( $skip ) {
+			if ( $skip )
+			{
 				// The semicolon insertion mechanism needs to know whether there was a newline
 				// between two tokens, so record it now.
-				if ( !$newlineFound && strcspn( $s, "\r\n", $pos, $skip ) !== $skip ) {
+				if ( !$newlineFound && strcspn( $s, "\r\n", $pos, $skip ) !== $skip )
+				{
 					$newlineFound = true;
 				}
-				if ( $mapGenerator ) {
+				if ( $mapGenerator )
+				{
 					$mapGenerator->consumeSource( $skip );
 				}
 				$pos += $skip;
@@ -1346,7 +1369,8 @@ 
 				|| ( $ch === '-' && $newlineFound && substr( $s, $pos, 3 ) === '-->' )
 			) {
 				$skip = strcspn( $s, "\r\n", $pos );
-				if ( $mapGenerator ) {
+				if ( $mapGenerator )
+				{
 					$mapGenerator->consumeSource( $skip );
 				}
 				$pos += $skip;
@@ -1361,10 +1385,12 @@ 
 			// of any next token in the stream.
 			$end = $pos + 1;
 			// Handle string literals
-			if ( $ch === "'" || $ch === '"' ) {
+			if ( $ch === "'" || $ch === '"' )
+			{
 				// Search to the end of the string literal, skipping over backslash escapes
 				$search = $ch . '\\';
-				do {
+				do
+				{
 					// Speculatively add 2 to the end so that if we see a backslash,
 					// the next iteration will start 2 characters further (one for the
 					// backslash, one for the escaped character).
@@ -1375,7 +1401,8 @@ 
 				} while ( $end - 2 < $length && $s[$end - 2] === '\\' );
 				// Correction (1): Undo speculative add, keep only one (end of string literal)
 				$end--;
-				if ( $end > $length ) {
+				if ( $end > $length )
+				{
 					// Correction (2): Loop wrongly assumed an end quote ended the search,
 					// but search ended because we've reached the end. Correct $end.
 					// TODO: This is invalid and should throw.
@@ -1384,8 +1411,11 @@ 
 
 			// Handle template strings, either from "`" to begin a new string,
 			// or continuation after the "}" that ends a "${"-expression.
-			} elseif ( $ch === '`' || ( $ch === '}' && $topOfStack === self::TEMPLATE_STRING_TAIL ) ) {
-				if ( $ch === '}' ) {
+			}
+			elseif ( $ch === '`' || ( $ch === '}' && $topOfStack === self::TEMPLATE_STRING_TAIL ) )
+			{
+				if ( $ch === '}' )
+				{
 					// Pop the TEMPLATE_STRING_TAIL state off the stack
 					// We don't let it get popped off the stack the normal way, to avoid the newline
 					// and comment stripping code above running on the continuation of the literal
@@ -1396,21 +1426,25 @@ 
 				}
 				// Search until we reach either a closing ` or a ${, skipping over backslash escapes
 				// and $ characters followed by something other than { or `
-				do {
+				do
+				{
 					$end += strcspn( $s, '`$\\', $end ) + 1;
-					if ( $end - 1 < $length && $s[$end - 1] === '`' ) {
+					if ( $end - 1 < $length && $s[$end - 1] === '`' )
+					{
 						// End of the string, stop
 						// We don't do this in the while() condition because the $end++ in the
 						// backslash escape branch makes it difficult to do so without incorrectly
 						// considering an escaped backtick (\`) the end of the string
 						break;
 					}
-					if ( $end - 1 < $length && $s[$end - 1] === '\\' ) {
+					if ( $end - 1 < $length && $s[$end - 1] === '\\' )
+					{
 						// Backslash escape. Skip the next character, and keep going
 						$end++;
 						continue;
 					}
-					if ( $end < $length && $s[$end - 1] === '$' && $s[$end] === '{' ) {
+					if ( $end < $length && $s[$end - 1] === '$' && $s[$end] === '{' )
+					{
 						// Beginning of an expression in ${ ... }. Skip the {, and stop
 						$end++;
 						// Push the current state to the stack. We'll pop this off later when hitting
@@ -1424,7 +1458,8 @@ 
 						break;
 					}
 				} while ( $end - 1 < $length );
-				if ( $end > $length ) {
+				if ( $end > $length )
+				{
 					// Loop wrongly assumed an end quote or ${ ended the search,
 					// but search ended because we've reached the end. Correct $end.
 					// TODO: This is invalid and should throw.
@@ -1433,12 +1468,16 @@ 
 
 			// We have to distinguish between regexp literals and division operators
 			// A division operator is only possible in certain states
-			} elseif ( $ch === '/' && !isset( self::$divStates[$state] ) ) {
+			}
+			elseif ( $ch === '/' && !isset( self::$divStates[$state] ) )
+			{
 				// Regexp literal
-				for ( ; ; ) {
+				for ( ; ; )
+				{
 					// Search until we find "/" (end of regexp), "\" (backslash escapes),
 					// or "[" (start of character classes).
-					do {
+					do
+					{
 						// Speculatively add 2 to ensure next iteration skips
 						// over backslash and escaped character.
 						// We'll correct this outside the loop.
@@ -1447,19 +1486,22 @@ 
 					} while ( $end - 2 < $length && $s[$end - 2] === '\\' );
 					// Correction (1): Undo speculative add, keep only one (end of regexp)
 					$end--;
-					if ( $end > $length ) {
+					if ( $end > $length )
+					{
 						// Correction (2): Loop wrongly assumed end slash was seen
 						// String ended without end of regexp. Correct $end.
 						// TODO: This is invalid and should throw.
 						$end--;
 						break;
 					}
-					if ( $s[$end - 1] === '/' ) {
+					if ( $s[$end - 1] === '/' )
+					{
 						break;
 					}
 					// (Implicit else), we must've found the start of a char class,
 					// skip until we find "]" (end of char class), or "\" (backslash escape)
-					do {
+					do
+					{
 						// Speculatively add 2 for backslash escape.
 						// We'll substract one outside the loop.
 						$end += strcspn( $s, ']\\', $end ) + 2;
@@ -1467,7 +1509,8 @@ 
 					} while ( $end - 2 < $length && $s[$end - 2] === '\\' );
 					// Correction (1): Undo speculative add, keep only one (end of regexp)
 					$end--;
-					if ( $end > $length ) {
+					if ( $end > $length )
+					{
 						// Correction (2): Loop wrongly assumed "]" was seen
 						// String ended without ending char class or regexp. Correct $end.
 						// TODO: This is invalid and should throw.
@@ -1476,17 +1519,20 @@ 
 					}
 				}
 				// Search past the regexp modifiers (gi)
-				while ( $end < $length && ctype_alpha( $s[$end] ) ) {
+				while ( $end < $length && ctype_alpha( $s[$end] ) )
+				{
 					$end++;
 				}
-			} elseif (
+			}
+			elseif (
 				$ch === '0'
 				&& ( $pos + 1 < $length ) && ( $s[$pos + 1] === 'x' || $s[$pos + 1] === 'X' )
 			) {
 				// Hex numeric literal
 				$end++; // x or X
 				$len = strspn( $s, '0123456789ABCDEFabcdef', $end );
-				if ( !$len ) {
+				if ( !$len )
+				{
 					return self::parseError(
 						$s,
 						$pos,
@@ -1494,7 +1540,8 @@ 
 					);
 				}
 				$end += $len;
-			} elseif (
+			}
+			elseif (
 				// Optimisation: This check must accept only ASCII digits 0-9.
 				// Avoid ctype_digit() because it is slower and also accepts locale-specific digits.
 				// Using is_numeric() might seem wrong also as it accepts negative numbers, decimal
@@ -1506,17 +1553,23 @@ 
 			) {
 				$end += strspn( $s, '0123456789', $end );
 				$decimal = strspn( $s, '.', $end );
-				if ( $decimal ) {
-					if ( $decimal > 2 ) {
+				if ( $decimal )
+				{
+					if ( $decimal > 2 )
+					{
 						return self::parseError( $s, $end, 'The number has too many decimal points' );
 					}
 					$end += strspn( $s, '0123456789', $end + 1 ) + $decimal;
-				} else {
+				}
+				else
+				{
 					$dotlessNum = true;
 				}
 				$exponent = strspn( $s, 'eE', $end );
-				if ( $exponent ) {
-					if ( $exponent > 1 ) {
+				if ( $exponent )
+				{
+					if ( $exponent > 1 )
+					{
 						return self::parseError( $s, $end, 'Number with several E' );
 					}
 					$end++;
@@ -1524,7 +1577,8 @@ 
 					// + sign is optional; - sign is required.
 					$end += strspn( $s, '-+', $end );
 					$len = strspn( $s, '0123456789', $end );
-					if ( !$len ) {
+					if ( !$len )
+					{
 						return self::parseError(
 							$s,
 							$pos,
@@ -1533,9 +1587,12 @@ 
 					}
 					$end += $len;
 				}
-			} elseif ( isset( self::$opChars[$ch] ) ) {
+			}
+			elseif ( isset( self::$opChars[$ch] ) )
+			{
 				// Punctuation character. Search for the longest matching operator.
-				for ( $tokenLength = self::LONGEST_PUNCTUATION_TOKEN; $tokenLength > 1; $tokenLength-- ) {
+				for ( $tokenLength = self::LONGEST_PUNCTUATION_TOKEN; $tokenLength > 1; $tokenLength-- )
+				{
 					if (
 						$pos + $tokenLength <= $length &&
 						isset( self::$tokenTypes[ substr( $s, $pos, $tokenLength ) ] )
@@ -1544,7 +1601,9 @@ 
 						break;
 					}
 				}
-			} else {
+			}
+			else
+			{
 				// Identifier or reserved word. Search for the end by excluding whitespace and
 				// punctuation.
 				$end += strcspn( $s, " \t\n.;,=<>+-{}()[]?:*/%'\"`!&|^~\xb\xc\r", $end );
@@ -1555,20 +1614,23 @@ 
 			$type = isset( self::$model[$state][self::TYPE_SPECIAL][$token] )
 				? self::TYPE_SPECIAL
 				: self::$tokenTypes[$token] ?? self::TYPE_LITERAL;
-			if ( $type === self::TYPE_YIELD ) {
+			if ( $type === self::TYPE_YIELD )
+			{
 				// yield is treated as TYPE_RETURN inside a generator function (negative state)
 				// but as TYPE_LITERAL when not in a generator function (positive state)
 				$type = $state < 0 ? self::TYPE_RETURN : self::TYPE_LITERAL;
 			}
 
 			$pad = '';
-			if ( $newlineFound && isset( self::$semicolon[$state][$type] ) ) {
+			if ( $newlineFound && isset( self::$semicolon[$state][$type] ) )
+			{
 				// This token triggers the semicolon insertion mechanism of javascript. While we
 				// could add the ; token here ourselves, keeping the newline has a few advantages.
 				$pad = "\n";
 				$state = $state < 0 ? -self::STATEMENT : self::STATEMENT;
 				$lineLength = 0;
-			} elseif ( $lineLength + $end - $pos > self::$maxLineLength &&
+			}
+			elseif ( $lineLength + $end - $pos > self::$maxLineLength &&
 				!isset( self::$semicolon[$state][$type] ) &&
 				$type !== self::TYPE_INCR_OP &&
 				$type !== self::TYPE_ARROW
@@ -1580,24 +1642,31 @@ 
 				$pad = "\n";
 				$lineLength = 0;
 			// Check, whether we have to separate the token from the last one with whitespace
-			} elseif ( !isset( self::$opChars[$last] ) && !isset( self::$opChars[$ch] ) ) {
+			}
+			elseif ( !isset( self::$opChars[$last] ) && !isset( self::$opChars[$ch] ) )
+			{
 				$pad = ' ';
 				$lineLength++;
 			// Don't accidentally create ++, -- or // tokens
-			} elseif ( $last === $ch && ( $ch === '+' || $ch === '-' || $ch === '/' ) ) {
+			}
+			elseif ( $last === $ch && ( $ch === '+' || $ch === '-' || $ch === '/' ) )
+			{
 				$pad = ' ';
 				$lineLength++;
 			// Don't create invalid dot notation after number literal (T303827).
 			// Keep whitespace in "42. foo".
 			// But keep minifying "foo.bar", "42..foo", and "42.0.foo" per $opChars.
-			} elseif ( $lastDotlessNum && $type === self::TYPE_DOT ) {
+			}
+			elseif ( $lastDotlessNum && $type === self::TYPE_DOT )
+			{
 				$pad = ' ';
 				$lineLength++;
 			}
 
 			// self::debug( $topOfStack, $last, $lastType, $state, $ch, $token, $type, );
 
-			if ( $mapGenerator ) {
+			if ( $mapGenerator )
+			{
 				$mapGenerator->outputSpace( $pad );
 				$mapGenerator->outputToken( $token );
 				$mapGenerator->consumeSource( $end - $pos );
@@ -1621,10 +1690,13 @@ 
 				$topOfStack = $actions[self::ACTION_PUSH];
 				$stack[] = $topOfStack;
 			}
-			if ( $stack && isset( $actions[self::ACTION_POP] ) ) {
+			if ( $stack && isset( $actions[self::ACTION_POP] ) )
+			{
 				$state = array_pop( $stack );
 				$topOfStack = end( $stack );
-			} elseif ( isset( $actions[self::ACTION_GOTO] ) ) {
+			}
+			elseif ( isset( $actions[self::ACTION_GOTO] ) )
+			{
 				$state = $actions[self::ACTION_GOTO];
 			}
 		}
@@ -1637,7 +1709,8 @@ 
 	 * @param string $errorMsg
 	 * @return bool
 	 */
-	public static function parseError( $fullJavascript, $position, $errorMsg ) {
+	public static function parseError( $fullJavascript, $position, $errorMsg )
+	{
 		// TODO: Handle the error: trigger_error, throw exception, return false...
 		return false;
 	}
@@ -1659,22 +1732,28 @@ 
 		$self = new \ReflectionClass( self::class );
 		$constants = $self->getConstants();
 
-		foreach ( $self->getConstants() as $name => $value ) {
-			if ( $value === $top ) {
+		foreach ( $self->getConstants() as $name => $value )
+		{
+			if ( $value === $top )
+			{
 				$top = $name;
 			}
-			if ( $value === $lastType ) {
+			if ( $value === $lastType )
+			{
 				$lastType = $name;
 			}
-			if ( $value === $state ) {
+			if ( $value === $state )
+			{
 				$state = $name;
 			}
-			if ( $value === $type ) {
+			if ( $value === $type )
+			{
 				$type = $name;
 			}
 		}
 
-		if ( $first ) {
+		if ( $first )
+		{
 			print sprintf( "| %-29s | %-4s | %-29s | %-29s | %-2s | %-10s | %-29s\n",
 				'topOfStack', 'last', 'lastType', 'state', 'ch', 'token', 'type' );
 			print sprintf( "| %'-29s | %'-4s | %'-29s | %'-29s | %'-2s | %'-10s | %'-29s\n",