Psalm auto fixes manualy reviewed and edited

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Apr 28, 2020 · b7af136 · b7af136
1 parent 1b7f002
commit b7af136
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php
@@ -763,7 +763,7 @@ protected function displayHtmlForPartitionChange()
      *
      * @return array[]|null array of partition details
      */
-    private function _extractPartitionDetails()
+    private function _extractPartitionDetails(): ?array
     {
         $createTable = (new Table($this->table, $this->db))->showCreate();
         if (! $createTable) {

diff --git a/libraries/classes/Database/Designer/DesignerTable.php b/libraries/classes/Database/Designer/DesignerTable.php
@@ -71,10 +71,8 @@ public function getTableEngine(): string
 
     /**
      * Get the displayed field
-     *
-     * @return string
      */
-    public function getDisplayField()
+    public function getDisplayField(): ?string
     {
         return $this->displayField;
     }

diff --git a/libraries/classes/Database/Routines.php b/libraries/classes/Database/Routines.php
@@ -1559,9 +1559,9 @@ public function handleExecute()
      *
      * @param array $row Columns
      *
-     * @return string
+     * @return null|string
      */
-    private function browseRow(array $row)
+    private function browseRow(array $row): ?string
     {
         $output = null;
         foreach ($row as $value) {

diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
@@ -526,7 +526,7 @@ public static function isPointInsidePolygon(array $point, array $polygon)
      *
      * @param array $ring array of points forming the ring
      *
-     * @return array|bool a point on the surface of the ring
+     * @return array|false a point on the surface of the ring
      *
      * @access public
      * @static

diff --git a/libraries/classes/Plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php
@@ -328,9 +328,9 @@ public function checkRules()
      * Checks whether two factor authentication is active
      * for given user and performs it.
      *
-     * @return bool|void
+     * @return void
      */
-    public function checkTwoFactor()
+    public function checkTwoFactor(): void
     {
         $twofactor = new TwoFactor($this->user);
 

diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
@@ -302,7 +302,7 @@ public static function escapeJsString($string)
      *
      * @param string $value String to be formatted.
      *
-     * @return string formatted value.
+     * @return int|string formatted value.
      */
     public static function formatJsVal($value)
     {

diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php
@@ -701,7 +701,7 @@ public function getAttributes()
      *
      * @return string[]
      */
-    public function getColumns()
+    public function getColumns(): array
     {
         $isMariaDB = $this->_dbi->isMariaDB();
         $serverVersion = $this->_dbi->getVersion();

diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
@@ -517,7 +517,7 @@ public static function profilingSupported()
      *
      * @access public
      */
-    public static function formatByteDown($value, $limes = 6, $comma = 0)
+    public static function formatByteDown($value, $limes = 6, $comma = 0): ?array
     {
         if ($value === null) {
             return null;
@@ -712,7 +712,7 @@ public static function formatNumber(
      *
      * @return int The numerical part of the expression (for example 8)
      */
-    public static function extractValueFromFormattedSize($formatted_size)
+    public static function extractValueFromFormattedSize($formatted_size): int
     {
         $return_value = -1;
 
@@ -1965,7 +1965,7 @@ public static function unsupportedDatatypes()
      *
      * @return string[] GIS data types
      */
-    public static function getGISDatatypes($upper_case = false)
+    public static function getGISDatatypes($upper_case = false): array
     {
         $gis_data_types = [
             'geometry',