csfixer

46 files changed, 332 insertions, 279 deletions

diff --git a/.php_cs b/.php_cs.php
index 43d3c524..43d3c524 100644
--- a/.php_cs
+++ b/.php_cs.php
diff --git a/Makefile b/Makefile
index 48185763..eb2a8fe6 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ csfixer:
 		echo "XDEBUG was: "$(XDSWI_STATUS) ;\
 		${MAKE} disable_xdebug  --no-print-directory ;\
 		mkdir -p .build/php-cs-fixer ;\
-        vendor/bin/php-cs-fixer fix --config=.php_cs --verbose ;\
+        vendor/bin/php-cs-fixer fix --config=.php_cs.php --verbose ;\
 		${MAKE} enable_xdebug new_status=$(XDSWI_STATUS)  --no-print-directory;\
     else \
         echo -e "$(GREEN)php-cs-fixer$(WHITE) is $(RED)NOT$(WHITE) installed. " ;\
diff --git a/src/classes/ContainerUtils.php b/src/classes/ContainerUtils.php
index d9477472..5613dc6c 100644
--- a/src/classes/ContainerUtils.php
+++ b/src/classes/ContainerUtils.php
@@ -6,8 +6,8 @@
 
 namespace PHPPgAdmin;
 
-use Slim\Container;
 use Slim\App;
+use Slim\Container;
 
 \defined('BASE_PATH') || \define('BASE_PATH', \dirname(__DIR__, 2));
 \defined('THEME_PATH') || \define('THEME_PATH', BASE_PATH . '/assets/themes');
@@ -161,7 +161,7 @@ class ContainerUtils
     public static function createApp($conf)
     {
         $_instance = self::getInstance();
-        
+
         $_instance
             ->withConf($conf)
             ->setExtra()
@@ -171,7 +171,6 @@ class ContainerUtils
         //ddd($container->subfolder);
         return $_instance->_app;
     }
- 
 
     /**
      * Determines the redirection url according to query string.
@@ -225,13 +224,14 @@ class ContainerUtils
         $this->addFlash($subject, 'getDestinationWithLastTab');
         //$this->prtrace('$_server_info', $_server_info);
         // If username isn't set in server_info, you should login
-        $url = $this->container->misc->getLastTabURL($subject)??['url'=>'alldb','urlvars'=>[ 'subject'=>'server']];
+        $url = $this->container->misc->getLastTabURL($subject) ?? ['url' => 'alldb', 'urlvars' => ['subject' => 'server']];
         $destinationurl = $this->getRedirectUrl();
-       
+
         if (!isset($_server_info['username'])) {
             return $destinationurl;
         }
-        if (!is_array($url)) {
+
+        if (!\is_array($url)) {
             return $this->getRedirectUrl($subject);
         }
         $this->addFlash($url, 'getLastTabURL for ' . $subject);
@@ -248,7 +248,7 @@ class ContainerUtils
         }
         $actionurl = \PHPPgAdmin\Decorators\Decorator::actionurl($url['url'], $_GET);
         $destinationurl = $actionurl->value($_GET);
-        
+
         return \str_replace('views/?', "views/{$subject}?", $destinationurl);
     }
 
@@ -259,7 +259,7 @@ class ContainerUtils
      *
      * @return\Slim\Container The app container
      */
-    public function addError(string $errormsg):\Slim\Container
+    public function addError(string $errormsg): \Slim\Container
     {
         //dump($errormsg);
         $errors = $this->container->get('errors');
@@ -268,15 +268,16 @@ class ContainerUtils
 
         return $this->container;
     }
+
     /**
      * @param array $conf
      */
