adds some more type hints

index.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 // This section is made to be able to parse requests coming from PHP Builtin webserver

src/classes/ADONewConnection.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin;

src/classes/ADORecordSet.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin;
@@ -20,7 +20,12 @@
  */
 class ADORecordSet extends \ADORecordSet implements \Countable
 {
-    public function count()
+    /**
+     * Returns the recordCount.
+     *
+     * @return int
+     */
+    public function count(): int
     {
         return $this->recordCount();
     }

src/classes/ADOdbException.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin;
@@ -100,7 +100,7 @@ public function __construct($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnecti
      *
      * @internal param $P2 $fn specific parameter - see below
      */
-    public static function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
+    public static function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection): void
     {
         if (error_reporting() == 0) {
             return;

src/classes/ArrayRecordSet.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin;
@@ -59,7 +59,7 @@ public function recordCount()
      * Advance the internal pointer of the instance array
      * if no more fields are left, marks the instance variable $EOF as true.
      */
-    public function moveNext()
+    public function moveNext(): void
     {
         $this->fields = next($this->_array);
         if ($this->fields === false) {

src/classes/ContainerUtils.php

@@ -82,7 +82,12 @@ public function __construct()
         $this->container = $container;
     }
 
-    public static function createContainer($conf)
+    /**
+     * @psalm-return array{0: mixed, 1: mixed}
+     *
+     * @param mixed $conf
+     */
+    public static function createContainer($conf): array
     {
         if (!self::$instance) {
             self::$instance = new self();

src/classes/Misc.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin;
@@ -43,7 +43,7 @@ class Misc
     public $href            = '';
     public $controller_name = 'Misc';
     public $lang            = [];
-
+    public $conf            = [];
     protected $container;
 
     /**
@@ -178,7 +178,7 @@ public function getConf($key = null)
      * @param string $help     help section identifier
      * @param bool   $do_print true to echo, false to return
      */
-    public function printHelp($str, $help = null, $do_print = true)
+    public function printHelp($str, $help = null, $do_print = true): ?string
     {
         if ($help !== null) {
             $helplink = $this->getHelpLink($help);
@@ -494,7 +494,7 @@ public function getServerInfo($server_id = null)
      * @param mixed       $value     the new value, or null to unset the parameter
      * @param null|string $server_id the server identifier, or null for current server
      */
-    public function setServerInfo($key, $value, $server_id = null)
+    public function setServerInfo($key, $value, $server_id = null): void
     {
         if ($server_id === null) {
             $server_id = $this->container->requestobj->getParam('server');
@@ -626,7 +626,7 @@ public function getHREF($exclude_from = null)
     /**
      * Sets the form tracking variable.
      */
-    public function setForm()
+    public function setForm(): string
     {
         $form = [];
         if ($this->container->server) {
@@ -650,7 +650,7 @@ public function setForm()
      *
      * @param mixed $var The variable to strip (passed by reference)
      */
-    public function stripVar(&$var)
+    public function stripVar(&$var): void
     {
         if (is_array($var)) {
             foreach ($var as $k => $v) {
@@ -707,7 +707,12 @@ public function inisizeToBytes($strIniSize)
         }
     }
 
-    public function getRequestVars($subject = '')
+    /**
+     * @psalm-return array{subject?: mixed, server?: mixed, database?: mixed, schema?: mixed}
+     *
+     * @param mixed $subject
+     */
+    public function getRequestVars($subject = ''): array
     {
         $v = [];
         if (!empty($subject)) {
@@ -727,7 +732,7 @@ public function getRequestVars($subject = '')
         return $v;
     }
 
-    public function icon($icon)
+    public function icon($icon): string
     {
         if (!is_string($icon)) {
             return '';
@@ -814,7 +819,7 @@ public function escapeShellCmd($str)
      *
      * @param string $script the SQL script to save
      */
-    public function saveScriptHistory($script)
+    public function saveScriptHistory($script): void
     {
         list($usec, $sec) = explode(' ', microtime());
         $time             = ((float) $usec + (float) $sec);

src/classes/Translations.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin;

src/controllers/AcinsertController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/AggregatesController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/AlldbController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/BaseController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/BrowserController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/CastsController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/ColpropertiesController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/ConstraintsController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/ConversionsController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/DatabaseController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/DataexportController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/DataimportController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/DbexportController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/DisplayController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/DomainsController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/FulltextController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/FunctionsController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/GroupsController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/HelpController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/HistoryController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/IndexesController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/InfoController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;

src/controllers/IntroController.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin\Controller;