runs csfixer

52 files changed, 53 insertions, 127 deletions

diff --git a/Makefile b/Makefile
index e9065db5..02866b7a 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ tag_and_push:
 
 
 
-tag: test update_version csfixer tag_and_push	
+tag: test update_version csfixer lint tag_and_push	
 
 test:
 ifeq ("$(wildcard config.inc.php)","")
diff --git a/src/classes/ContainerUtils.php b/src/classes/ContainerUtils.php
index a8a4d531..4dfd31ae 100644
--- a/src/classes/ContainerUtils.php
+++ b/src/classes/ContainerUtils.php
@@ -16,11 +16,6 @@ use Slim\App;
 \defined('IN_TEST') || \define('IN_TEST', false);
 
 /**
- * @file
- * A class that adds convenience methods to the container
- */
-
-/**
  * A class that adds convenience methods to the container.
  */
 class ContainerUtils
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index d70946f6..127f572e 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -5,7 +5,7 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
+ * PHPPgAdmin 6.0.0.
  */
 class AcceptanceTester extends \Codeception\Actor
 {
diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php
index 75b08e04..cff8b3dc 100644
--- a/tests/_support/FunctionalTester.php
+++ b/tests/_support/FunctionalTester.php
@@ -5,7 +5,7 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
+ * PHPPgAdmin 6.0.0.
  */
 class FunctionalTester extends \Codeception\Actor
 {
diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php
index f0e4c353..8855b2d1 100644
--- a/tests/_support/UnitTester.php
+++ b/tests/_support/UnitTester.php
@@ -5,7 +5,7 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
+ * PHPPgAdmin 6.0.0.
  */
 class UnitTester extends \Codeception\Actor
 {
diff --git a/tests/unit/DataEntitiesTest.php b/tests/unit/DataEntitiesTest.php
index 3ceaeeab..a16d5f7e 100644
--- a/tests/unit/DataEntitiesTest.php
+++ b/tests/unit/DataEntitiesTest.php
@@ -5,8 +5,6 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
  * @internal
  * @coversNothing
  */
diff --git a/tests/unit/PublicSectionsTest.php b/tests/unit/PublicSectionsTest.php
index 34e29fac..4a6bb7da 100644
--- a/tests/unit/PublicSectionsTest.php
+++ b/tests/unit/PublicSectionsTest.php
@@ -5,8 +5,6 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
  * @internal
  * @coversNothing
  */
diff --git a/tests/unit/TablesAndViewsTest.php b/tests/unit/TablesAndViewsTest.php
index a258a2d0..3d6004a9 100644
--- a/tests/unit/TablesAndViewsTest.php
+++ b/tests/unit/TablesAndViewsTest.php
@@ -5,8 +5,6 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
  * @internal
  * @coversNothing
  */
diff --git a/tests/unit/UserEntitiesTest.php b/tests/unit/UserEntitiesTest.php
index 0b896db0..bd1345cc 100644
--- a/tests/unit/UserEntitiesTest.php
+++ b/tests/unit/UserEntitiesTest.php
@@ -5,8 +5,6 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
  * @internal
  * @coversNothing
  */
diff --git a/tests/unit/ViewTest.php b/tests/unit/ViewTest.php
index fc05193a..77a473b9 100644
--- a/tests/unit/ViewTest.php
+++ b/tests/unit/ViewTest.php
@@ -5,8 +5,6 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
  * @internal
  * @coversNothing
  */
diff --git a/tests/views/acinsert.php b/tests/views/acinsert.php
index ec89b467..c50827ff 100644
--- a/tests/views/acinsert.php
+++ b/tests/views/acinsert.php
@@ -5,20 +5,11 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
- * @param mixed $container
+ * @param Psr\Container\ContainerInterface $container
  */
 function acinsertFactory($container)
 {
     $do_render = false;
-    $do_render = false;
-    echo 'Will instance controller';
-    $controller = new \PHPPgAdmin\Controller\AcinsertController($container);
-
-    if ($do_render) {
-        $controller->render();
-    }
 
-    return $controller;
+    return new \PHPPgAdmin\Controller\AcinsertController($container);
 }
diff --git a/tests/views/aggregates.php b/tests/views/aggregates.php
index cce5fcac..e31c07e8 100644
--- a/tests/views/aggregates.php
+++ b/tests/views/aggregates.php
@@ -9,15 +9,5 @@ function aggregatesFactory($container)
 {
     $do_render = false;
 
-    if (!\defined('BASE_PATH')) {
-        require_once '../../src/lib.inc.php';
-        $do_render = true;
-    }
-    $controller = new \PHPPgAdmin\Controller\AggregatesController($container);
-
-    if ($do_render) {
-        $controller->render();
-    }
-
-    return $controller;
+    return new \PHPPgAdmin\Controller\AggregatesController($container);
 }
diff --git a/tests/views/alldb.php b/tests/views/alldb.php
index d42001cb..0490a7cf 100644
--- a/tests/views/alldb.php
+++ b/tests/views/alldb.php
@@ -8,7 +8,7 @@
 function alldbFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\AlldbController($container);
 
     if ($do_render) {
diff --git a/tests/views/browser.php b/tests/views/browser.php
index 955707f1..c251399a 100644
--- a/tests/views/browser.php
+++ b/tests/views/browser.php
@@ -5,14 +5,12 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
- * @param mixed $container
+ * @param Psr\Container\ContainerInterface $container
  */
 function browserFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\BrowserController($container);
 
     if ($do_render) {
diff --git a/tests/views/casts.php b/tests/views/casts.php
index 322585b1..f4ca3c58 100644
--- a/tests/views/casts.php
+++ b/tests/views/casts.php
@@ -9,15 +9,5 @@ function castsFactory($container)
 {
     $do_render = false;
 
-    if (!\defined('BASE_PATH')) {
-        require_once '../../src/lib.inc.php';
-        $do_render = true;
-    }
-    $controller = new \PHPPgAdmin\Controller\CastsController($container);
-
-    if ($do_render) {
-        $controller->render();
-    }
-
-    return $controller;
+    return new \PHPPgAdmin\Controller\CastsController($container);
 }
diff --git a/tests/views/colproperties.php b/tests/views/colproperties.php
index b6c3b2ef..00031e7f 100644
--- a/tests/views/colproperties.php
+++ b/tests/views/colproperties.php
@@ -8,7 +8,7 @@
 function colpropertiesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\ColpropertiesController($container);
 
     if ($do_render) {
diff --git a/tests/views/constraints.php b/tests/views/constraints.php
index 36dda243..18478a3b 100644
--- a/tests/views/constraints.php
+++ b/tests/views/constraints.php
@@ -9,7 +9,7 @@
 function constraintsFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\ConstraintsController($container);
 
     if ($do_render) {
diff --git a/tests/views/conversions.php b/tests/views/conversions.php
index ce096b07..b6138066 100644
--- a/tests/views/conversions.php
+++ b/tests/views/conversions.php
@@ -9,7 +9,7 @@
 function conversionsFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\ConversionsController($container);
 
     if ($do_render) {
diff --git a/tests/views/database.php b/tests/views/database.php
index cbaee520..07b7eb33 100644
--- a/tests/views/database.php
+++ b/tests/views/database.php
@@ -8,7 +8,7 @@
 function databaseFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\DatabaseController($container);
 
     if ($do_render) {
diff --git a/tests/views/dataexport.php b/tests/views/dataexport.php
index e11f55a7..4f0602c0 100644
--- a/tests/views/dataexport.php
+++ b/tests/views/dataexport.php
@@ -5,9 +5,7 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
- * @param mixed $container
+ * @param Psr\Container\ContainerInterface $container
  */
 function dataexportFactory($container)
 {
diff --git a/tests/views/dataimport.php b/tests/views/dataimport.php
index 34000320..8f1c2942 100644
--- a/tests/views/dataimport.php
+++ b/tests/views/dataimport.php
@@ -5,9 +5,7 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
- * @param mixed $container
+ * @param Psr\Container\ContainerInterface $container
  */
 function dataimportFactory($container)
 {
diff --git a/tests/views/dbexport.php b/tests/views/dbexport.php
index 237ea210..c3d11111 100644
--- a/tests/views/dbexport.php
+++ b/tests/views/dbexport.php
@@ -5,9 +5,7 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
- * @param mixed $container
+ * @param Psr\Container\ContainerInterface $container
  */
 function dbexportFactory($container)
 {
diff --git a/tests/views/domains.php b/tests/views/domains.php
index c10608b1..7ad4d018 100644
--- a/tests/views/domains.php
+++ b/tests/views/domains.php
@@ -9,7 +9,7 @@
 function domainsFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\DomainsController($container);
 
     if ($do_render) {
diff --git a/tests/views/fulltext.php b/tests/views/fulltext.php
index 65beb3f8..682c6b19 100644
--- a/tests/views/fulltext.php
+++ b/tests/views/fulltext.php
@@ -9,7 +9,7 @@
 function fulltextFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\FulltextController($container);
 
     if ($do_render) {
diff --git a/tests/views/functions.php b/tests/views/functions.php
index 2c603cea..a54e99f5 100644
--- a/tests/views/functions.php
+++ b/tests/views/functions.php
@@ -9,7 +9,7 @@
 function functionsFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\FunctionsController($container);
 
     if ($do_render) {
diff --git a/tests/views/groups.php b/tests/views/groups.php
index f5bbafc2..795e82b9 100644
--- a/tests/views/groups.php
+++ b/tests/views/groups.php
@@ -9,7 +9,7 @@
 function groupsFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\GroupsController($container);
 
     if ($do_render) {
diff --git a/tests/views/help.php b/tests/views/help.php
index e22168d4..173bd3e1 100644
--- a/tests/views/help.php
+++ b/tests/views/help.php
@@ -9,7 +9,7 @@
 function helpFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\HelpController($container);
 
     if ($do_render) {
diff --git a/tests/views/history.php b/tests/views/history.php
index 8d4c3453..4b1bf678 100644
--- a/tests/views/history.php
+++ b/tests/views/history.php
@@ -9,7 +9,7 @@
 function historyFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\HistoryController($container);
 
     if ($do_render) {
diff --git a/tests/views/indexes.php b/tests/views/indexes.php
index 56c2bc39..de23a673 100644
--- a/tests/views/indexes.php
+++ b/tests/views/indexes.php
@@ -9,7 +9,7 @@
 function indexesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\IndexesController($container);
 
     if ($do_render) {
diff --git a/tests/views/info.php b/tests/views/info.php
index 8c8d9946..f92d7076 100644
--- a/tests/views/info.php
+++ b/tests/views/info.php
@@ -9,7 +9,7 @@
 function infoFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\InfoController($container);
 
     if ($do_render) {
diff --git a/tests/views/intro.php b/tests/views/intro.php
index e1b49432..e83d3e91 100644
--- a/tests/views/intro.php
+++ b/tests/views/intro.php
@@ -5,14 +5,12 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
- * @param mixed $container
+ * @param Psr\Container\ContainerInterface $container
  */
 function introFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\IntroController($container);
 
     if ($do_render) {
diff --git a/tests/views/languages.php b/tests/views/languages.php
index 21d17770..4639ac49 100644
--- a/tests/views/languages.php
+++ b/tests/views/languages.php
@@ -8,7 +8,7 @@
 function languagesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\LanguagesController($container);
 
     if ($do_render) {
diff --git a/tests/views/login.php b/tests/views/login.php
index af618d8c..c9e5d9ca 100644
--- a/tests/views/login.php
+++ b/tests/views/login.php
@@ -5,14 +5,12 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
- * @param mixed $container
+ * @param Psr\Container\ContainerInterface $container
  */
 function loginFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\LoginController($container);
 
     if ($do_render) {
diff --git a/tests/views/materializedviewproperties.php b/tests/views/materializedviewproperties.php
index ff78ff47..11a634b9 100644
--- a/tests/views/materializedviewproperties.php
+++ b/tests/views/materializedviewproperties.php
@@ -8,7 +8,7 @@
 function materializedviewpropertiesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\MaterializedviewpropertiesController($container);
 
     if ($do_render) {
diff --git a/tests/views/materializedviews.php b/tests/views/materializedviews.php
index 2916fdef..42cb762c 100644
--- a/tests/views/materializedviews.php
+++ b/tests/views/materializedviews.php
@@ -8,7 +8,7 @@
 function materializedviewsFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\MaterializedviewsController($container);
 
     if ($do_render) {
diff --git a/tests/views/opclasses.php b/tests/views/opclasses.php
index e267bae9..829b1a84 100644
--- a/tests/views/opclasses.php
+++ b/tests/views/opclasses.php
@@ -8,7 +8,7 @@
 function opclassesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\OpclassesController($container);
 
     if ($do_render) {
diff --git a/tests/views/privileges.php b/tests/views/privileges.php
index 533a188a..1d258626 100644
--- a/tests/views/privileges.php
+++ b/tests/views/privileges.php
@@ -5,14 +5,12 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
- * @param mixed $container
+ * @param Psr\Container\ContainerInterface $container
  */
 function privilegesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\PrivilegesController($container);
 
     if ($do_render) {
diff --git a/tests/views/roles.php b/tests/views/roles.php
index 764c762c..e406ef89 100644
--- a/tests/views/roles.php
+++ b/tests/views/roles.php
@@ -9,7 +9,7 @@
 function rolesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\RolesController($container);
 
     if ($do_render) {
diff --git a/tests/views/rules.php b/tests/views/rules.php
index a0f84983..727db862 100644
--- a/tests/views/rules.php
+++ b/tests/views/rules.php
@@ -9,12 +9,6 @@
 function rulesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
-    $controller = new \PHPPgAdmin\Controller\RulesController($container);
-
-    if ($do_render) {
-        $controller->render();
-    }
 
-    return $controller;
+    return new \PHPPgAdmin\Controller\RulesController($container);
 }
diff --git a/tests/views/schemas.php b/tests/views/schemas.php
index 47181a54..c1f0c3f2 100644
--- a/tests/views/schemas.php
+++ b/tests/views/schemas.php
@@ -8,7 +8,7 @@
 function schemasFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\SchemasController($container);
 
     if ($do_render) {
diff --git a/tests/views/sequences.php b/tests/views/sequences.php
index c7415da7..30056f52 100644
--- a/tests/views/sequences.php
+++ b/tests/views/sequences.php
@@ -8,7 +8,7 @@
 function sequencesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\SequencesController($container);
 
     if ($do_render) {
diff --git a/tests/views/servers.php b/tests/views/servers.php
index cd9760c6..9792e696 100644
--- a/tests/views/servers.php
+++ b/tests/views/servers.php
@@ -5,14 +5,12 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
- * @param mixed $container
+ * @param Psr\Container\ContainerInterface $container
  */
 function serversFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\ServersController($container);
 
     if ($do_render) {
diff --git a/tests/views/sql.php b/tests/views/sql.php
index 568e8e15..301773a3 100644
--- a/tests/views/sql.php
+++ b/tests/views/sql.php
@@ -9,7 +9,7 @@
 function sqlFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\SqlController($container);
 
     if ($do_render) {
diff --git a/tests/views/sqledit.php b/tests/views/sqledit.php
index e209b01a..4dc09945 100644
--- a/tests/views/sqledit.php
+++ b/tests/views/sqledit.php
@@ -9,7 +9,7 @@
 function sqleditFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\SqleditController($container);
 
     if ($do_render) {
diff --git a/tests/views/tables.php b/tests/views/tables.php
index ade664fc..0d92b0a2 100644
--- a/tests/views/tables.php
+++ b/tests/views/tables.php
@@ -5,14 +5,12 @@
  */
 
 /**
- * PHPPgAdmin v6.0.0-RC9.
- *
- * @param mixed $container
+ * @param Psr\Container\ContainerInterface $container
  */
 function tablesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\TablesController($container);
 
     if ($do_render) {
diff --git a/tests/views/tablespaces.php b/tests/views/tablespaces.php
index f46ed991..284dbc70 100644
--- a/tests/views/tablespaces.php
+++ b/tests/views/tablespaces.php
@@ -8,7 +8,7 @@
 function tablespacesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\TablespacesController($container);
 
     if ($do_render) {
diff --git a/tests/views/tblproperties.php b/tests/views/tblproperties.php
index 12bea13b..dbf2d91e 100644
--- a/tests/views/tblproperties.php
+++ b/tests/views/tblproperties.php
@@ -9,7 +9,7 @@
 function tblpropertiesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\TblpropertiesController($container);
 
     if ($do_render) {
diff --git a/tests/views/triggers.php b/tests/views/triggers.php
index 3e9719e1..e831f54d 100644
--- a/tests/views/triggers.php
+++ b/tests/views/triggers.php
@@ -9,7 +9,7 @@
 function triggersFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\TriggersController($container);
 
     if ($do_render) {
diff --git a/tests/views/types.php b/tests/views/types.php
index 34cb951e..7880501c 100644
--- a/tests/views/types.php
+++ b/tests/views/types.php
@@ -8,7 +8,7 @@
 function typesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\TypesController($container);
 
     if ($do_render) {
diff --git a/tests/views/users.php b/tests/views/users.php
index c62aa0cf..0c853df8 100644
--- a/tests/views/users.php
+++ b/tests/views/users.php
@@ -8,7 +8,7 @@
 function usersFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\UsersController($container);
 
     if ($do_render) {
diff --git a/tests/views/viewproperties.php b/tests/views/viewproperties.php
index 95c10fb9..60c65155 100644
--- a/tests/views/viewproperties.php
+++ b/tests/views/viewproperties.php
@@ -8,7 +8,7 @@
 function viewpropertiesFactory($container)
 {
     $do_render = false;
-    $do_render = false;
+
     $controller = new \PHPPgAdmin\Controller\ViewpropertiesController($container);
 
     if ($do_render) {
diff --git a/tests/views/views.php b/tests/views/views.php
index 62dcb15b..c66fdcb4 100644
--- a/tests/views/views.php
+++ b/tests/views/views.php
@@ -8,12 +8,6 @@
 function viewsFactory($container)
 {
     $do_render = false;
-    $do_render = false;
-    $controller = new \PHPPgAdmin\Controller\ViewsController($container);
-
-    if ($do_render) {
-        $controller->render();
-    }
 
-    return $controller;
+    return new \PHPPgAdmin\Controller\ViewsController($container);
 }