Short boolean conditions (#18413)

kamil-tekiela · web-flow · commit dc471985b923 · 2023-05-12T11:09:21.000-03:00
* Short boolean conditions

Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;

* Simplify conditions

Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;

---------

Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;
diff --git a/libraries/classes/ConfigStorage/Relation.php b/libraries/classes/ConfigStorage/Relation.php
@@ -1022,7 +1022,7 @@ public function getForeignData(
             $moreThanLimit = $this->dbi->getTable($foreignDb, $foreignTable)
                 ->checkIfMinRecordsExist($GLOBALS['cfg']['ForeignKeyMaxLimit']);
 
-            if ($overrideTotal === true || ! $moreThanLimit) {
+            if ($overrideTotal || ! $moreThanLimit) {
                 // foreign_display can be false if no display field defined:
                 $foreignDisplay = $this->getDisplayField($foreignDb, $foreignTable);
 
diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php
@@ -174,7 +174,7 @@ public function __invoke(ServerRequest $request): void
         }
 
         $createTable = '';
-        if ($this->dbIsSystemSchema === false) {
+        if (! $this->dbIsSystemSchema) {
             $checkUserPrivileges = new CheckUserPrivileges($this->dbi);
             $checkUserPrivileges->getPrivileges();
 
@@ -186,7 +186,7 @@ public function __invoke(ServerRequest $request): void
             'has_tables' => $this->numTables > 0,
             'list_navigator_html' => $listNavigator ?? '',
             'table_list_html' => $tableList ?? '',
-            'is_system_schema' => $this->dbIsSystemSchema === true,
+            'is_system_schema' => $this->dbIsSystemSchema,
             'create_table_html' => $createTable,
         ]);
     }
diff --git a/libraries/classes/Controllers/Sql/ColumnPreferencesController.php b/libraries/classes/Controllers/Sql/ColumnPreferencesController.php
@@ -60,6 +60,6 @@ public function __invoke(ServerRequest $request): void
             return;
         }
 
-        $this->response->setRequestStatus($status === true);
+        $this->response->setRequestStatus($status);
     }
 }
diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php
@@ -110,7 +110,7 @@ public function __invoke(ServerRequest $request): void
                 $GLOBALS['errorUrl'],
             );
 
