diff --git a/examples/signon-script.php b/examples/signon-script.php
index 202dca8c05..175c7f7869 100644
--- a/examples/signon-script.php
+++ b/examples/signon-script.php
@@ -32,10 +32,8 @@ function get_login_credentials($user)
     }
 
     /* Here we would retrieve the credentials */
-    $credentials = [
+    return [
         'root',
         '',
     ];
-
-    return $credentials;
 }
diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php
index f1791f7b2d..906b480e62 100644
--- a/libraries/classes/Gis/GisVisualization.php
+++ b/libraries/classes/Gis/GisVisualization.php
@@ -319,9 +319,7 @@ class GisVisualization
      */
     public function asSVG()
     {
-        $output = $this->_svg();
-
-        return $output;
+        return $this->_svg();
     }
 
     /**
diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
index 38c7c161fe..63a2fabdda 100644
--- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
@@ -876,8 +876,7 @@ class AuthenticationCookie extends AuthenticationPlugin
         if ($this->_use_openssl) {
             return openssl_cipher_iv_length('AES-128-CBC');
         }
-        $cipher = new Crypt\AES(Crypt\Base::MODE_CBC);
-        return $cipher->block_size;
+        return (new Crypt\AES(Crypt\Base::MODE_CBC))->block_size;
     }
 
     /**
diff --git a/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php
index 72c9dd365f..087b1e18cf 100644
--- a/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php
+++ b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php
@@ -55,8 +55,6 @@ class UploadNoplugin implements UploadInterface
                 'plugin'   => UploadNoplugin::getIdKey(),
             ];
         }
-        $ret = $_SESSION[$SESSION_KEY][$id];
-
-        return $ret;
+        return $_SESSION[$SESSION_KEY][$id];
     }
 }
diff --git a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php
index deb79610ba..6f3d3e90f5 100644
--- a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php
@@ -45,9 +45,7 @@ abstract class SQLTransformationsPlugin extends TransformationsPlugin
     public function applyTransformation($buffer, array $options = [], ?stdClass $meta = null)
     {
         // see PMA_highlightSQL()
-        $result = Util::formatSql($buffer);
-
-        return $result;
+        return Util::formatSql($buffer);
     }
 
 
diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
index c487068103..1bae033e01 100644
--- a/libraries/classes/Server/Privileges.php
+++ b/libraries/classes/Server/Privileges.php
@@ -5341,9 +5341,7 @@ class Privileges
             "SELECT PASSWORD('" . $password . "') AS `password`;"
         );
 
-        $hashedPassword = $result['password'];
-
-        return $hashedPassword;
+        return $result['password'];
     }
 
     /**
diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
index 58d06a2dfd..d04e981996 100644
--- a/libraries/classes/Sql.php
+++ b/libraries/classes/Sql.php
@@ -553,9 +553,7 @@ EOT;
             DatabaseInterface::QUERY_STORE
         );
 
-        $values = Util::parseEnumSetValues($field_info_result[0]['Type']);
-
-        return $values;
+        return Util::parseEnumSetValues($field_info_result[0]['Type']);
     }
 
     /**
diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php
index 597aeb7473..ce66dd5769 100644
--- a/libraries/classes/Table.php
+++ b/libraries/classes/Table.php
@@ -2650,8 +2650,7 @@ class Table
                 $sql .= " AND  `COLUMN_NAME` = '" . $this->_dbi->escapeString($column)
                     . "'";
             }
-            $columns = $this->_dbi->fetchResult($sql, 'Field', 'Expression');
-            return $columns;
+            return $this->_dbi->fetchResult($sql, 'Field', 'Expression');
         }
 
         $createTable = $this->showCreate();
diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php
index ddceb176b9..1bf1021fc7 100644
--- a/libraries/classes/Tracker.php
+++ b/libraries/classes/Tracker.php
@@ -320,9 +320,7 @@ class Tracker
             $sql_query .= " AND `version` = '"
                 . $GLOBALS['dbi']->escapeString($version) . "'";
         }
-        $result = $relation->queryAsControlUser($sql_query);
-
-        return $result;
+        return $relation->queryAsControlUser($sql_query);
     }
 
     /**
@@ -387,9 +385,7 @@ class Tracker
         '" . $GLOBALS['dbi']->escapeString($tracking_set)
         . "' )";
 
-        $result = $relation->queryAsControlUser($sql_query);
-
-        return $result;
+        return $relation->queryAsControlUser($sql_query);
     }
 
 
@@ -420,9 +416,7 @@ class Tracker
         " AND `table_name` = '" . $GLOBALS['dbi']->escapeString($tablename) . "' " .
         " AND `version` = '" . $GLOBALS['dbi']->escapeString((string) $version) . "' ";
 
-        $result = $relation->queryAsControlUser($sql_query);
-
-        return $result;
+        return $relation->queryAsControlUser($sql_query);
     }
 
     /**
diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php
index f6a3a93eb9..1244f1ae83 100644
--- a/libraries/classes/Tracking.php
+++ b/libraries/classes/Tracking.php
@@ -1280,8 +1280,8 @@ class Tracking
     public function getUntrackedTables($db)
     {
         $table_list = Util::getTableList($db);
-        $untracked_tables = $this->extractTableNames($table_list, $db);  //Use helper function to get table list recursively.
-        return $untracked_tables;
+        //Use helper function to get table list recursively.
+        return $this->extractTableNames($table_list, $db);
     }
 
     /**
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 47a1dcf86f..1752c7ad0c 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -157,9 +157,7 @@ class Util
 
         // generate the IMG tag
         $template = '<img src="themes/dot.gif" title="%s" alt="%s"%s>';
-        $retval = sprintf($template, $title, $alt, $attr_str);
-
-        return $retval;
+        return sprintf($template, $title, $alt, $attr_str);
     }
 
     /**
@@ -3524,8 +3522,7 @@ class Util
      */
     public static function unsupportedDatatypes()
     {
-        $no_support_types = [];
-        return $no_support_types;
+        return [];
     }
 
     /**