-    private function withConf($conf):self
+    private function withConf($conf): self
     {
         $container = self::getContainerInstance();
         $conf['plugins'] = [];
 
-        $container['conf'] = static function (\Slim\Container $c) use ($conf):array {
+        $container['conf'] = static function (\Slim\Container $c) use ($conf): array {
             $display_sizes = $conf['display_sizes'];
 
             if (\is_array($display_sizes)) {
@@ -310,7 +311,8 @@ class ContainerUtils
         $container->subfolder = self::SUBFOLDER;
 
         return $this;
-    } 
+    }
+
     /**
      * Sets the views.
      *
@@ -323,7 +325,7 @@ class ContainerUtils
         /**
          * @return \PHPPgAdmin\ViewManager
          */
-        $container['view'] = static function (\Slim\Container $c):\PHPPgAdmin\ViewManager {
+        $container['view'] = static function (\Slim\Container $c): \PHPPgAdmin\ViewManager {
             $misc = $c->misc;
             $view = new ViewManager(BASE_PATH . '/assets/templates', [
                 'cache' => BASE_PATH . '/temp/twigcache',
@@ -350,7 +352,7 @@ class ContainerUtils
         /**
          * @return \PHPPgAdmin\Misc
          */
-        $container['misc'] = static function (\Slim\Container $c):\PHPPgAdmin\Misc {
+        $container['misc'] = static function (\Slim\Container $c): \PHPPgAdmin\Misc {
             $misc = new \PHPPgAdmin\Misc($c);
 
             $conf = $c->get('conf');
@@ -372,11 +374,11 @@ class ContainerUtils
     private function setExtra()
     {
         $container = self::getContainerInstance();
-        $container['flash'] = static function ():\Slim\Flash\Messages {
+        $container['flash'] = static function (): \Slim\Flash\Messages {
             return new \Slim\Flash\Messages();
         };
 
-        $container['lang'] = static function (\Slim\Container $c):array {
+        $container['lang'] = static function (\Slim\Container $c): array {
             $translations = new \PHPPgAdmin\Translations($c);
 
             return $translations->lang;
@@ -384,5 +386,4 @@ class ContainerUtils
 
         return $this;
     }
- 
 }
diff --git a/src/classes/Misc.php b/src/classes/Misc.php
index 702a8b58..c956e9a1 100644
--- a/src/classes/Misc.php
+++ b/src/classes/Misc.php
@@ -38,64 +38,96 @@ class Misc
      */
     const DEBUGMODE = ContainerUtils::DEBUGMODE;
 
-    
-    /** @var array */
+    /**
+     * @var array
+     */
     public $appLangFiles = [];
-    
-    /** @var string */
+
+    /**
+     * @var string
+     */
     public $appName = '';
-    
-    /** @var string */
-    public $appVersion = '';
 
+    /**
+     * @var string
+     */
+    public $appVersion = '';
 
     public $form = '';
-    
-    /** @var string */
+
+    /**
+     * @var string
+     */
     public $href = '';
-    
-    /** @var array */
+
+    /**
+     * @var array
+     */
     public $lang = [];
-    
-    /** @var array */
+
+    /**
+     * @var array
+     */
     public $conf;
-    
-    /** @var string */
+
+    /**
+     * @var string
+     */
     public $phpMinVer;
-    
-    /** @var string */
+
+    /**
+     * @var string
+     */
     public $postgresqlMinVer;
-    
-    /** @var \Slim\Views\Twig */
+
+    /**
+     * @var \Slim\Views\Twig
+     */
     public $view;
 
-    /** @var \Slim\Container */
+    /**
+     * @var \Slim\Container
+     */
     protected $container;
-    
-    /** @var \PHPPgAdmin\Database\Connection|null */
+
+    /**
+     * @var null|\PHPPgAdmin\Database\Connection
+     */
     private $_connection;
-    
-    /** @var bool */
+
+    /**
+     * @var bool
+     */
     private $_no_db_connection = false;
-    
-    /** @var bool */
+
+    /**
+     * @var bool
+     */
     private $_reload_browser = false;
 
     /**
-     * @var Postgres|null
+     * @var null|Postgres
      */
     private $_data;
-    
-    /** @var string|null */
+
+    /**
+     * @var null|string
+     */
     private $_database;
-    
-    /** @var string|null */
+
+    /**
+     * @var null|string
+     */
     private $_server_id;
-    
-    /** @var array|null */
+
+    /**
+     * @var null|array
+     */
     private $_server_info;
-    
-    /** @var string */
+
+    /**
+     * @var string
+     */
     private $_error_msg = '';
 
     /**
@@ -144,7 +176,6 @@ class Misc
      * @param null|string $key value of the key to be retrieved. If null, the full array is returnes
      *
      * @return null|array|string the whole $conf array, the value of $conf[key] or null if said key does not exist
-    
      */
     public function getConf($key = null)
     {
@@ -166,7 +197,6 @@ class Misc
      * @param mixed  $value value of the key to set
      *
      * @return \PHPPgAdmin\Misc this class instance
-    
      */
     public function setConf($key, $value)
     {
@@ -174,9 +204,9 @@ class Misc
 
         return $this;
     }
+
     /**
      * @return string|null
-    
      */
     public function serverToSha()
     {
@@ -193,9 +223,9 @@ class Misc
 
         return $request_server;
     }
+
     /**
      * @return string
-    
      */
     public function getServerId()
     {
@@ -223,7 +253,6 @@ class Misc
      * @param \Slim\Views\Twig $view view instance
      *
      * @return \PHPPgAdmin\Misc this class instance
-    
      */
     public function setView(\Slim\Views\Twig $view)
     {
@@ -238,7 +267,6 @@ class Misc
      * @param bool $flag sets internal $_reload_browser var which will be passed to the footer methods
      *
      * @return \PHPPgAdmin\Misc this class instance
-    
      */
     public function setReloadBrowser($flag)
     {
@@ -246,16 +274,15 @@ class Misc
 
         return $this;
     }
-/**
- * @return bool
- */
 
+    /**
+     * @return bool
+     */
     public function getReloadBrowser()
     {
         return $this->_reload_browser;
     }
 
-
     public function getContainer()
     {
         return $this->container;
@@ -267,7 +294,6 @@ class Misc
      * @param bool $flag true or false to allow unconnected clients to access the view
      *
      * @return \PHPPgAdmin\Misc this class instance
-    
      */
     public function setNoDBConnection($flag)
     {
@@ -280,7 +306,6 @@ class Misc
      * Gets member variable $_no_db_connection.
      *
      * @return bool value of member variable $_no_db_connection
-    
      */
     public function getNoDBConnection()
     {
@@ -293,7 +318,6 @@ class Misc
      * @param string $msg error message string
      *
      * @return \PHPPgAdmin\Misc this class instance
-    
      */
     public function setErrorMsg($msg)
     {
@@ -306,7 +330,6 @@ class Misc
      * Returns the error messages stored in member variable $_error_msg.
      *
      * @return string the error message
-    
      */
     public function getErrorMsg()
     {
@@ -321,8 +344,7 @@ class Misc
      *
      * @internal mixed $plaform placeholder that will receive the value of the platform
      *
-     * @return \PHPPgAdmin\Database\Postgres|null the database accessor instance
-    
+     * @return null|\PHPPgAdmin\Database\Postgres the database accessor instance
      */
     public function getDatabaseAccessor($database = '', $server_id = null): ?\PHPPgAdmin\Database\Postgres
     {
@@ -406,14 +428,15 @@ class Misc
         return $this->_data;
     }
 
-/**
- * Undocumented function
- *
- * @param string $database
- * @param string $server_id
- * @return \PHPPgAdmin\Database\Connection
- */
-    public function getConnection(string $database = '', $server_id = null):\PHPPgAdmin\Database\Connection
+    /**
+     * Undocumented function.
+     *
+     * @param string $database
+     * @param string $server_id
+     *
+     * @return \PHPPgAdmin\Database\Connection
+     */
+    public function getConnection(string $database = '', $server_id = null): \PHPPgAdmin\Database\Connection
     {
         $lang = $this->lang;
 
@@ -476,7 +499,6 @@ class Misc
      * @param string $server_id A server identifier (host:port)
      *
      * @return null|array An associative array of server properties
-    
      */
     public function getServerInfo($server_id = null)
     {
@@ -537,7 +559,6 @@ class Misc
      *                               params with the assoc-array in $value
      * @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): void
     {
@@ -560,7 +581,6 @@ class Misc
         }
     }
 
-
     public function getDatabase(string $database = '')
     {
         if (null === $this->_server_id && !isset($_REQUEST['database'])) {
@@ -597,7 +617,6 @@ class Misc
      * @param string $schema The schema name
      *
      * @return int 0 on success
-    
      */
     public function setCurrentSchema($schema)
     {
@@ -622,7 +641,6 @@ class Misc
      * @param bool $all (optional) True to check pg_dumpall, false to just check pg_dump
      *
      * @return bool True, dumps are set up, false otherwise
-    
      */
     public function isDumpEnabled($all = false)
     {
@@ -635,7 +653,6 @@ class Misc
      * Sets the href tracking variable.
      *
      * @return \PHPPgAdmin\Misc this class instance
-    
      */
     public function setHREF()
     {
@@ -650,7 +667,6 @@ class Misc
      * @param null|string $exclude_from
      *
      * @return string
-    
      */
     public function getHREF($exclude_from = null)
     {
@@ -682,7 +698,6 @@ class Misc
      * enforce magic_quotes_gpc being off.
      *
      * @param mixed $var The variable to strip (passed by reference)
-    
      */
     public function stripVar(&$var): void
     {
@@ -712,7 +727,6 @@ class Misc
      * @param mixed $strIniSize The PHP.INI variable
      *
      * @return bool|float|int size in bytes, false on failure
-    
      */
     public function inisizeToBytes($strIniSize)
     {
@@ -743,7 +757,6 @@ class Misc
         }
     }
 
-
     public function getRequestVars($subject = '')
     {
         $v = [];
@@ -773,7 +786,6 @@ class Misc
      * @param string $str The string to escape
      *
      * @return null|string The escaped string
-    
      */
     public function escapeShellArg($str): ?string
     {
@@ -800,7 +812,6 @@ class Misc
      * @param string $str The string to escape
      *
      * @return string The escaped string
-    
      */
     public function escapeShellCmd($str)
     {
@@ -820,7 +831,6 @@ class Misc
      * of the database and server.
      *
      * @param string $script the SQL script to save
-    
      */
     public function saveScriptHistory($script): void
     {
diff --git a/src/classes/Translations.php b/src/classes/Translations.php
index 80fda78a..e8322939 100644
--- a/src/classes/Translations.php
+++ b/src/classes/Translations.php
@@ -11,11 +11,16 @@ namespace PHPPgAdmin;
  */
 class Translations
 {
-    /** @var array */
+    /**
+     * @var array
+     */
     public $lang;
 
     // List of language files, and encoded language name.
-/** @var array */
+
+    /**
+     * @var array
+     */
     public $appLangFiles = [
         'afrikaans' => 'Afrikaans',
         'arabic' => 'عربي',
@@ -50,7 +55,10 @@ class Translations
         'turkish' => 'Türkçe',
         'ukrainian' => 'Укра╖нська',
     ];
-/** @var array */
+
+    /**
+     * @var array
+     */
     public $appClasses = [
         'afrikaans' => 'Afrikaans',
         'arabic' => 'Arabic',
@@ -127,7 +135,10 @@ class Translations
         'tr' => 'turkish',
         'uk' => 'ukrainian',
     ];
-/** @var array */
+
+    /**
+     * @var array
+     */
     public $languages_iso_code = [
         'afrikaans' => 'af',
         'arabic' => 'ar',
diff --git a/src/classes/ViewManager.php b/src/classes/ViewManager.php
index 940de6d0..38f158df 100644
--- a/src/classes/ViewManager.php
+++ b/src/classes/ViewManager.php
@@ -5,7 +5,7 @@
  */
 
 namespace PHPPgAdmin;
-use PHPPgAdmin\ContainerUtils; 
+
 /**
  * @file
  * Class to hold various commonly used functions
@@ -39,26 +39,52 @@ class ViewManager extends \Slim\Views\Twig
      * @var string
      */
     const DEBUGMODE = ContainerUtils::DEBUGMODE;
-/** @var array */
+
+    /**
+     * @var array
+     */
     public $appLangFiles = [];
-/** @var string */
+
+    /**
+     * @var string
+     */
     public $appName = '';
-/** @var string */
+
+    /**
+     * @var string
+     */
     public $appVersion = '';
-/** @var string */
+
+    /**
+     * @var string
+     */
     public $form = '';
-/** @var string */
+
+    /**
+     * @var string
+     */
     public $href = '';
-/** @var array */
+
+    /**
+     * @var array
+     */
     public $lang = [];
-/** @var array */
+
+    /**
+     * @var array
+     */
     public $conf;
-/** @var string */
+
+    /**
+     * @var string
+     */
     public $phpMinVer;
-/** @var string */
+
+    /**
+     * @var string
+     */
     public $postgresqlMinVer;
 
- 
     /**
      * @var \PHPPgAdmin\Misc
      */
@@ -124,15 +150,6 @@ class ViewManager extends \Slim\Views\Twig
             $this->misc->setConf('theme', $_theme);
         }
     }
-    /**
-     * Undocumented function
-     *
-     * @param string $subject
-     * @return class-string
-     */
-    private static function getControllerClassName(string $subject) {
-        return '\PHPPgAdmin\Controller\\' . \ucfirst($subject) . 'Controller';
-    }
 
     public function maybeRenderIframes($response, $subject, $query_string)
     {
@@ -141,7 +158,7 @@ class ViewManager extends \Slim\Views\Twig
         $in_test = $this->offsetGet('in_test');
 
         if ('1' === $in_test) {
-            $className =self::getControllerClassName($subject);
+            $className = self::getControllerClassName($subject);
             $controller = new $className($c);
 
             return $controller->render();
@@ -195,7 +212,7 @@ class ViewManager extends \Slim\Views\Twig
             \is_string($conf['theme']) &&
             \array_key_exists($conf['theme'], $themefolders)) {
             $_theme = $conf['theme'];
-            }
+        }
 
         return $_theme;
     }
@@ -203,7 +220,7 @@ class ViewManager extends \Slim\Views\Twig
     /**
      * Sets the form tracking variable.
      */
-    public function setForm():string
+    public function setForm(): string
     {
         $form = [];
 
@@ -241,6 +258,7 @@ class ViewManager extends \Slim\Views\Twig
      * @param string $str      the string that the context help is related to (already escaped)
      * @param string $help     help section identifier
      * @param bool   $do_print true to echo, false to return
+     *
      * @return string|void
      */
     public function printHelp($str, $help = null, $do_print = true)
@@ -274,14 +292,15 @@ class ViewManager extends \Slim\Views\Twig
             \urlencode($this->misc->getServerId())
         );
     }
+
     /**
      * @param string $icon
+     *
      * @return string
      */
-    public function icon(  $icon=''):string
+    public function icon($icon = ''): string
     {
-       
-        $icon=strval($icon??'');
+        $icon = (string) ($icon ?? '');
 
         $theme = $this->conf['theme'];
         $path = 'assets/images/themes';
@@ -314,7 +333,19 @@ class ViewManager extends \Slim\Views\Twig
         return $default_icon;
     }
 
-    private function getContainer():\Slim\Container
+    /**
+     * Undocumented function.
+     *
+     * @param string $subject
+     *
+     * @return class-string
+     */
+    private static function getControllerClassName(string $subject)
+    {
+        return '\PHPPgAdmin\Controller\\' . \ucfirst($subject) . 'Controller';
+    }
+
+    private function getContainer(): \Slim\Container
     {
         return $this->container;
     }
@@ -325,7 +356,7 @@ class ViewManager extends \Slim\Views\Twig
      *
      * @return array the theme folders
      */
-    private function getThemeFolders():array
+    private function getThemeFolders(): array
     {
         // no THEME_PATH (how?) then return empty array
         if (!$gestor = \opendir(self::THEME_PATH)) {
diff --git a/src/controllers/AlldbController.php b/src/controllers/AlldbController.php
index bb08a67f..d5431215 100644
--- a/src/controllers/AlldbController.php
+++ b/src/controllers/AlldbController.php
@@ -355,7 +355,7 @@ class AlldbController extends BaseController
             }
 
             echo '<input type="hidden" name="action" value="drop" />' . \PHP_EOL;
-            
+
             echo $this->view->form;
             echo "<input type=\"submit\" name=\"drop\" value=\"{$this->lang['strdrop']}\" />" . \PHP_EOL;
             echo "<input type=\"submit\" name=\"cancel\" value=\"{$this->lang['strcancel']}\" />" . \PHP_EOL;
@@ -496,7 +496,7 @@ class AlldbController extends BaseController
             ('' === $_POST['formSpc']) ? ' selected="selected"' : '', '></option>' . \PHP_EOL;
             // Display all other tablespaces
             while (!$tablespaces->EOF) {
-                $spcname = \htmlspecialchars($tablespaces->fields['spcname']??'');
+                $spcname = \htmlspecialchars($tablespaces->fields['spcname'] ?? '');
                 echo "\t\t\t\t<option value=\"{$spcname}\"",
                 ($spcname === $_POST['formSpc']) ? ' selected="selected"' : '', ">{$spcname}</option>" . \PHP_EOL;
                 $tablespaces->moveNext();
diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
index 71b80c00..c10431f4 100644
--- a/src/controllers/BaseController.php
+++ b/src/controllers/BaseController.php
@@ -62,7 +62,10 @@ class BaseController
     public $controller_title = 'base';
 
     public $msg = '';
-/** @var \PHPPgAdmin\ViewManager */
+
+    /**
+     * @var \PHPPgAdmin\ViewManager
+     */
     public $view;
 
     public $misc;
diff --git a/src/controllers/SequencesController.php b/src/controllers/SequencesController.php
index ce59c87c..3c9d7d0b 100644
--- a/src/controllers/SequencesController.php
+++ b/src/controllers/SequencesController.php
@@ -125,17 +125,17 @@ class SequencesController extends BaseController
             'sequence' => [
                 'title' => $this->lang['strsequence'],
                 'field' => Decorator::field('seqname'),
-                'url'   => "sequences?action=properties&amp;{$this->misc->href}&amp;",
-                'vars'  => ['sequence' => 'seqname'],
+                'url' => "sequences?action=properties&amp;{$this->misc->href}&amp;",
+                'vars' => ['sequence' => 'seqname'],
             ],
-            'owner'    => [
+            'owner' => [
                 'title' => $this->lang['strowner'],
                 'field' => Decorator::field('seqowner'),
             ],
-            'actions'  => [
+            'actions' => [
                 'title' => $this->lang['stractions'],
             ],
-            'comment'  => [
+            'comment' => [
                 'title' => $this->lang['strcomment'],
                 'field' => Decorator::field('seqcomment'),
             ],
@@ -144,41 +144,41 @@ class SequencesController extends BaseController
         $actions = [
             'multiactions' => [
                 'keycols' => ['sequence' => 'seqname'],
-                'url'     => 'sequences',
+                'url' => 'sequences',
             ],
-            'alter'        => [
+            'alter' => [
                 'content' => $this->lang['stralter'],
-                'attr'    => [
+                'attr' => [
                     'href' => [
-                        'url'     => 'sequences',
+                        'url' => 'sequences',
                         'urlvars' => [
-                            'action'   => 'confirm_alter',
-                            'subject'  => 'sequence',
+                            'action' => 'confirm_alter',
+                            'subject' => 'sequence',
                             'sequence' => Decorator::field('seqname'),
                         ],
                     ],
                 ],
             ],
-            'drop'         => [
-                'content'     => $this->lang['strdrop'],
-                'attr'        => [
+            'drop' => [
+                'content' => $this->lang['strdrop'],
+                'attr' => [
                     'href' => [
-                        'url'     => 'sequences',
+                        'url' => 'sequences',
                         'urlvars' => [
-                            'action'   => 'confirm_drop',
+                            'action' => 'confirm_drop',
                             'sequence' => Decorator::field('seqname'),
                         ],
                     ],
                 ],
                 'multiaction' => 'confirm_drop',
             ],
-            'privileges'   => [
+            'privileges' => [
                 'content' => $this->lang['strprivileges'],
-                'attr'    => [
+                'attr' => [
                     'href' => [
-                        'url'     => 'privileges',
+                        'url' => 'privileges',
                         'urlvars' => [
-                            'subject'  => 'sequence',
+                            'subject' => 'sequence',
                             'sequence' => Decorator::field('seqname'),
                         ],
                     ],
@@ -189,14 +189,14 @@ class SequencesController extends BaseController
         echo $this->printTable($sequences, $columns, $actions, 'sequences-sequences', $this->lang['strnosequences']);
 
         $this->printNavLinks(['create' => [
-            'attr'    => [
+            'attr' => [
                 'href' => [
-                    'url'     => 'sequences',
+                    'url' => 'sequences',
                     'urlvars' => [
-                        'action'   => 'create',
-                        'server'   => $_REQUEST['server'],
+                        'action' => 'create',
+                        'server' => $_REQUEST['server'],
                         'database' => $_REQUEST['database'],
-                        'schema'   => $_REQUEST['schema'],
+                        'schema' => $_REQUEST['schema'],
                     ],
                 ],
             ],
@@ -212,22 +212,22 @@ class SequencesController extends BaseController
         $data = $this->misc->getDatabaseAccessor();
 
         $sequences = $data->getSequences();
-        $reqvars   = $this->misc->getRequestVars('sequence');
+        $reqvars = $this->misc->getRequestVars('sequence');
 
         $actionURL = Decorator::actionurl(
             'sequences',
             $reqvars,
             [
-                'action'   => 'properties',
+                'action' => 'properties',
                 'sequence' => Decorator::field('seqname'),
             ]
         );
         dump($sequences, $actionURL);
         $attrs = [
-            'text'    => Decorator::field('seqname'),
-            'icon'    => 'Sequence',
+            'text' => Decorator::field('seqname'),
+            'icon' => 'Sequence',
             'toolTip' => Decorator::field('seqcomment'),
-            'action'  => $actionURL,
+            'action' => $actionURL,
         ];
 
         return $this->printTree($sequences, $attrs, 'sequences');
@@ -289,30 +289,30 @@ class SequencesController extends BaseController
             echo '</table>';
 
             $navlinks = [
-                'alter'   => [
-                    'attr'    => [
+                'alter' => [
+                    'attr' => [
                         'href' => [
-                            'url'     => 'sequences',
+                            'url' => 'sequences',
                             'urlvars' => [
-                                'action'   => 'confirm_alter',
-                                'server'   => $_REQUEST['server'],
+                                'action' => 'confirm_alter',
+                                'server' => $_REQUEST['server'],
                                 'database' => $_REQUEST['database'],
-                                'schema'   => $_REQUEST['schema'],
+                                'schema' => $_REQUEST['schema'],
                                 'sequence' => $sequence->fields['seqname'],
                             ],
                         ],
                     ],
                     'content' => $this->lang['stralter'],
                 ],
-                'setval'  => [
-                    'attr'    => [
+                'setval' => [
+                    'attr' => [
                         'href' => [
-                            'url'     => 'sequences',
+                            'url' => 'sequences',
                             'urlvars' => [
-                                'action'   => 'confirm_setval',
-                                'server'   => $_REQUEST['server'],
+                                'action' => 'confirm_setval',
+                                'server' => $_REQUEST['server'],
                                 'database' => $_REQUEST['database'],
-                                'schema'   => $_REQUEST['schema'],
+                                'schema' => $_REQUEST['schema'],
                                 'sequence' => $sequence->fields['seqname'],
                             ],
                         ],
@@ -320,14 +320,14 @@ class SequencesController extends BaseController
                     'content' => $this->lang['strsetval'],
                 ],
                 'nextval' => [
-                    'attr'    => [
+                    'attr' => [
                         'href' => [
-                            'url'     => 'sequences',
+                            'url' => 'sequences',
                             'urlvars' => [
-                                'action'   => 'nextval',
-                                'server'   => $_REQUEST['server'],
+                                'action' => 'nextval',
+                                'server' => $_REQUEST['server'],
                                 'database' => $_REQUEST['database'],
-                                'schema'   => $_REQUEST['schema'],
+                                'schema' => $_REQUEST['schema'],
                                 'sequence' => $sequence->fields['seqname'],
                             ],
                         ],
@@ -335,29 +335,29 @@ class SequencesController extends BaseController
                     'content' => $this->lang['strnextval'],
                 ],
                 'restart' => [
-                    'attr'    => [
+                    'attr' => [
                         'href' => [
-                            'url'     => 'sequences',
+                            'url' => 'sequences',
                             'urlvars' => [
-                                'action'   => 'restart',
-                                'server'   => $_REQUEST['server'],
+                                'action' => 'restart',
+                                'server' => $_REQUEST['server'],
                                 'database' => $_REQUEST['database'],
-                                'schema'   => $_REQUEST['schema'],
+                                'schema' => $_REQUEST['schema'],
                                 'sequence' => $sequence->fields['seqname'],
                             ],
                         ],
                     ],
                     'content' => $this->lang['strrestart'],
                 ],
-                'reset'   => [
-                    'attr'    => [
+                'reset' => [
+                    'attr' => [
                         'href' => [
-                            'url'     => 'sequences',
+                            'url' => 'sequences',
                             'urlvars' => [
-                                'action'   => 'reset',
-                                'server'   => $_REQUEST['server'],
+                                'action' => 'reset',
+                                'server' => $_REQUEST['server'],
                                 'database' => $_REQUEST['database'],
-                                'schema'   => $_REQUEST['schema'],
+                                'schema' => $_REQUEST['schema'],
                                 'sequence' => $sequence->fields['seqname'],
                             ],
                         ],
@@ -365,13 +365,13 @@ class SequencesController extends BaseController
                     'content' => $this->lang['strreset'],
                 ],
                 'showall' => [
-                    'attr'    => [
+                    'attr' => [
                         'href' => [
-                            'url'     => 'sequences',
+                            'url' => 'sequences',
                             'urlvars' => [
-                                'server'   => $_REQUEST['server'],
+                                'server' => $_REQUEST['server'],
                                 'database' => $_REQUEST['database'],
-                                'schema'   => $_REQUEST['schema'],
+                                'schema' => $_REQUEST['schema'],
                             ],
                         ],
                     ],
@@ -430,7 +430,7 @@ class SequencesController extends BaseController
             echo '</form>' . \PHP_EOL;
         } else {
             if (\is_array($_POST['sequence'])) {
-                $msg    = '';
+                $msg = '';
                 $status = $data->beginTransaction();
 
                 if (0 === $status) {
diff --git a/src/database/Connection.php b/src/database/Connection.php
index bd6b982b..53d87802 100644
--- a/src/database/Connection.php
+++ b/src/database/Connection.php
@@ -36,7 +36,7 @@ class Connection
         '9.3' => 'Postgres93',
         '9.2' => 'Postgres92',
         '9.1' => 'Postgres91',
-        '9.0' => 'Postgres90'
+        '9.0' => 'Postgres90',
     ];
 
     // The backend platform.  Set to UNKNOWN by default.
@@ -113,19 +113,18 @@ class Connection
      * @return string The driver. e.g. Postgres96
      */
     public function getDriver(&$description)
-    { 
-        $version=null;
-        if($this->conn->_connectionID) {
+    {
+        $version = null;
 
-      
-        $v = \pg_version($this->conn->_connectionID);
+        if ($this->conn->_connectionID) {
+            $v = \pg_version($this->conn->_connectionID);
 
-        //\PhpConsole\Handler::getInstance()->debug($v, 'pg_version');
+            //\PhpConsole\Handler::getInstance()->debug($v, 'pg_version');
 
-        if (isset($v['server'])) {
-            $version = $v['server'];
+            if (isset($v['server'])) {
+                $version = $v['server'];
+            }
         }
-    }
         // If we didn't manage to get the version without a query, query...
         if (!isset($version)) {
             $adodb = new ADOdbBase($this->conn, $this->container, $this->server_info);
@@ -141,7 +140,7 @@ class Connection
             $params = \explode(' ', $field);
 
             if (!isset($params[1])) {
-                 return null;
+                return null;
             }
 
             $version = $params[1]; // eg. 8.4.4
@@ -163,7 +162,6 @@ class Connection
             return $this->version_dictionary[$major_version];
         }
 
-        
         // if major version is less than 9 return null, we don't support it
         if (9 > (int) \mb_substr($version, 0, 1)) {
             return null;
diff --git a/src/database/Postgres.php b/src/database/Postgres.php
index 4f1c979d..d2c31f8a 100644
--- a/src/database/Postgres.php
+++ b/src/database/Postgres.php
@@ -846,7 +846,7 @@ class Postgres extends ADOdbBase
 
             $sql .= \implode('","', $show) . '" FROM ';
         }
-$this->prtrace(['id'=>$this->id]);
+        $this->prtrace(['id' => $this->id]);
         $this->fieldClean($table);
 
         if (isset($_REQUEST['schema'])) {
diff --git a/src/lib.inc.php b/src/lib.inc.php
index 4ab6c3e5..7a2dfad0 100644
--- a/src/lib.inc.php
+++ b/src/lib.inc.php
@@ -35,7 +35,7 @@ if (!\file_exists(\dirname(__DIR__) . '/config.inc.php')) {
             \dirname(__DIR__)
         );
     }
- 
+
 \defined('PHPPGA_SUBFOLDER') || \define('PHPPGA_SUBFOLDER', $subfolder);
 $shouldSetSession = (\defined('PHP_SESSION_ACTIVE') ? \PHP_SESSION_ACTIVE !== \session_status() : !\session_id())
 && !\headers_sent()
@@ -57,7 +57,7 @@ if (!\defined('ADODB_ERROR_HANDLER_TYPE')) {
 if (!\defined('ADODB_ERROR_HANDLER')) {
     \define('ADODB_ERROR_HANDLER', '\PHPPgAdmin\ADOdbException::adodb_throw');
 }
- 
+
 if (DEBUGMODE) {
     \ini_set('display_errors', 'On');
 
@@ -68,12 +68,11 @@ if (DEBUGMODE) {
     if (\array_key_exists('register_debuggers', $conf) && \is_callable($conf['register_debuggers'])) {
         $conf['register_debuggers']();
     }
-    
 }
 
 // Fetch App and DI Container
 $app = \PHPPgAdmin\ContainerUtils::createApp($conf);
-$container=$app->getContainer();
+$container = $app->getContainer();
 
 if (!$container instanceof \Slim\Container) {
     \trigger_error('App Container must be an instance of \\Slim\\Container', \E_USER_ERROR);
@@ -85,7 +84,7 @@ $container->offsetSet('database', $_REQUEST['database'] ?? null);
 $container->offsetSet('schema', $_REQUEST['schema'] ?? null);
 
 $container['haltHandler'] = static function (\Slim\Container $c) {
-    return static function ($request, $response, $exits, $status = 500) use ( $c) {
+    return static function ($request, $response, $exits, $status = 500) use ($c) {
         $title = 'PHPPgAdmin Error';
 
         $html = '<p>The application could not run because of the following error:</p>';
diff --git a/src/router.php b/src/router.php
index 20d9909a..18fd870c 100644
--- a/src/router.php
+++ b/src/router.php
@@ -32,8 +32,8 @@ $app->post('/redirect/server', function (
     $body = $response->getBody();
     $misc = $this->misc;
 
-    $loginShared   = $request->getParsedBodyParam('loginShared');
-    $loginServer   = $request->getParsedBodyParam('loginServer');
+    $loginShared = $request->getParsedBodyParam('loginShared');
+    $loginServer = $request->getParsedBodyParam('loginServer');
     $loginUsername = $request->getParsedBodyParam('loginUsername');
     $loginPassword = $request->getParsedBodyParam('loginPassword_' . \md5($loginServer));
 
@@ -83,7 +83,7 @@ $app->get('/redirect[/{subject}]', function (
     /* @scrutinizer ignore-unused */
     array $args
 ) {
-    $subject        = (isset($args['subject'])) ? $args['subject'] : 'root';
+    $subject = (isset($args['subject'])) ? $args['subject'] : 'root';
     $destinationurl = $this->utils->getDestinationWithLastTab($subject);
 
     return $response->withStatus(302)->withHeader('Location', $destinationurl);
@@ -116,7 +116,7 @@ $app->map(['GET', 'POST'], '/src/views/{subject}', function (
         return $response->withStatus(302)->withHeader('Location', $destinationurl);
     }
 
-    $className  = '\PHPPgAdmin\Controller\\' . \ucfirst($subject) . 'Controller';
+    $className = '\PHPPgAdmin\Controller\\' . \ucfirst($subject) . 'Controller';
     $controller = new $className($this);
 
     return $controller->render();
@@ -174,12 +174,13 @@ $app->get('[/{path:.*}]', function (
     /* @scrutinizer ignore-unused */
     array $args
 ) {
-    $filepath     = \dirname(__DIR__) . '/' . $args['path'];
+    $filepath = \dirname(__DIR__) . '/' . $args['path'];
     $query_string = $request->getUri()->getQuery();
 
     //d($this->subfolder, $args, $query_string, $filepath);
 
-    //$this->utils->prtrace($request->getAttribute('route'));
+    $this->utils->prtrace($request->getAttribute('route'));
+
     return $response->write($args['path'] ? $args['path'] : 'index');
 });
 
diff --git a/src/translations/AbstractLang.php b/src/translations/AbstractLang.php
index 0b20fc0c..84a6ee92 100644
--- a/src/translations/AbstractLang.php
+++ b/src/translations/AbstractLang.php
@@ -11,13 +11,15 @@ namespace PHPPgAdmin\Translations;
  */
 abstract class AbstractLang
 {
-    /** @var array */
+    /**
+     * @var array
+     */
     protected $lang = [];
- 
+
     /**
      * @return array
      */
-    public function getLang():array 
+    public function getLang(): array
     {
         return $this->lang;
     }
diff --git a/src/translations/Afrikaans.php b/src/translations/Afrikaans.php
index ff9307da..54633668 100644
--- a/src/translations/Afrikaans.php
+++ b/src/translations/Afrikaans.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Afrikaans language.
  */
-class Afrikaans extends AbstractLang 
+class Afrikaans extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Afrikaans';
diff --git a/src/translations/Arabic.php b/src/translations/Arabic.php
index 5dd76ab2..c1adb2c2 100644
--- a/src/translations/Arabic.php
+++ b/src/translations/Arabic.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Arabic language.
  */
-class Arabic extends AbstractLang 
+class Arabic extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'عربي';
diff --git a/src/translations/Catalan.php b/src/translations/Catalan.php
index f23ebab1..f8f7697b 100644
--- a/src/translations/Catalan.php
+++ b/src/translations/Catalan.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Catalan language.
  */
-class Catalan extends AbstractLang 
+class Catalan extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Català';
diff --git a/src/translations/ChineseSim.php b/src/translations/ChineseSim.php
index a10966b1..3d45e39a 100644
--- a/src/translations/ChineseSim.php
+++ b/src/translations/ChineseSim.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for ChineseSim language.
  */
-class ChineseSim extends AbstractLang 
+class ChineseSim extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = '简体中文（统一码）';
diff --git a/src/translations/ChineseTr.php b/src/translations/ChineseTr.php
index 07030fdd..0f52b9b7 100644
--- a/src/translations/ChineseTr.php
+++ b/src/translations/ChineseTr.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for ChineseTr language.
  */
-class ChineseTr extends AbstractLang 
+class ChineseTr extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = '正體中文（big5）';
diff --git a/src/translations/ChineseUtf8ZhCn.php b/src/translations/ChineseUtf8ZhCn.php
index dc2b9824..4bc315f3 100644
--- a/src/translations/ChineseUtf8ZhCn.php
+++ b/src/translations/ChineseUtf8ZhCn.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for ChineseUtf8ZhCn language.
  */
-class ChineseUtf8ZhCn extends AbstractLang 
+class ChineseUtf8ZhCn extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = '简体中文（统一码）';
diff --git a/src/translations/ChineseUtf8ZhTw.php b/src/translations/ChineseUtf8ZhTw.php
index 2e4510e2..dc4c5fa3 100644
--- a/src/translations/ChineseUtf8ZhTw.php
+++ b/src/translations/ChineseUtf8ZhTw.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for ChineseUtf8ZhTw language.
  */
-class ChineseUtf8ZhTw extends AbstractLang 
+class ChineseUtf8ZhTw extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = '正體中文（UTF-8）';
diff --git a/src/translations/Czech.php b/src/translations/Czech.php
index f10a8de4..a331f8f3 100644
--- a/src/translations/Czech.php
+++ b/src/translations/Czech.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Czech language.
  */
-class Czech extends AbstractLang 
+class Czech extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Česky';
diff --git a/src/translations/Danish.php b/src/translations/Danish.php
index 00ef93a4..084b475f 100644
--- a/src/translations/Danish.php
+++ b/src/translations/Danish.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Danish language.
  */
-class Danish extends AbstractLang 
+class Danish extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Danish';
diff --git a/src/translations/Dutch.php b/src/translations/Dutch.php
index 93ab1e2b..c66ef240 100644
--- a/src/translations/Dutch.php
+++ b/src/translations/Dutch.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Dutch language.
  */
-class Dutch extends AbstractLang 
+class Dutch extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Nederlands';
diff --git a/src/translations/English.php b/src/translations/English.php
index 8d74a9ff..c1782fd0 100644
--- a/src/translations/English.php
+++ b/src/translations/English.php
@@ -11,7 +11,6 @@ namespace PHPPgAdmin\Translations;
  */
 class English extends AbstractLang
 {
- 
     public function __construct()
     {
         $lang = $this->lang; //  Language and character set
@@ -874,6 +873,4 @@ class English extends AbstractLang
 
         $this->lang = $lang;
     }
-
-   
 }
diff --git a/src/translations/French.php b/src/translations/French.php
index 70b1df2a..603b5337 100644
--- a/src/translations/French.php
+++ b/src/translations/French.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for French language.
  */
-class French extends AbstractLang 
+class French extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Français';
diff --git a/src/translations/Galician.php b/src/translations/Galician.php
index ce20a82e..08c1fc41 100644
--- a/src/translations/Galician.php
+++ b/src/translations/Galician.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Galician language.
  */
-class Galician extends AbstractLang 
+class Galician extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Galego';
diff --git a/src/translations/German.php b/src/translations/German.php
index 3a35f53e..0b0c6e04 100644
--- a/src/translations/German.php
+++ b/src/translations/German.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for German language.
  */
-class German extends AbstractLang 
+class German extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Deutsch';
diff --git a/src/translations/Greek.php b/src/translations/Greek.php
index b12c32ce..34348a6a 100644
--- a/src/translations/Greek.php
+++ b/src/translations/Greek.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Greek language.
  */
-class Greek extends AbstractLang 
+class Greek extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Ελληνικά';
diff --git a/src/translations/Hebrew.php b/src/translations/Hebrew.php
index b5f33c40..b2d5f4c0 100644
--- a/src/translations/Hebrew.php
+++ b/src/translations/Hebrew.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Hebrew language.
  */
-class Hebrew extends AbstractLang 
+class Hebrew extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Hebrew';
diff --git a/src/translations/Hungarian.php b/src/translations/Hungarian.php
index 56a22470..7b9ff72b 100644
--- a/src/translations/Hungarian.php
+++ b/src/translations/Hungarian.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Hungarian language.
  */
-class Hungarian extends AbstractLang 
+class Hungarian extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Magyar';
diff --git a/src/translations/Italian.php b/src/translations/Italian.php
index 20557082..f024c63d 100644
--- a/src/translations/Italian.php
+++ b/src/translations/Italian.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Italian language.
  */
-class Italian extends AbstractLang 
+class Italian extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Italiano';
diff --git a/src/translations/Japanese.php b/src/translations/Japanese.php
index 9fcf17c9..b25d1e75 100644
--- a/src/translations/Japanese.php
+++ b/src/translations/Japanese.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Japanese language.
  */
-class Japanese extends AbstractLang 
+class Japanese extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = '日本語(EUC-JP)';
diff --git a/src/translations/Lithuanian.php b/src/translations/Lithuanian.php
index 92249028..727d266f 100644
--- a/src/translations/Lithuanian.php
+++ b/src/translations/Lithuanian.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Lithuanian language.
  */
-class Lithuanian extends AbstractLang 
+class Lithuanian extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Lietuvių';
diff --git a/src/translations/Mongol.php b/src/translations/Mongol.php
index 7fe9f319..6129cffe 100644
--- a/src/translations/Mongol.php
+++ b/src/translations/Mongol.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Mongol language.
  */
-class Mongol extends AbstractLang 
+class Mongol extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Mongolian';
diff --git a/src/translations/Polish.php b/src/translations/Polish.php
index 21aeed42..ce12d448 100644
--- a/src/translations/Polish.php
+++ b/src/translations/Polish.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Polish language.
  */
-class Polish extends AbstractLang 
+class Polish extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Polski';
diff --git a/src/translations/PortugueseBr.php b/src/translations/PortugueseBr.php
index 5dc77f40..40b219bd 100644
--- a/src/translations/PortugueseBr.php
+++ b/src/translations/PortugueseBr.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for PortugueseBr language.
  */
-class PortugueseBr extends AbstractLang 
+class PortugueseBr extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Português-Brasileiro';
diff --git a/src/translations/PortuguesePt.php b/src/translations/PortuguesePt.php
index 5921d455..395b3fe4 100644
--- a/src/translations/PortuguesePt.php
+++ b/src/translations/PortuguesePt.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for PortuguesePt language.
  */
-class PortuguesePt extends AbstractLang 
+class PortuguesePt extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Português-Português';
diff --git a/src/translations/Romanian.php b/src/translations/Romanian.php
index 98866d67..184eba41 100644
--- a/src/translations/Romanian.php
+++ b/src/translations/Romanian.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Romanian language.
  */
-class Romanian extends AbstractLang 
+class Romanian extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Română';
diff --git a/src/translations/Russian.php b/src/translations/Russian.php
index c7e67c38..03c37111 100644
--- a/src/translations/Russian.php
+++ b/src/translations/Russian.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Russian language.
  */
-class Russian extends AbstractLang 
+class Russian extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Русский КОИ8';
diff --git a/src/translations/RussianUtf8.php b/src/translations/RussianUtf8.php
index 0372150b..bbe96e70 100644
--- a/src/translations/RussianUtf8.php
+++ b/src/translations/RussianUtf8.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for RussianUtf8 language.
  */
-class RussianUtf8 extends AbstractLang 
+class RussianUtf8 extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Русский (UTF-8)';
diff --git a/src/translations/Slovak.php b/src/translations/Slovak.php
index 09171f4d..e3834a5e 100644
--- a/src/translations/Slovak.php
+++ b/src/translations/Slovak.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Slovak language.
  */
-class Slovak extends AbstractLang 
+class Slovak extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Slovensky';
diff --git a/src/translations/Spanish.php b/src/translations/Spanish.php
index 1fef78b2..9f6d6a77 100644
--- a/src/translations/Spanish.php
+++ b/src/translations/Spanish.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Spanish language.
  */
-class Spanish extends AbstractLang 
+class Spanish extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Spanish';
diff --git a/src/translations/Swedish.php b/src/translations/Swedish.php
index df887225..6eaa8791 100644
--- a/src/translations/Swedish.php
+++ b/src/translations/Swedish.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Swedish language.
  */
-class Swedish extends AbstractLang 
+class Swedish extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Swedish';
diff --git a/src/translations/Turkish.php b/src/translations/Turkish.php
index 10edbb24..897a1da6 100644
--- a/src/translations/Turkish.php
+++ b/src/translations/Turkish.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Turkish language.
  */
-class Turkish extends AbstractLang 
+class Turkish extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Türkçe';
diff --git a/src/translations/Ukrainian.php b/src/translations/Ukrainian.php
index 98a769fd..d73366d9 100644
--- a/src/translations/Ukrainian.php
+++ b/src/translations/Ukrainian.php
@@ -9,9 +9,9 @@ namespace PHPPgAdmin\Translations;
 /**
  * Class providing translation for Ukrainian language.
  */
-class Ukrainian extends AbstractLang 
+class Ukrainian extends AbstractLang
 {
-    public function getLang():array
+    public function getLang(): array
     {
         $lang = $this->lang; //  Language and character set
         $lang['applang'] = 'Укра╖нська';