HuasoFoundries / phpPgAdmin6

src/classes/Highlight.php

Spacing +20 added lines, -23 removed lines

@@ -90,7 +90,7 @@ 
         public function __construct()
         {
 
-            $keyword_replace = function ($keywords, $text, $ncs = false) {
+            $keyword_replace = function($keywords, $text, $ncs = false) {
                 $cm = $ncs ? 'i' : '';
                 foreach ($keywords as $keyword) {
                     $search[]  = "/(\\b$keyword\\b)/" . $cm;
@@ -103,7 +103,7 @@ 
                 return preg_replace($search, $replace, $text);
             };
 
-            $preproc_replace = function ($preproc, $text) {
+            $preproc_replace = function($preproc, $text) {
                 foreach ($preproc as $proc) {
                     $search[]  = "/(\\s*#\s*$proc\\b)/";
                     $replace[] = '<span class="keyword">\\0</span>';
@@ -112,11 +112,11 @@ 
                 return preg_replace($search, $replace, $text);
             };
 
-            $sch_syntax_helper = function ($text) {
+            $sch_syntax_helper = function($text) {
                 return $text;
             };
 
-            $syntax_highlight_helper = function ($text, $language) use ($keyword_replace, $preproc_replace) {
+            $syntax_highlight_helper = function($text, $language) use ($keyword_replace, $preproc_replace) {
                 $preproc        = [];
                 $preproc['C++'] = [
                     'if',
@@ -1921,66 +1921,64 @@ 
                     'PL/I'   => true,
                     'SQL'    => true,
                 ];
-                $ncs              = false;
+                $ncs = false;
                 if (array_key_exists($language, $case_insensitive)) {
                     $ncs = true;
                 }
 
                 $text = array_key_exists($language, $preproc) ?
-                    $preproc_replace($preproc[$language], $text) :
-                    $text;
+                    $preproc_replace($preproc[$language], $text) : $text;
                 $text = array_key_exists($language, $keywords) ?
-                    $keyword_replace($keywords[$language], $text, $ncs) :
-                    $text;
+                    $keyword_replace($keywords[$language], $text, $ncs) : $text;
 
                 return $text;
             };
 
-            $rtrim1 = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $rtrim1 = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper(substr($span, 0, -1), $lang);
             };
 
-            $rtrim1_htmlesc = function ($span, $lang, $ch) {
+            $rtrim1_htmlesc = function($span, $lang, $ch) {
                 return htmlspecialchars(substr($span, 0, -1));
             };
 
-            $sch_rtrim1 = function ($span, $lang, $ch) use ($sch_syntax_helper) {
+            $sch_rtrim1 = function($span, $lang, $ch) use ($sch_syntax_helper) {
                 return $sch_syntax_helper(substr($span, 0, -1));
             };
 
-            $rtrim2 = function ($span, $lang, $ch) {
+            $rtrim2 = function($span, $lang, $ch) {
                 return substr($span, 0, -2);
             };
 
-            $syn_proc = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $syn_proc = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper($span, $lang);
             };
 
-            $dash_putback = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $dash_putback = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper('-' . $span, $lang);
             };
 
-            $slash_putback = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $slash_putback = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper('/' . $span, $lang);
             };
 
-            $slash_putback_rtrim1 = function ($span, $lang, $ch) use ($rtrim1) {
+            $slash_putback_rtrim1 = function($span, $lang, $ch) use ($rtrim1) {
                 return $rtrim1('/' . $span, $lang, $ch);
             };
 
-            $lparen_putback = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $lparen_putback = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper('(' . $span, $lang);
             };
 
-            $lparen_putback_rtrim1 = function ($span, $lang, $ch) use ($rtrim1) {
+            $lparen_putback_rtrim1 = function($span, $lang, $ch) use ($rtrim1) {
                 return $rtrim1('(' . $span, $lang, $ch);
             };
 
-            $prepend_xml_opentag = function ($span, $lang, $ch) {
+            $prepend_xml_opentag = function($span, $lang, $ch) {
                 return '<span class="xml_tag">&lt;' . $span;
             };
 
-            $proc_void = function ($span, $lang, $ch) {
+            $proc_void = function($span, $lang, $ch) {
                 return $span;
             };
 
@@ -2442,8 +2440,7 @@ 
 
                 $oldstate = $state;
                 $state    = array_key_exists($ch, $this->states[$language][$state]) ?
-                    $this->states[$language][$state][$ch] :
-                    $this->states[$language][$state][0];
+                    $this->states[$language][$state][$ch] : $this->states[$language][$state][0];
 
                 $span .= $ch;
 

Doc Comments +1 added lines, -1 removed lines

@@ -2413,7 +2413,7 @@
          * Does the bulk of the syntax highlighting by lexing the input
          * string, then calling the helper function to highlight keywords.
          *
-         * @param $text
+         * @param string $text
          * @param $language
          * @return string
          */

src/database/Postgres83.php

Spacing +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
             $status = -1; // ini
             if ($rs->recordCount() and ($rs->fields['vacrelid'] == $toid)) {
                 // table exists in pg_autovacuum, UPDATE
-                $sql    = sprintf("UPDATE \"pg_catalog\".\"pg_autovacuum\" SET
+                $sql = sprintf("UPDATE \"pg_catalog\".\"pg_autovacuum\" SET
 						enabled = '%s',
 						vac_base_thresh = %s,
 						vac_scale_factor = %s,

src/database/ADOdbBase.php

Spacing +1 added lines, -1 removed lines

@@ -394,7 +394,7 @@
         // Pick out array entries by carefully parsing.  This is necessary in order
         // to cope with double quotes and commas, etc.
         $elements  = [];
-        $i         = $j         = 0;
+        $i         = $j = 0;
         $in_quotes = false;
         while ($i < strlen($arr)) {
             // If current char is a double quote and it's not escaped, then

Doc Comments +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
      * @@ assumes that the query will return only one row - returns field value in the first row
      *
      * @param $sql   The SQL statement to be executed
-     * @param $field The field name to be returned
+     * @param string $field The field name to be returned
      * @return A single field value
      * @return -1 No rows were found
      */
@@ -347,7 +347,7 @@ 
     /**
      * Get the backend platform
      *
-     * @return The backend platform
+     * @return string backend platform
      */
     public function getPlatform()
     {
@@ -383,7 +383,7 @@ 
      * Change a db array into a PHP array
      *
      * @param $dbarr
-     * @return \PHPPgAdmin\Database\A PHP array
+     * @return string[] PHP array
      * @internal param String $arr representing the DB array
      */
     public function phpArray($dbarr)

src/database/Postgres.php

Spacing +1 added lines, -1 removed lines

@@ -2075,7 +2075,7 @@
         // Pick out individual ACE's by carefully parsing.  This is necessary in order
         // to cope with usernames and stuff that contain commas
         $aces      = [];
-        $i         = $j         = 0;
+        $i         = $j = 0;
         $in_quotes = false;
         while ($i < strlen($acl)) {
             // If current char is a double quote and it's not escaped, then

Doc Comments +23 added lines, -23 removed lines

@@ -376,7 +376,7 @@ 
      * Escapes bytea data for display on the screen
      *
      * @param $data The bytea data
-     * @return Data formatted for on-screen display
+     * @return string formatted for on-screen display
      */
     public function escapeBytea($data)
     {
@@ -401,7 +401,7 @@ 
      * Cleans (escapes) a string
      *
      * @param $str The string to clean, by reference
-     * @return The cleaned string
+     * @return null|string cleaned string
      */
     public function clean(&$str)
     {
@@ -484,7 +484,7 @@ 
      * Determines whether or not a user is a super user
      *
      * @param \PHPPgAdmin\Database\The|string $username The username of the user
-     * @return True if is a super user, false otherwise
+     * @return boolean if is a super user, false otherwise
      */
     public function isSuperUser($username = '')
     {
@@ -543,7 +543,7 @@ 
     /**
      * Returns the current database encoding
      *
-     * @return The encoding.  eg. SQL_ASCII, UTF-8, etc.
+     * @return string encoding.  eg. SQL_ASCII, UTF-8, etc.
      */
     public function getDatabaseEncoding()
     {
@@ -654,7 +654,7 @@ 
      * Sets the comment for an object in the database
      *
      * @pre All parameters must already be cleaned
-     * @param      $obj_type One of 'TABLE' | 'COLUMN' | 'VIEW' | 'SCHEMA' | 'SEQUENCE' | 'TYPE' | 'FUNCTION' | 'AGGREGATE'
+     * @param      string $obj_type One of 'TABLE' | 'COLUMN' | 'VIEW' | 'SCHEMA' | 'SEQUENCE' | 'TYPE' | 'FUNCTION' | 'AGGREGATE'
      * @param      $obj_name The name of the object for which to attach a comment.
      * @param      $table    Name of table that $obj_name belongs to.  Ignored unless $obj_type is 'TABLE' or 'COLUMN'.
      * @param      $comment  The comment to add.
@@ -1052,7 +1052,7 @@ 
     /**
      * Return the current schema search path
      *
-     * @return Array of schema names
+     * @return string[] of schema names
      */
     public function getSearchPath()
     {
@@ -1349,7 +1349,7 @@ 
      * @pre MUST be run within a transaction
      * @param           $table The table to define
      * @param bool|True $clean True to issue drop command, false otherwise
-     * @return \PHPPgAdmin\Database\A string containing the formatted SQL code
+     * @return null|string string containing the formatted SQL code
      */
     public function getTableDefPrefix($table, $clean = false)
     {
@@ -1990,7 +1990,7 @@ 
      * given its type.
      *
      * @param $object The name of the object whose privileges are to be retrieved
-     * @param $type   The type of the object (eg. database, schema, relation, function or language)
+     * @param string $type   The type of the object (eg. database, schema, relation, function or language)
      * @param $table  Optional, column's table if type = column
      * @return Privileges array
      * @return -1 invalid type
@@ -2203,8 +2203,8 @@ 
      * dumped after the table contents for speed and efficiency reasons
      *
      * @param $table The table to define
-     * @return A string containing the formatted SQL code
-     * @return null On error
+     * @return null|string string containing the formatted SQL code
+     * @return null|string On error
      */
     public function getTableDefSuffix($table)
     {
@@ -3093,7 +3093,7 @@ 
      *
      * @param $table  The table that contains the column
      * @param $column The column to alter
-     * @param $state  True to set null, false to set not null
+     * @param boolean $state  True to set null, false to set not null
      * @return \PHPPgAdmin\Database\A 0 success
      */
     public function setColumnNull($table, $column, $state)
@@ -3230,7 +3230,7 @@ 
      * Returns all available autovacuum per table information.
      *
      * @param \PHPPgAdmin\Database\if|string $table if given, return autovacuum info for the given table or return all informations for all table
-     * @return \PHPPgAdmin\Database\A recordset
+     * @return \PHPPgAdmin\ArrayRecordSet recordset
      */
     public function getTableAutovacuum($table = '')
     {
@@ -3535,7 +3535,7 @@ 
     /**
      * Delete a row from a table
      *
-     * @param      $table The table from which to delete
+     * @param      string $table The table from which to delete
      * @param      $key   An array mapping column => value to delete
      * @param bool $schema
      * @return bool|int 0 success
@@ -4125,7 +4125,7 @@ 
      *
      * @param $viewname   The name of the view to create
      * @param $definition The definition for the new view
-     * @param $replace    True to replace the view, false otherwise
+     * @param boolean $replace    True to replace the view, false otherwise
      * @param $comment
      * @return bool|int 0 success
      */
@@ -4373,7 +4373,7 @@ 
      *
      * @param $table The table to test
      *
-     * @return true if the table has been already clustered
+     * @return boolean if the table has been already clustered
      */
     public function alreadyClustered($table)
     {
@@ -6148,7 +6148,7 @@ 
      * Note: Only needed for pre-7.4 servers, this function is deprecated
      *
      * @param $trigger An array containing fields from the trigger table
-     * @return The trigger definition string
+     * @return string trigger definition string
      */
     public function getTriggerDef($trigger)
     {
@@ -6278,8 +6278,8 @@ 
     /**
      * Returns a list of all functions in the database
      *
-     * @param bool|\PHPPgAdmin\Database\If $all  If true, will find all available functions, if false just those in search path
-     * @param                              $type If not null, will find all functions with return value = type
+     * @param boolean $all  If true, will find all available functions, if false just those in search path
+     * @param                              string $type If not null, will find all functions with return value = type
      * @return \PHPPgAdmin\Database\All functions
      */
     public function getFunctions($all = false, $type = null)
@@ -8763,7 +8763,7 @@ 
      * @param $name     Entry in $_FILES to use
      * @param $callback (optional) Callback function to call with each query,
      *                  its result and line number.
-     * @return True for general success, false on any failure.
+     * @return boolean for general success, false on any failure.
      */
     public function executeScript($name, $callback = null)
     {
@@ -9033,8 +9033,8 @@ 
      * Private helper method to detect a valid $foo$ quote delimiter at
      * the start of the parameter dquote
      *
-     * @param $dquote
-     * @return True if valid, false otherwise
+     * @param string $dquote
+     * @return boolean if valid, false otherwise
      */
     private function valid_dolquote($dquote)
     {
@@ -9175,7 +9175,7 @@ 
      * @param $ops     An array of the operators to use
      * @param $orderby (optional) An array of column numbers or names (one based)
      *                 mapped to sort direction (asc or desc or '' or null) to order by
-     * @return The SQL query
+     * @return string SQL query
      */
     public function getSelectSQL($table, $show, $values, $ops, $orderby = [])
     {
@@ -9280,7 +9280,7 @@ 
      * Finds the number of rows that would be returned by a
      * query.
      *
-     * @param $query The SQL query
+     * @param string $query The SQL query
      * @param $count The count query
      * @return The count of rows
      * @return -1 error

src/controllers/MaterializedviewpropertiesController.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $attPre = function (&$rowdata) use ($data) {
+        $attPre = function(&$rowdata) use ($data) {
             $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
         };
 

src/controllers/AdminTrait.php

Spacing +1 added lines, -1 removed lines

@@ -638,7 +638,7 @@
             echo '<p>' . (($defaults['autovacuum'] == 'on') ? $lang['strturnedon'] : $lang['strturnedoff']) . '</p>';
             echo "<p class=\"message\">{$lang['strnotdefaultinred']}</p>";
 
-            $enlight = function ($f, $p) {
+            $enlight = function($f, $p) {
                 if (isset($f[$p[0]]) and ($f[$p[0]] != $p[1])) {
                     return '<span style="color:#F33;font-weight:bold">' . htmlspecialchars($f[$p[0]]) . '</span>';
                 }

Doc Comments +6 added lines

@@ -338,6 +338,7 @@ 
 
     /**
      * Add or Edit autovacuum params and save them
+     * @param boolean $confirm
      */
     public function doEditAutovacuum($type, $confirm, $msg = '')
     {
@@ -454,6 +455,7 @@ 
 
     /**
      * confirm drop autovacuum params for a table and drop it
+     * @param boolean $confirm
      */
     public function doDropAutovacuum($type, $confirm)
     {
@@ -736,6 +738,10 @@ 
         }
     }
 
+    /**
+     * @param string $action
+     * @param string $type
+     */
     public function adminActions($action, $type)
     {
         if ($type == 'database') {

src/controllers/SqlController.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
          * This is a callback function to display the result of each separate query
          * @param ADORecordSet $rs The recordset returned by the script execetor
          */
-        $sqlCallback = function ($query, $rs, $lineno) use ($data, $misc, $lang, $_connection) {
+        $sqlCallback = function($query, $rs, $lineno) use ($data, $misc, $lang, $_connection) {
 
             // Check if $rs is false, if so then there was a fatal error
             if ($rs === false) {

src/controllers/RolesController.php

Spacing +2 added lines, -2 removed lines

@@ -91,11 +91,11 @@
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $renderRoleConnLimit = function ($val) use ($lang) {
+        $renderRoleConnLimit = function($val) use ($lang) {
             return $val == '-1' ? $lang['strnolimit'] : htmlspecialchars($val);
         };
 
-        $renderRoleExpires = function ($val) use ($lang) {
+        $renderRoleExpires = function($val) use ($lang) {
             return $val == 'infinity' ? $lang['strnever'] : htmlspecialchars($val);
         };
 

Doc Comments +2 added lines

@@ -588,6 +588,7 @@ 
 
     /**
      * Show confirmation of drop a role and perform actual drop
+     * @param boolean $confirm
      */
     public function doDrop($confirm)
     {
@@ -806,6 +807,7 @@ 
 
     /**
      * Show confirmation of change password and actually change password
+     * @param boolean $confirm
      */
     public function doChangePassword($confirm, $msg = '')
     {

src/controllers/TriggersController.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $tgPre = function (&$rowdata, $actions) use ($data) {
+        $tgPre = function(&$rowdata, $actions) use ($data) {
             // toggle enable/disable trigger per trigger
             if (!$data->phpBool($rowdata->fields['tgenabled'])) {
                 unset($actions['disable']);

Doc Comments +3 added lines

@@ -294,6 +294,7 @@ 
 
     /**
      * Show confirmation of drop and perform actual drop
+     * @param boolean $confirm
      */
     public function doDrop($confirm)
     {
@@ -330,6 +331,7 @@ 
 
     /**
      * Show confirmation of enable trigger and perform enabling the trigger
+     * @param boolean $confirm
      */
     public function doEnable($confirm)
     {
@@ -365,6 +367,7 @@ 
 
     /**
      * Show confirmation of disable trigger and perform disabling the trigger
+     * @param boolean $confirm
      */
     public function doDisable($confirm)
     {