Merge pull request #3797 from paulbalandan/no-spaces-inside-parenthesis

michalsn · web-flow · commit a771a103f55b · 2020-10-22T21:47:04.000+02:00
Remove extra spaces inside parentheses
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
@@ -207,7 +207,7 @@ public function getClassname(string $file) : string
 			}
 		}
 
-		if (empty( $className ))
+		if (empty($className))
 		{
 			return '';
 		}
diff --git a/system/Common.php b/system/Common.php
@@ -800,7 +800,7 @@ function is_really_writable(string $file): bool
 			return true;
 		}
 
-		if (! is_file($file) || ( $fp = @fopen($file, 'ab')) === false)
+		if (! is_file($file) || ($fp = @fopen($file, 'ab')) === false)
 		{
 			return false;
 		}
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
@@ -157,9 +157,9 @@ protected static function copyDir($source, $dest)
 		$dir = opendir($source);
 		@mkdir($dest);
 
-		while (false !== ( $file = readdir($dir)))
+		while (false !== ($file = readdir($dir)))
 		{
-			if (( $file !== '.' ) && ( $file !== '..' ))
+			if (($file !== '.') && ($file !== '..'))
 			{
 				if (is_dir($source . '/' . $file))
 				{
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -1506,7 +1506,7 @@ protected function groupEndPrepare(string $clause = 'QBWhere')
 	{
 		$this->QBWhereGroupStarted = false;
 		$where                     = [
-			'condition' => str_repeat(' ', $this->QBWhereGroupCount -- ) . ')',
+			'condition' => str_repeat(' ', $this->QBWhereGroupCount--) . ')',
 			'escape'    => false,
 		];
 
@@ -2993,7 +2993,7 @@ protected function compileSelect($selectOverride = false): string
 		}
 		else
 		{
-			$sql = ( ! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
+			$sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
 
 			if (empty($this->QBSelect))
 			{
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -1292,7 +1292,7 @@ public function escapeIdentifiers($item)
 		// Avoid breaking functions and literal values inside queries
 		if (ctype_digit($item)
 			|| $item[0] === "'"
-			|| ( $this->escapeChar !== '"' && $item[0] === '"')
+			|| ($this->escapeChar !== '"' && $item[0] === '"')
 			|| strpos($item, '(') !== false)
 		{
 			return $item;
@@ -1379,7 +1379,7 @@ public function escape($str)
 			return array_map([&$this, 'escape'], $str);
 		}
 
-		if (is_string($str) || ( is_object($str) && method_exists($str, '__toString')))
+		if (is_string($str) || (is_object($str) && method_exists($str, '__toString')))
 		{
 			return "'" . $this->escapeString($str) . "'";
 		}
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
@@ -175,7 +175,7 @@ public function getVersion(): string
 		}
 
 		// @phpstan-ignore-next-line
-		if (! $this->connID || ( $pgVersion = pg_version($this->connID)) === false)
+		if (! $this->connID || ($pgVersion = pg_version($this->connID)) === false)
 		{
 			$this->initialize();
 		}
@@ -238,7 +238,7 @@ public function escape($str)
 			$this->initialize();
 		}
 
-		if (is_string($str) || ( is_object($str) && method_exists($str, '__toString')))
+		if (is_string($str) || (is_object($str) && method_exists($str, '__toString')))
 		{
 			return pg_escape_literal($this->connID, $str);
 		}
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -797,7 +797,7 @@ protected function removeRelativeDirectory(string $uri): string
 		$tok  = strtok($uri, '/');
 		while ($tok !== false)
 		{
-			if (( ! empty($tok) || $tok === '0') && $tok !== '..')
+			if ((! empty($tok) || $tok === '0') && $tok !== '..')
 			{
 				$uris[] = $tok;
 			}
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
@@ -439,17 +439,17 @@ function symbolic_permissions(int $perms): string
 		// Owner
 		$symbolic .= (($perms & 0x0100) ? 'r' : '-')
 				. (($perms & 0x0080) ? 'w' : '-')
-				. (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x' ) : (($perms & 0x0800) ? 'S' : '-'));
+				. (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x') : (($perms & 0x0800) ? 'S' : '-'));
 
 		// Group
 		$symbolic .= (($perms & 0x0020) ? 'r' : '-')
 				. (($perms & 0x0010) ? 'w' : '-')
-				. (($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x' ) : (($perms & 0x0400) ? 'S' : '-'));
+				. (($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x') : (($perms & 0x0400) ? 'S' : '-'));
 
 		// World
 		$symbolic .= (($perms & 0x0004) ? 'r' : '-')
 				. (($perms & 0x0002) ? 'w' : '-')
-				. (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x' ) : (($perms & 0x0200) ? 'T' : '-'));
+				. (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x') : (($perms & 0x0200) ? 'T' : '-'));
 
 		return $symbolic;
 	}
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
@@ -461,7 +461,7 @@ function form_checkbox($data = '', string $value = '', bool $checked = false, $e
 	{
 		$defaults = [
 			'type'  => 'checkbox',
-			'name'  => ( ! is_array($data) ? $data : ''),
+			'name'  => (! is_array($data) ? $data : ''),
 			'value' => $value,
 		];
 
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
@@ -71,7 +71,7 @@ function number_to_size($num, int $precision = 1, string $locale = null)
 
 		// ignore sub part
 		$generalLocale = $locale;
-		if (! empty($locale) && ( $underscorePos = strpos($locale, '_')))
+		if (! empty($locale) && ($underscorePos = strpos($locale, '_')))
 		{
 			$generalLocale = substr($locale, 0, $underscorePos);
 		}
@@ -142,7 +142,7 @@ function number_to_amount($num, int $precision = 0, string $locale = null)
 
 		// ignore sub part
 		$generalLocale = $locale;
-		if (! empty($locale) && ( $underscorePos = strpos($locale, '_')))
+		if (! empty($locale) && ($underscorePos = strpos($locale, '_')))
 		{
 			$generalLocale = substr($locale, 0, $underscorePos);
 		}
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
@@ -860,7 +860,7 @@ protected function reproportion()
 		if (($this->width === 0 && $this->height === 0) ||
 				$this->image()->origWidth === 0 ||
 				$this->image()->origHeight === 0 ||
-				( ! ctype_digit((string) $this->width) && ! ctype_digit((string) $this->height)) ||
+				(! ctype_digit((string) $this->width) && ! ctype_digit((string) $this->height)) ||
 				! ctype_digit((string) $this->image()->origWidth) ||
 				! ctype_digit((string) $this->image()->origHeight)
 		)
diff --git a/system/Router/Router.php b/system/Router/Router.php
@@ -491,7 +491,7 @@ protected function checkRoutes(string $uri): bool
 					[
 						$controller,
 						$method,
-					] = explode( '::', $val );
+					] = explode('::', $val);
 
 					// Only replace slashes in the controller, not in the method.
 					$controller = str_replace('/', '\\', $controller);
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
@@ -339,7 +339,7 @@ public function formatCharacters(string $str): string
 	 */
 	protected function formatNewLines(string $str): string
 	{
-		if ($str === '' || ( strpos($str, "\n") === false && ! in_array($this->lastBlockElement, $this->innerBlockRequired, true)))
+		if ($str === '' || (strpos($str, "\n") === false && ! in_array($this->lastBlockElement, $this->innerBlockRequired, true)))
 		{
 			return $str;
 		}
diff --git a/system/View/Cell.php b/system/View/Cell.php
@@ -150,8 +150,8 @@ public function render(string $library, $params = null, int $ttl = 0, string $ca
 			$output = $instance->{$method}();
 		}
 		elseif (($paramCount === 1) && (
-				( ! array_key_exists($refParams[0]->name, $paramArray)) ||
-				(array_key_exists($refParams[0]->name, $paramArray) && count($paramArray) !== 1) )
+				(! array_key_exists($refParams[0]->name, $paramArray)) ||
+				(array_key_exists($refParams[0]->name, $paramArray) && count($paramArray) !== 1))
 		)
 		{
 			$output = $instance->{$method}($paramArray);
@@ -201,7 +201,7 @@ public function render(string $library, $params = null, int $ttl = 0, string $ca
 	 */
 	public function prepareParams($params)
 	{
-		if (empty($params) || ( ! is_string($params) && ! is_array($params)))
+		if (empty($params) || (! is_string($params) && ! is_array($params)))
 		{
 			return [];
 		}
diff --git a/system/View/Parser.php b/system/View/Parser.php
@@ -402,8 +402,9 @@ protected function parsePair(string $variable, array $data, string $template): a
 
 						if (! empty($pair))
 						{
-							$pairs[array_keys( $pair )[0]] = true;
-							$temp                          = array_merge($temp, $pair);
+							$pairs[array_keys($pair)[0]] = true;
+
+							$temp = array_merge($temp, $pair);
 						}
 
 						continue;
@@ -423,7 +424,7 @@ protected function parsePair(string $variable, array $data, string $template): a
 				// Now replace our placeholders with the new content.
 				foreach ($temp as $pattern => $content)
 				{
-					$out = $this->replaceSingle($pattern, $content, $out, ! isset( $pairs[$pattern] ) );
+					$out = $this->replaceSingle($pattern, $content, $out, ! isset($pairs[$pattern]));
 				}
 
 				$str .= $out;

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ public function getClassname(string $file) : string`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`
`210`		`- if (empty( $className ))`
	`210`	`+ if (empty($className))`
`211`	`211`	`{`
`212`	`212`	`return '';`
`213`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -800,7 +800,7 @@ function is_really_writable(string $file): bool`
`800`	`800`	`return true;`
`801`	`801`	`}`
`802`	`802`
`803`		`- if (! is_file($file) \|\| ( $fp = @fopen($file, 'ab')) === false)`
	`803`	`+ if (! is_file($file) \|\| ($fp = @fopen($file, 'ab')) === false)`
`804`	`804`	`{`
`805`	`805`	`return false;`
`806`	`806`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,9 @@ protected static function copyDir($source, $dest)`
`157`	`157`	`$dir = opendir($source);`
`158`	`158`	`@mkdir($dest);`
`159`	`159`
`160`		`- while (false !== ( $file = readdir($dir)))`
	`160`	`+ while (false !== ($file = readdir($dir)))`
`161`	`161`	`{`
`162`		`- if (( $file !== '.' ) && ( $file !== '..' ))`
	`162`	`+ if (($file !== '.') && ($file !== '..'))`
`163`	`163`	`{`
`164`	`164`	`if (is_dir($source . '/' . $file))`
`165`	`165`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1506,7 +1506,7 @@ protected function groupEndPrepare(string $clause = 'QBWhere')`
`1506`	`1506`	`{`
`1507`	`1507`	`$this->QBWhereGroupStarted = false;`
`1508`	`1508`	`$where = [`
`1509`		`- 'condition' => str_repeat(' ', $this->QBWhereGroupCount -- ) . ')',`
	`1509`	`+ 'condition' => str_repeat(' ', $this->QBWhereGroupCount--) . ')',`
`1510`	`1510`	`'escape' => false,`
`1511`	`1511`	`];`
`1512`	`1512`
`@@ -2993,7 +2993,7 @@ protected function compileSelect($selectOverride = false): string`
`2993`	`2993`	`}`
`2994`	`2994`	`else`
`2995`	`2995`	`{`
`2996`		`- $sql = ( ! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';`
	`2996`	`+ $sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';`
`2997`	`2997`
`2998`	`2998`	`if (empty($this->QBSelect))`
`2999`	`2999`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1292,7 +1292,7 @@ public function escapeIdentifiers($item)`
`1292`	`1292`	`// Avoid breaking functions and literal values inside queries`
`1293`	`1293`	`if (ctype_digit($item)`
`1294`	`1294`	`\|\| $item[0] === "'"`
`1295`		`- \|\| ( $this->escapeChar !== '"' && $item[0] === '"')`
	`1295`	`+ \|\| ($this->escapeChar !== '"' && $item[0] === '"')`
`1296`	`1296`	`\|\| strpos($item, '(') !== false)`
`1297`	`1297`	`{`
`1298`	`1298`	`return $item;`
`@@ -1379,7 +1379,7 @@ public function escape($str)`
`1379`	`1379`	`return array_map([&$this, 'escape'], $str);`
`1380`	`1380`	`}`
`1381`	`1381`
`1382`		`- if (is_string($str) \|\| ( is_object($str) && method_exists($str, '__toString')))`
	`1382`	`+ if (is_string($str) \|\| (is_object($str) && method_exists($str, '__toString')))`
`1383`	`1383`	`{`
`1384`	`1384`	`return "'" . $this->escapeString($str) . "'";`
`1385`	`1385`	`}`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public function getVersion(): string`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`// @phpstan-ignore-next-line`
`178`		`- if (! $this->connID \|\| ( $pgVersion = pg_version($this->connID)) === false)`
	`178`	`+ if (! $this->connID \|\| ($pgVersion = pg_version($this->connID)) === false)`
`179`	`179`	`{`
`180`	`180`	`$this->initialize();`
`181`	`181`	`}`
`@@ -238,7 +238,7 @@ public function escape($str)`
`238`	`238`	`$this->initialize();`
`239`	`239`	`}`
`240`	`240`
`241`		`- if (is_string($str) \|\| ( is_object($str) && method_exists($str, '__toString')))`
	`241`	`+ if (is_string($str) \|\| (is_object($str) && method_exists($str, '__toString')))`
`242`	`242`	`{`
`243`	`243`	`return pg_escape_literal($this->connID, $str);`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,7 @@ protected function removeRelativeDirectory(string $uri): string`
`797`	`797`	`$tok = strtok($uri, '/');`
`798`	`798`	`while ($tok !== false)`
`799`	`799`	`{`
`800`		`- if (( ! empty($tok) \|\| $tok === '0') && $tok !== '..')`
	`800`	`+ if ((! empty($tok) \|\| $tok === '0') && $tok !== '..')`
`801`	`801`	`{`
`802`	`802`	`$uris[] = $tok;`
`803`	`803`	`}`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ function form_checkbox($data = '', string $value = '', bool $checked = false, $e`
`461`	`461`	`{`
`462`	`462`	`$defaults = [`
`463`	`463`	`'type' => 'checkbox',`
`464`		`- 'name' => ( ! is_array($data) ? $data : ''),`
	`464`	`+ 'name' => (! is_array($data) ? $data : ''),`
`465`	`465`	`'value' => $value,`
`466`	`466`	`];`
`467`	`467`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ function number_to_size($num, int $precision = 1, string $locale = null)`
`71`	`71`
`72`	`72`	`// ignore sub part`
`73`	`73`	`$generalLocale = $locale;`
`74`		`- if (! empty($locale) && ( $underscorePos = strpos($locale, '_')))`
	`74`	`+ if (! empty($locale) && ($underscorePos = strpos($locale, '_')))`
`75`	`75`	`{`
`76`	`76`	`$generalLocale = substr($locale, 0, $underscorePos);`
`77`	`77`	`}`
`@@ -142,7 +142,7 @@ function number_to_amount($num, int $precision = 0, string $locale = null)`
`142`	`142`
`143`	`143`	`// ignore sub part`
`144`	`144`	`$generalLocale = $locale;`
`145`		`- if (! empty($locale) && ( $underscorePos = strpos($locale, '_')))`
	`145`	`+ if (! empty($locale) && ($underscorePos = strpos($locale, '_')))`
`146`	`146`	`{`
`147`	`147`	`$generalLocale = substr($locale, 0, $underscorePos);`
`148`	`148`	`}`