fixes type linting

fixes type linting

fixes type linting

fixes type linting

Author: ffflabs

.php_cs

@@ -43,7 +43,7 @@ $config->getFinder()
         'docs',
         'node_modules',
         'temp',
-
+        'src/router.php',
         'vendor',
         '.github',
     ])

Makefile

@@ -132,7 +132,7 @@ psalm:
 	@if [ -f "vendor/bin/psalm" ]; then \
 		mkdir -p .build/psalm ;\
 		${MAKE} disable_xdebug  --no-print-directory ;\
-		vendor/bin/psalm --show-info=false \
+		vendor/bin/psalm --show-info=true \
 			  --config=psalm.xml \
 			  --set-baseline=.build/psalm/psalm-baseline$(FOLDER_BASENAME).xml \
 			  --shepherd $(folder) ;\

README.md

@@ -27,10 +27,11 @@ Other enhancements are in progress and would be a nice to have:
 ## Requirements
 
 -   PHP 7.1+
+-   PostgreSQL v9+
 -   ext-psql
 -   [Composer](https://getcomposer.org/download/)
 
-(If you're using PHP 5.6+, you can still try versions RC2 and below, but you should really, realy upgrade).
+(If you're using PostgreSQL 7.4 or 8.x, or PHP 5.6+, you can still try versions RC2 and below, but you should really, realy upgrade).
 
 ---
 

composer.json

@@ -62,6 +62,6 @@
             "php -r \"array_map( 'unlink', array_filter((array) glob('temp/twigcache/**/*.php', GLOB_BRACE)));\"",
             "php -r \"array_map( 'rmdir', array_filter((array) glob('temp/twigcache/*', GLOB_BRACE)));\""
         ],
-        "phpstan": "phpstan analyse src --memory-limit=2G "
+        "phpstan": "phpstan analyse src   "
     }
 }

phpstan.neon

@@ -52,7 +52,10 @@ parameters:
 			message: "#^Result of method PHPPgAdmin\\\\[a-zA-Z0-9_]+\\\\[a-zA-Z0-9_]+\\:\\:[a-zA-Z0-9_]+\\(\\) \\(void\\) is used\\.$#"
 			path: src/*
 
- 
+		- 
+			message: "#^Call to static method br2ln\\(\\) on trait PHPPgAdmin\\Traits\\HelperTrait\\.#"
+			path: src/*
+
 		-
 			message: "#^Constructor of class [a-zA-Z0-9_]+\\\\[a-zA-Z0-9_]+\\\\[a-zA-Z0-9_]+ has an unused parameter \\$[a-zA-Z0-9_]+\\.$#"
 			path: src/*

src/classes/ADONewConnection.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * PHPPgAdmin 6.0.0
+ */
+
+namespace PHPPgAdmin;
+
+/**
+ * @file
+ * Extends \ADODB_postgres9 to let correct inference on PHPDoc params
+ */
+
+/**
+ * Extends \ADODB_postgres9 to let correct inference on PHPDoc params.
+ */
+class ADONewConnection extends \ADODB_postgres9
+{
+}

src/classes/ADORecordSet.php

@@ -23,4 +23,16 @@ public function count(): int
     {
         return $this->NumRows();
     }
+
+    /**
+     * Returns the recordCount.
+     *
+     * @param int $fieldoffset
+     *
+     * @return \ADOFieldObject the field
+     */
+    public function fetchField($fieldoffset = -1): \ADOFieldObject
+    {
+        return parent::fetchField();
+    }
 }

src/classes/Misc.php

@@ -6,6 +6,8 @@
 
 namespace PHPPgAdmin;
 
+use PHPPgAdmin\Database\Postgres;
+
 /**
  * @file
  * Class to hold various commonly used functions
@@ -64,6 +66,9 @@ class Misc
 
     private $_reload_browser = false;
 
+    /**
+     * @var Postgres
+     */
     private $_data;
 
     private $_database;
@@ -279,9 +284,9 @@ public function getErrorMsg()
      *
      * @internal mixed $plaform placeholder that will receive the value of the platform
      *
-     * @return null|\PHPPgAdmin\Database\ADOdbBase the database accessor instance
+     * @return null|\PHPPgAdmin\Database\Postgres the database accessor instance
      */
-    public function getDatabaseAccessor($database = '', $server_id = null): ?\PHPPgAdmin\Database\ADOdbBase
+    public function getDatabaseAccessor($database = '', $server_id = null): ?\PHPPgAdmin\Database\Postgres
     {
         $lang = $this->lang;
 

src/classes/ViewManager.php

@@ -60,6 +60,11 @@ class ViewManager extends \Slim\Views\Twig
 
     public $view;
 
+    /**
+     * @var \PHPPgAdmin\Misc
+     */
+    public $misc;
+
     protected $container;
 
     private $_connection;
@@ -101,7 +106,7 @@ public function __construct($path, $settings, \Slim\Container $c)
 
         $this->addExtension(new \Slim\Views\TwigExtension($c['router'], $basePath));
 
-        $this->offsetSet('subfolder', $c->subfolder);
+        $this->offsetSet('subfolder', self::SUBFOLDER);
         $this->offsetSet('theme', $this->misc->getConf('theme'));
         $this->offsetSet('Favicon', $this->icon('Favicon'));
         $this->offsetSet('Introduction', $this->icon('Introduction'));

src/controllers/DataimportController.php

@@ -37,8 +37,8 @@ public function render()
         /**
          * Character data handler for XML import feature.
          *
-         * @param $parser
-         * @param $cdata
+         * @param resource $parser
+         * @param string   $cdata
          */
         $_charHandler = static function ($parser, $cdata) use (&$state, &$curr_col_val): void {
             if ('COLUMN' === $state) {