-            if ($GLOBALS['result'] !== true) {
+            if (! $GLOBALS['result']) {
                 $errorMessageHtml = Generator::mysqlDie('', '', false, $GLOBALS['errorUrl'], false);
                 $this->response->addHTML($errorMessageHtml ?? '');
                 $this->response->setRequestStatus(false);
diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php
@@ -1233,7 +1233,7 @@ private function getMasterTable(
         // Of course the actual query would be faster if we check for
         // the Criteria which gives the smallest result set in its table,
         // but it would take too much time to check this
-        if (! (count($candidateColumns) > 1)) {
+        if (count($candidateColumns) <= 1) {
             // Only one single candidate
             return reset($candidateColumns);
         }
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
@@ -492,10 +492,10 @@ static function ($a, $b) {
         // this is why we fall back to SHOW TABLE STATUS even for MySQL >= 50002
         if ($tables === []) {
             $sql = 'SHOW TABLE STATUS FROM ' . Util::backquote($database);
-            if (($table !== '' && $table !== []) || ($tableIsGroup === true) || $tableType) {
+            if (($table !== '' && $table !== []) || $tableIsGroup || $tableType) {
                 $sql .= ' WHERE';
                 $needAnd = false;
-                if (($table !== '' && $table !== []) || ($tableIsGroup === true)) {
+                if (($table !== '' && $table !== []) || $tableIsGroup) {
                     if (is_array($table)) {
                         $sql .= ' `Name` IN ('
                             . implode(
diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php
@@ -1069,7 +1069,7 @@ private function renderNode(Node $node, string $class = ''): string
 
             $haveAjax = ['functions', 'procedures', 'events', 'triggers', 'indexes'];
             $parent = $node->parents(false, true);
-            $isNewView = $parent[0]->realName === 'views' && $node->isNew === true;
+            $isNewView = $parent[0]->realName === 'views' && $node->isNew;
             $linkHasAjaxClass = $parent[0]->type == Node::CONTAINER
                 && (in_array($parent[0]->realName, $haveAjax) || $isNewView);
 
diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php
@@ -176,7 +176,7 @@ public function getChild(string $name, bool $realName = false): Node|null
             }
         } else {
             foreach ($this->children as $child) {
-                if ($child->name == $name && $child->isNew === false) {
+                if ($child->name == $name && ! $child->isNew) {
                     return $child;
                 }
             }
diff --git a/libraries/classes/Query/Generator.php b/libraries/classes/Query/Generator.php
@@ -28,7 +28,7 @@ public static function getTableNameCondition(
         bool $tblIsGroup,
     ): string {
         $sqlWhereTable = 'AND t.`TABLE_NAME` ';
-        if ($tblIsGroup === true) {
+        if ($tblIsGroup) {
             $sqlWhereTable .= 'LIKE ' . $escapedTabletable . '%';
         } else {
             $sqlWhereTable .= Util::getCollateForIS() . ' = ' . $escapedTabletable;
diff --git a/libraries/classes/ResponseRenderer.php b/libraries/classes/ResponseRenderer.php
@@ -192,7 +192,7 @@ public static function getInstance(): ResponseRenderer
      */
     public function setRequestStatus(bool $state): void
     {
-        $this->isSuccess = ($state === true);
+        $this->isSuccess = $state;
     }
 
     /**
diff --git a/libraries/classes/SavedSearches.php b/libraries/classes/SavedSearches.php
@@ -109,7 +109,7 @@ public function getSearchName(): string
      */
     public function setCriterias(array|string $criterias, bool $json = false): static
     {
-        if ($json === true && is_string($criterias)) {
+        if ($json && is_string($criterias)) {
             $this->criterias = json_decode($criterias, true);
 
             return $this;
diff --git a/libraries/classes/Session.php b/libraries/classes/Session.php
@@ -185,7 +185,7 @@ public static function setUp(Config $config, ErrorHandler $errorHandler): void
 
         $sessionResult = session_start();
 
-        if ($sessionResult !== true || $origErrorCount !== $errorHandler->countErrors(false)) {
+        if (! $sessionResult || $origErrorCount !== $errorHandler->countErrors(false)) {
             setcookie($httpCookieName, '', 1);
             $errors = $errorHandler->sliceErrors($origErrorCount);
             self::sessionFailed($errors);
diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
@@ -678,16 +678,16 @@ private function countQueryResults(
                 $statement = $statementInfo->statement;
 
                 // Remove ORDER BY to decrease unnecessary sorting time
-                if ($statementInfo->order !== false) {
+                if ($statementInfo->order) {
                     $statement->order = null;
                 }
 
                 // Removes LIMIT clause that might have been added
-                if ($statementInfo->limit !== false) {
+                if ($statementInfo->limit) {
                     $statement->limit = false;
                 }
 
-                if ($statementInfo->isGroup === false && count($statement->expr) === 1) {
+                if (! $statementInfo->isGroup && count($statement->expr) === 1) {
                     $statement->expr[0] = new Expression();
                     $statement->expr[0]->expr = '1';
                 }
diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php
@@ -1618,7 +1618,7 @@ public function getNonGeneratedColumns(bool $backquoted = true): array
 
         foreach ($columnsMetaQueryResult as $column) {
             $value = $column['Field'];
-            if ($backquoted === true) {
+            if ($backquoted) {
                 $value = Util::backquote($value);
             }
 
diff --git a/libraries/classes/Tracking/Tracker.php b/libraries/classes/Tracking/Tracker.php
@@ -195,12 +195,12 @@ public static function createVersion(
         // Get DROP TABLE / DROP VIEW and CREATE TABLE SQL statements
         $createSql = '';
 
-        if ($GLOBALS['cfg']['Server']['tracking_add_drop_table'] == true && $isView === false) {
+        if ($GLOBALS['cfg']['Server']['tracking_add_drop_table'] == true && ! $isView) {
             $createSql .= self::getLogComment()
                 . 'DROP TABLE IF EXISTS ' . Util::backquote($tableName) . ";\n";
         }
 
-        if ($GLOBALS['cfg']['Server']['tracking_add_drop_view'] == true && $isView === true) {
+        if ($GLOBALS['cfg']['Server']['tracking_add_drop_view'] == true && $isView) {
             $createSql .= self::getLogComment()
                 . 'DROP VIEW IF EXISTS ' . Util::backquote($tableName) . ";\n";
         }
@@ -542,7 +542,7 @@ public static function handleQuery(string $query): void
             return;
         }
 
-        if (! (substr($query, -1) === ';')) {
+        if (substr($query, -1) !== ';') {
             $query .= ";\n";
         }
 
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
@@ -612,12 +612,12 @@ public function testCheckPermissions(): void
         //load file permissions for the current permissions file
         $perms = @fileperms($this->object->getSource());
         //testing for permissions for no configuration file
-        $this->assertFalse(! ($perms === false) && ($perms & 2));
+        $this->assertFalse($perms !== false && ($perms & 2));
 
         //load file permissions for the current permissions file
         $perms = @fileperms($this->permTestObj->getSource());
 
-        if (! ($perms === false) && ($perms & 2)) {
+        if ($perms !== false && ($perms & 2)) {
             $this->assertTrue((bool) $this->permTestObj->get('PMA_IS_WINDOWS'));
         } else {
             $this->assertFalse((bool) $this->permTestObj->get('PMA_IS_WINDOWS'));

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,6 @@ public function __invoke(ServerRequest $request): void`
`60`	`60`	`return;`
`61`	`61`	`}`
`62`	`62`
`63`		`- $this->response->setRequestStatus($status === true);`
	`63`	`+ $this->response->setRequestStatus($status);`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1233,7 +1233,7 @@ private function getMasterTable(`
`1233`	`1233`	`// Of course the actual query would be faster if we check for`
`1234`	`1234`	`// the Criteria which gives the smallest result set in its table,`
`1235`	`1235`	`// but it would take too much time to check this`
`1236`		`- if (! (count($candidateColumns) > 1)) {`
	`1236`	`+ if (count($candidateColumns) <= 1) {`
`1237`	`1237`	`// Only one single candidate`
`1238`	`1238`	`return reset($candidateColumns);`
`1239`	`1239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function getChild(string $name, bool $realName = false): Node\|null`
`176`	`176`	`}`
`177`	`177`	`} else {`
`178`	`178`	`foreach ($this->children as $child) {`
`179`		`- if ($child->name == $name && $child->isNew === false) {`
	`179`	`+ if ($child->name == $name && ! $child->isNew) {`
`180`	`180`	`return $child;`
`181`	`181`	`}`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public static function getInstance(): ResponseRenderer`
`192`	`192`	`*/`
`193`	`193`	`public function setRequestStatus(bool $state): void`
`194`	`194`	`{`
`195`		`- $this->isSuccess = ($state === true);`
	`195`	`+ $this->isSuccess = $state;`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`/**`