diff options
| author | ffflabs <amenadiel@gmail.com> | 2020-02-26 00:02:54 +0300 |
|---|---|---|
| committer | ffflabs <amenadiel@gmail.com> | 2020-02-26 00:02:54 +0300 |
| commit | e9946667c91a8ff2f87d9f7ba1fba4d7148ff40d (patch) | |
| tree | 5119a6a0514ae089e490f87d57f96962ded5c258 | |
| parent | d8d7a7e9c8849a8be9dc9a9585c096eb0f7d93d1 (diff) | |
Creating Tag v6.0.0-RC9 at 2020-02-25 - fixes composer scripts, cleanup unused code
211 files changed, 399 insertions, 395 deletions
diff --git a/composer.json b/composer.json index 6524cdca..e146f6d8 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "huasofoundries/phppgadmin6", - "version": "6.0.0-RC8", + "version": "6.0.0-RC9", "description": "Like phpmyadmin but for postgres", "type": "project", "license": [ diff --git a/composer.lock b/composer.lock index 47d2d333..c0d58f0f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "276d1d34b3cccce59de1f8119e3c3b59", + "content-hash": "4d0807c867bfdbd9141195705ca1731d", "packages": [ { "name": "adodb/adodb-php", @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // This section is made to be able to parse requests coming from PHP Builtin webserver diff --git a/src/classes/ADORecordSet.php b/src/classes/ADORecordSet.php index 8abcd848..4f014289 100644 --- a/src/classes/ADORecordSet.php +++ b/src/classes/ADORecordSet.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin; @@ -22,8 +22,6 @@ class ADORecordSet extends \ADORecordSet implements \Countable { /** * Returns the recordCount. - * - * @return int */ public function count(): int { diff --git a/src/classes/ContainerUtils.php b/src/classes/ContainerUtils.php index 9422a2c4..98473677 100644 --- a/src/classes/ContainerUtils.php +++ b/src/classes/ContainerUtils.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin; diff --git a/src/controllers/AcinsertController.php b/src/controllers/AcinsertController.php index a1237fe1..9bea57f6 100644 --- a/src/controllers/AcinsertController.php +++ b/src/controllers/AcinsertController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AggregatesController.php b/src/controllers/AggregatesController.php index b3a827c8..44062f0b 100644 --- a/src/controllers/AggregatesController.php +++ b/src/controllers/AggregatesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/AlldbController.php b/src/controllers/AlldbController.php index 9795852b..22d40b30 100644 --- a/src/controllers/AlldbController.php +++ b/src/controllers/AlldbController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php index 8243efe9..840d6a10 100644 --- a/src/controllers/BaseController.php +++ b/src/controllers/BaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/BrowserController.php b/src/controllers/BrowserController.php index bfb2690a..a3a0d4bd 100644 --- a/src/controllers/BrowserController.php +++ b/src/controllers/BrowserController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/CastsController.php b/src/controllers/CastsController.php index ad5dfba0..68c0a1a9 100644 --- a/src/controllers/CastsController.php +++ b/src/controllers/CastsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ColpropertiesController.php b/src/controllers/ColpropertiesController.php index ee77fa43..1d113b72 100644 --- a/src/controllers/ColpropertiesController.php +++ b/src/controllers/ColpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConstraintsController.php b/src/controllers/ConstraintsController.php index 3fe6833a..fec5d29e 100644 --- a/src/controllers/ConstraintsController.php +++ b/src/controllers/ConstraintsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ConversionsController.php b/src/controllers/ConversionsController.php index 55af5866..aaaa5ecf 100644 --- a/src/controllers/ConversionsController.php +++ b/src/controllers/ConversionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DatabaseController.php b/src/controllers/DatabaseController.php index bd0a5d6a..ed71f119 100644 --- a/src/controllers/DatabaseController.php +++ b/src/controllers/DatabaseController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DataexportController.php b/src/controllers/DataexportController.php index 2a4d1975..97d290b1 100644 --- a/src/controllers/DataexportController.php +++ b/src/controllers/DataexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DataimportController.php b/src/controllers/DataimportController.php index 2046f984..129bb2fa 100644 --- a/src/controllers/DataimportController.php +++ b/src/controllers/DataimportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DbexportController.php b/src/controllers/DbexportController.php index b2924fbc..ae7ecfde 100644 --- a/src/controllers/DbexportController.php +++ b/src/controllers/DbexportController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DisplayController.php b/src/controllers/DisplayController.php index 298cc841..895b0c20 100644 --- a/src/controllers/DisplayController.php +++ b/src/controllers/DisplayController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php index 5a0ad7a0..551b1d58 100644 --- a/src/controllers/DomainsController.php +++ b/src/controllers/DomainsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FulltextController.php b/src/controllers/FulltextController.php index 7b6d66fa..21d47adf 100644 --- a/src/controllers/FulltextController.php +++ b/src/controllers/FulltextController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php index b022b78f..31747b9d 100644 --- a/src/controllers/FunctionsController.php +++ b/src/controllers/FunctionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/GroupsController.php b/src/controllers/GroupsController.php index b0c98117..4bd7dd91 100644 --- a/src/controllers/GroupsController.php +++ b/src/controllers/GroupsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HelpController.php b/src/controllers/HelpController.php index 23690e86..640528ce 100644 --- a/src/controllers/HelpController.php +++ b/src/controllers/HelpController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/HistoryController.php b/src/controllers/HistoryController.php index fc82d5ee..b3fa98f8 100644 --- a/src/controllers/HistoryController.php +++ b/src/controllers/HistoryController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IndexesController.php b/src/controllers/IndexesController.php index edb2dcf0..7e278bab 100644 --- a/src/controllers/IndexesController.php +++ b/src/controllers/IndexesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/InfoController.php b/src/controllers/InfoController.php index eda81e27..3d4a31a6 100644 --- a/src/controllers/InfoController.php +++ b/src/controllers/InfoController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/IntroController.php b/src/controllers/IntroController.php index 81b8f544..5f3e9420 100644 --- a/src/controllers/IntroController.php +++ b/src/controllers/IntroController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LanguagesController.php b/src/controllers/LanguagesController.php index 14f3adb4..691c67e3 100644 --- a/src/controllers/LanguagesController.php +++ b/src/controllers/LanguagesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php index d1e31a9c..9f24d2cf 100644 --- a/src/controllers/LoginController.php +++ b/src/controllers/LoginController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewpropertiesController.php b/src/controllers/MaterializedviewpropertiesController.php index 90a59eee..9f11ca41 100644 --- a/src/controllers/MaterializedviewpropertiesController.php +++ b/src/controllers/MaterializedviewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php index 3a79ab75..981da273 100644 --- a/src/controllers/MaterializedviewsController.php +++ b/src/controllers/MaterializedviewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OpclassesController.php b/src/controllers/OpclassesController.php index 8554ed61..7e27a373 100644 --- a/src/controllers/OpclassesController.php +++ b/src/controllers/OpclassesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/OperatorsController.php b/src/controllers/OperatorsController.php index 98b26d57..23fa889a 100644 --- a/src/controllers/OperatorsController.php +++ b/src/controllers/OperatorsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/PrivilegesController.php b/src/controllers/PrivilegesController.php index c011006e..17a45a4e 100644 --- a/src/controllers/PrivilegesController.php +++ b/src/controllers/PrivilegesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/RolesController.php b/src/controllers/RolesController.php index 60867fb2..782359c5 100644 --- a/src/controllers/RolesController.php +++ b/src/controllers/RolesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/RulesController.php b/src/controllers/RulesController.php index 310f0186..3571db78 100644 --- a/src/controllers/RulesController.php +++ b/src/controllers/RulesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SchemasController.php b/src/controllers/SchemasController.php index 5ba6d4c0..9a0d52e0 100644 --- a/src/controllers/SchemasController.php +++ b/src/controllers/SchemasController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SequencesController.php b/src/controllers/SequencesController.php index 78562b3d..6b090387 100644 --- a/src/controllers/SequencesController.php +++ b/src/controllers/SequencesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ServersController.php b/src/controllers/ServersController.php index f8eaf69d..ac348e4c 100644 --- a/src/controllers/ServersController.php +++ b/src/controllers/ServersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SqlController.php b/src/controllers/SqlController.php index 887ed8b0..a989b737 100644 --- a/src/controllers/SqlController.php +++ b/src/controllers/SqlController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/SqleditController.php b/src/controllers/SqleditController.php index 24151800..a104b0ef 100644 --- a/src/controllers/SqleditController.php +++ b/src/controllers/SqleditController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php index 7597b35e..eda5bacf 100644 --- a/src/controllers/TablesController.php +++ b/src/controllers/TablesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TablespacesController.php b/src/controllers/TablespacesController.php index 11c40550..2a000ac7 100644 --- a/src/controllers/TablespacesController.php +++ b/src/controllers/TablespacesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TblpropertiesController.php b/src/controllers/TblpropertiesController.php index 80d780df..c5ec032f 100644 --- a/src/controllers/TblpropertiesController.php +++ b/src/controllers/TblpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TriggersController.php b/src/controllers/TriggersController.php index 85fae156..6d4d4a97 100644 --- a/src/controllers/TriggersController.php +++ b/src/controllers/TriggersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/TypesController.php b/src/controllers/TypesController.php index b5f60d51..b48ed94a 100644 --- a/src/controllers/TypesController.php +++ b/src/controllers/TypesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/UsersController.php b/src/controllers/UsersController.php index 755fc7c7..c082a477 100644 --- a/src/controllers/UsersController.php +++ b/src/controllers/UsersController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ViewpropertiesController.php b/src/controllers/ViewpropertiesController.php index b6949893..64456bb1 100644 --- a/src/controllers/ViewpropertiesController.php +++ b/src/controllers/ViewpropertiesController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php index db0acabf..6b3afef8 100644 --- a/src/controllers/ViewsController.php +++ b/src/controllers/ViewsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Controller; diff --git a/src/database/Postgres.php b/src/database/Postgres.php index 89b73d59..6da31d6c 100644 --- a/src/database/Postgres.php +++ b/src/database/Postgres.php @@ -179,7 +179,7 @@ class Postgres extends ADOdbBase * @param string $term The search term * @param string $filter The object type to restrict to ('' means no restriction) * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function findObject($term, $filter) { @@ -376,7 +376,7 @@ class Postgres extends ADOdbBase * * @param bool $all True to get all languages, regardless of show_system * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getLanguages($all = false) { diff --git a/src/database/Postgres10.php b/src/database/Postgres10.php index 9b6a0b54..ec62e333 100644 --- a/src/database/Postgres10.php +++ b/src/database/Postgres10.php @@ -25,7 +25,7 @@ class Postgres10 extends Postgres96 /** * Return all tables in current database (and schema). * - * @return \PHPPgAdmin\ADORecordSet|int All tables, sorted alphabetically + * @return int|\PHPPgAdmin\ADORecordSet All tables, sorted alphabetically */ public function getTables() { diff --git a/src/database/Postgres11.php b/src/database/Postgres11.php index 4e3e418f..bf108bbd 100644 --- a/src/database/Postgres11.php +++ b/src/database/Postgres11.php @@ -26,7 +26,7 @@ class Postgres11 extends Postgres10 * @param bool $all If true, will find all available functions, if false just those in search path * @param mixed $type If truthy, will return functions of type trigger * - * @return \PHPPgAdmin\ADORecordSet|int All functions + * @return int|\PHPPgAdmin\ADORecordSet All functions */ public function getFunctions($all = false, $type = null) { diff --git a/src/database/Postgres74.php b/src/database/Postgres74.php index eeb50ab5..405d709d 100644 --- a/src/database/Postgres74.php +++ b/src/database/Postgres74.php @@ -63,7 +63,7 @@ class Postgres74 extends Postgres80 * * @param null|string $currentdatabase * - * @return \PHPPgAdmin\ADORecordSet|int A list of databases, sorted alphabetically + * @return int|\PHPPgAdmin\ADORecordSet A list of databases, sorted alphabetically */ public function getDatabases($currentdatabase = null) { @@ -110,7 +110,7 @@ class Postgres74 extends Postgres80 * @param string $term The search term * @param string $filter The object type to restrict to ('' means no restriction) * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function findObject($term, $filter) { @@ -257,7 +257,7 @@ class Postgres74 extends Postgres80 /** * Returns table locks information in the current database. * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getLocks() { @@ -383,7 +383,7 @@ class Postgres74 extends Postgres80 * * @param string $table The name of the table * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getTable($table) { @@ -424,7 +424,7 @@ class Postgres74 extends Postgres80 * * @param string $table the table where we are looking for fk * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getConstraintsWithFields($table) { @@ -489,7 +489,7 @@ class Postgres74 extends Postgres80 * * @param bool $all * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getSequences($all = false) { @@ -520,7 +520,7 @@ class Postgres74 extends Postgres80 * * @param int $function_oid function identifier * - * @return \PHPPgAdmin\ADORecordSet|int Function info + * @return int|\PHPPgAdmin\ADORecordSet Function info * * @internal param string The $func name of the function to retrieve */ @@ -560,7 +560,7 @@ class Postgres74 extends Postgres80 /** * Returns a list of all casts in the database. * - * @return \PHPPgAdmin\ADORecordSet|int All casts + * @return int|\PHPPgAdmin\ADORecordSet All casts */ public function getCasts() { diff --git a/src/database/Postgres80.php b/src/database/Postgres80.php index 4a0ce5b1..b0522c42 100644 --- a/src/database/Postgres80.php +++ b/src/database/Postgres80.php @@ -57,7 +57,7 @@ class Postgres80 extends Postgres81 * * @param null|string $currentdatabase * - * @return \PHPPgAdmin\ADORecordSet|int A list of databases, sorted alphabetically + * @return int|\PHPPgAdmin\ADORecordSet A list of databases, sorted alphabetically */ public function getDatabases($currentdatabase = null) { @@ -104,7 +104,7 @@ class Postgres80 extends Postgres81 /** * Return all schemas in the current database. * - * @return \PHPPgAdmin\ADORecordSet|int All schemas, sorted alphabetically + * @return int|\PHPPgAdmin\ADORecordSet All schemas, sorted alphabetically */ public function getSchemas() { @@ -132,7 +132,7 @@ class Postgres80 extends Postgres81 * * @param string $schema The name of the schema * - * @return \PHPPgAdmin\ADORecordSet|int Schema information + * @return int|\PHPPgAdmin\ADORecordSet Schema information */ public function getSchemaByName($schema) { @@ -155,7 +155,7 @@ class Postgres80 extends Postgres81 * @param string $username The username * @param string $password The new password * - * @return \PHPPgAdmin\ADORecordSet|int 0 if operation was successful + * @return int|\PHPPgAdmin\ADORecordSet 0 if operation was successful */ public function changePassword($username, $password) { @@ -176,7 +176,7 @@ class Postgres80 extends Postgres81 * @param string $name The name of the aggregate * @param string $basetype The input data type of the aggregate * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getAggregate($name, $basetype) { @@ -431,7 +431,7 @@ class Postgres80 extends Postgres81 /** * Return all tables in current database (and schema). * - * @return \PHPPgAdmin\ADORecordSet|int All tables, sorted alphabetically + * @return int|\PHPPgAdmin\ADORecordSet All tables, sorted alphabetically */ public function getTables() { diff --git a/src/database/Postgres81.php b/src/database/Postgres81.php index 578b9231..41b14a30 100644 --- a/src/database/Postgres81.php +++ b/src/database/Postgres81.php @@ -54,7 +54,7 @@ class Postgres81 extends Postgres82 * * @param null|string $currentdatabase * - * @return \PHPPgAdmin\ADORecordSet|int A list of databases, sorted alphabetically + * @return int|\PHPPgAdmin\ADORecordSet A list of databases, sorted alphabetically */ public function getDatabases($currentdatabase = null) { @@ -145,7 +145,16 @@ class Postgres81 extends Postgres82 // Autovacuum functions /** - * @return \PHPPgAdmin\ADORecordSet|int + * @param mixed $table + * @param mixed $vacenabled + * @param mixed $vacthreshold + * @param mixed $vacscalefactor + * @param mixed $anathresold + * @param mixed $anascalefactor + * @param mixed $vaccostdelay + * @param mixed $vaccostlimit + * + * @return int|\PHPPgAdmin\ADORecordSet */ public function saveAutovacuum( $table, @@ -253,7 +262,7 @@ class Postgres81 extends Postgres82 * * @param null|string $database (optional) Find only connections to specified database * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getProcesses($database = null) { @@ -281,7 +290,7 @@ class Postgres81 extends Postgres82 * * @param string $spcname namespace * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getTablespace($spcname) { @@ -298,7 +307,7 @@ class Postgres81 extends Postgres82 * * @param bool $all Include all tablespaces (necessary when moving objects back to the default space) * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getTablespaces($all = false) { diff --git a/src/database/Postgres82.php b/src/database/Postgres82.php index b5262841..addad441 100644 --- a/src/database/Postgres82.php +++ b/src/database/Postgres82.php @@ -51,7 +51,7 @@ class Postgres82 extends Postgres83 /** * Returns table locks information in the current database. * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getLocks() { @@ -79,7 +79,7 @@ class Postgres82 extends Postgres83 * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence RecordSet returned by getSequence() * @param string $name The new name for the sequence * - * @return \PHPPgAdmin\ADORecordSet|int 0 if operation was successful + * @return int|\PHPPgAdmin\ADORecordSet 0 if operation was successful */ public function alterSequenceName($seqrs, $name) { @@ -107,7 +107,7 @@ class Postgres82 extends Postgres83 * @param \PHPPgAdmin\ADORecordSet $vwrs The view recordSet returned by getView() * @param string $name The new view's name * - * @return \PHPPgAdmin\ADORecordSet|int -1 if Failed + * @return int|\PHPPgAdmin\ADORecordSet -1 if Failed */ public function alterViewName($vwrs, $name) { @@ -135,7 +135,7 @@ class Postgres82 extends Postgres83 * * @param string $table The name of a table whose triggers to retrieve * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getTriggers($table = '') { @@ -167,7 +167,7 @@ class Postgres82 extends Postgres83 * * @param int $function_oid * - * @return \PHPPgAdmin\ADORecordSet|int Function info + * @return int|\PHPPgAdmin\ADORecordSet Function info * * @internal param string The $func name of the function to retrieve */ @@ -338,7 +338,7 @@ class Postgres82 extends Postgres83 * * @param int $operator_oid The oid of the operator * - * @return \PHPPgAdmin\ADORecordSet|int Function info + * @return int|\PHPPgAdmin\ADORecordSet Function info */ public function getOperator($operator_oid) { @@ -374,7 +374,7 @@ class Postgres82 extends Postgres83 /** * Gets all opclasses. * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getOpClasses() { diff --git a/src/database/Postgres83.php b/src/database/Postgres83.php index 6897e81c..fab378ce 100644 --- a/src/database/Postgres83.php +++ b/src/database/Postgres83.php @@ -103,7 +103,7 @@ class Postgres83 extends Postgres84 * * @param string $table * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getTableAutovacuum($table = '') { @@ -150,7 +150,16 @@ class Postgres83 extends Postgres84 } /** - * @return \PHPPgAdmin\ADORecordSet|int + * @param mixed $table + * @param mixed $vacenabled + * @param mixed $vacthreshold + * @param mixed $vacscalefactor + * @param mixed $anathresold + * @param mixed $anascalefactor + * @param mixed $vaccostdelay + * @param mixed $vaccostlimit + * + * @return int|\PHPPgAdmin\ADORecordSet */ public function saveAutovacuum( $table, @@ -268,6 +277,8 @@ class Postgres83 extends Postgres84 } /** + * @param mixed $table + * * @return bool|int */ public function dropAutovacuum($table) @@ -301,7 +312,7 @@ class Postgres83 extends Postgres84 * @param bool $cycledvalue Sequence can cycle ? * @param int $startvalue The sequence start value when issueing a restart (ignored) * - * @return \PHPPgAdmin\ADORecordSet|int 0 if operation was successful + * @return int|\PHPPgAdmin\ADORecordSet 0 if operation was successful */ public function alterSequenceProps( $seqrs, @@ -357,7 +368,7 @@ class Postgres83 extends Postgres84 * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence RecordSet returned by getSequence() * @param string $owner sequence owner * - * @return \PHPPgAdmin\ADORecordSet|int 0 if operation was successful + * @return int|\PHPPgAdmin\ADORecordSet 0 if operation was successful * * @internal param string The $name new owner for the sequence */ @@ -385,7 +396,7 @@ class Postgres83 extends Postgres84 * * @param $function_oid * - * @return \PHPPgAdmin\ADORecordSet|int Function info + * @return int|\PHPPgAdmin\ADORecordSet Function info * * @internal param string $func name of the function to retrieve */ diff --git a/src/database/Postgres84.php b/src/database/Postgres84.php index 6aa5ee9c..66f8d8de 100644 --- a/src/database/Postgres84.php +++ b/src/database/Postgres84.php @@ -39,7 +39,7 @@ class Postgres84 extends Postgres90 * * @param string $table The name of a table whose triggers to retrieve * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getTriggers($table = '') { @@ -71,7 +71,7 @@ class Postgres84 extends Postgres90 * @param string $term The search term * @param string $filter The object type to restrict to ('' means no restriction) * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function findObject($term, $filter) { diff --git a/src/database/Postgres91.php b/src/database/Postgres91.php index 78147929..9c93bc97 100644 --- a/src/database/Postgres91.php +++ b/src/database/Postgres91.php @@ -27,7 +27,7 @@ class Postgres91 extends Postgres92 * * @param null|string $database (optional) Find only connections to specified database * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getProcesses($database = null) { @@ -53,7 +53,7 @@ class Postgres91 extends Postgres92 * * @param bool $all Include all tablespaces (necessary when moving objects back to the default space) * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getTablespaces($all = false) { @@ -77,7 +77,7 @@ class Postgres91 extends Postgres92 * * @param string $spcname * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getTablespace($spcname) { diff --git a/src/database/Postgres92.php b/src/database/Postgres92.php index fa2879e7..b7510952 100644 --- a/src/database/Postgres92.php +++ b/src/database/Postgres92.php @@ -20,7 +20,7 @@ class Postgres92 extends Postgres93 * * @param null|string $database (optional) Find only connections to specified database * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getProcesses($database = null) { @@ -46,7 +46,7 @@ class Postgres92 extends Postgres93 * * @param bool $all Include all tablespaces (necessary when moving objects back to the default space) * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getTablespaces($all = false) { @@ -72,7 +72,7 @@ class Postgres92 extends Postgres93 * * @param $spcname * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getTablespace($spcname) { diff --git a/src/database/Postgres93.php b/src/database/Postgres93.php index 89b8faa1..e7104eeb 100644 --- a/src/database/Postgres93.php +++ b/src/database/Postgres93.php @@ -20,7 +20,7 @@ class Postgres93 extends Postgres94 * @param bool $all If true, will find all available functions, if false just those in search path * @param mixed $type If not null, will find all trigger functions * - * @return \PHPPgAdmin\ADORecordSet|int All functions + * @return int|\PHPPgAdmin\ADORecordSet All functions */ public function getFunctions($all = false, $type = null) { diff --git a/src/database/Postgres96.php b/src/database/Postgres96.php index 1b126997..46b771c2 100644 --- a/src/database/Postgres96.php +++ b/src/database/Postgres96.php @@ -22,7 +22,7 @@ class Postgres96 extends Postgres * * @param null|string $database (optional) Find only connections to specified database * - * @return \PHPPgAdmin\ADORecordSet|int A recordset + * @return int|\PHPPgAdmin\ADORecordSet A recordset */ public function getProcesses($database = null) { @@ -66,7 +66,7 @@ class Postgres96 extends Postgres * @param string $expiry string Format 'YYYY-MM-DD HH:MM:SS'. '' means never expire * @param array $groups The groups to create the user in * - * @return \PHPPgAdmin\ADORecordSet|int 0 if operation was successful + * @return int|\PHPPgAdmin\ADORecordSet 0 if operation was successful * * @internal param $group (array) The groups to create the user in */ diff --git a/src/database/databasetraits/AggregateTrait.php b/src/database/databasetraits/AggregateTrait.php index e11b8719..ab9c7f44 100644 --- a/src/database/databasetraits/AggregateTrait.php +++ b/src/database/databasetraits/AggregateTrait.php @@ -80,7 +80,7 @@ trait AggregateTrait * @param string $aggrtype The input data type of the aggregate * @param bool $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropAggregate($aggrname, $aggrtype, $cascade) { @@ -103,7 +103,7 @@ trait AggregateTrait * @param string $name The name of the aggregate * @param string $basetype The input data type of the aggregate * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getAggregate($name, $basetype) { @@ -133,7 +133,7 @@ trait AggregateTrait /** * Gets all aggregates. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getAggregates() { @@ -236,7 +236,7 @@ trait AggregateTrait * @param string $aggrtype The input data type of the aggregate * @param string $newaggrowner The new owner of the aggregate * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function changeAggregateOwner($aggrname, $aggrtype, $newaggrowner) { @@ -256,7 +256,7 @@ trait AggregateTrait * @param string $aggrtype The input data type of the aggregate * @param string $newaggrschema The new schema for the aggregate * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function changeAggregateSchema($aggrname, $aggrtype, $newaggrschema) { @@ -277,7 +277,7 @@ trait AggregateTrait * @param string $aggrtype The actual input data type of the aggregate * @param string $newaggrname The new name of the aggregate * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function renameAggregate($aggrschema, $aggrname, $aggrtype, $newaggrname) { diff --git a/src/database/databasetraits/ColumnTrait.php b/src/database/databasetraits/ColumnTrait.php index b35e0ff2..017f93e2 100644 --- a/src/database/databasetraits/ColumnTrait.php +++ b/src/database/databasetraits/ColumnTrait.php @@ -261,7 +261,7 @@ trait ColumnTrait * @param string $column The column name to set * @param mixed $default The new default value * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function setColumnDefault($table, $column, $default) { @@ -282,7 +282,7 @@ trait ColumnTrait * @param string $column The column to alter * @param bool $state True to set null, false to set not null * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function setColumnNull($table, $column, $state) { @@ -328,7 +328,7 @@ trait ColumnTrait * @param string $table The table from which to drop * @param string $column The column name to drop default * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropColumnDefault($table, $column) { diff --git a/src/database/databasetraits/DatabaseTrait.php b/src/database/databasetraits/DatabaseTrait.php index 80ea264f..8868ec80 100644 --- a/src/database/databasetraits/DatabaseTrait.php +++ b/src/database/databasetraits/DatabaseTrait.php @@ -56,7 +56,7 @@ trait DatabaseTrait * * @param string $table (optional) The table to analyze * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function analyzeDB($table = '') { @@ -78,7 +78,7 @@ trait DatabaseTrait * * @param string $database The name of the database to retrieve * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getDatabase($database) { @@ -93,7 +93,7 @@ trait DatabaseTrait * * @param null|string $currentdatabase database name that should be on top of the resultset * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getDatabases($currentdatabase = null) { @@ -161,7 +161,7 @@ trait DatabaseTrait * * @param string $database the name of the database to get the comment for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getDatabaseComment($database) { @@ -180,7 +180,7 @@ trait DatabaseTrait * * @param string $database the name of the database to get the owner for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getDatabaseOwner($database) { @@ -271,7 +271,7 @@ trait DatabaseTrait * * @param string $database The name of the database to drop * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropDatabase($database) { @@ -338,7 +338,7 @@ trait DatabaseTrait * @param string $oldName name of database to rename * @param string $newName new name of database * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function alterDatabaseRename($oldName, $newName) { @@ -361,7 +361,7 @@ trait DatabaseTrait * @param string $dbName database to change ownership of * @param string $newOwner user that will own the database * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function alterDatabaseOwner($dbName, $newOwner) { @@ -378,7 +378,7 @@ trait DatabaseTrait * * @param null|string $database (optional) Find only prepared transactions executed in a specific database * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getPreparedXacts($database = null) { @@ -398,7 +398,7 @@ trait DatabaseTrait * * @param null|string $database (optional) Find only connections to specified database * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getProcesses($database = null) { @@ -424,7 +424,7 @@ trait DatabaseTrait /** * Returns table locks information in the current database. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getLocks() { @@ -560,7 +560,7 @@ trait DatabaseTrait /** * Returns all available variable information. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getVariables() { diff --git a/src/database/databasetraits/DomainTrait.php b/src/database/databasetraits/DomainTrait.php index 9d600e70..90b030d3 100644 --- a/src/database/databasetraits/DomainTrait.php +++ b/src/database/databasetraits/DomainTrait.php @@ -16,7 +16,7 @@ trait DomainTrait * * @param string $domain The name of the domain to fetch * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getDomain($domain) { @@ -46,7 +46,7 @@ trait DomainTrait /** * Return all domains in current schema. Excludes domain constraints. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getDomains() { @@ -77,7 +77,7 @@ trait DomainTrait * * @param string $domain The name of the domain whose constraints to fetch * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getDomainConstraints($domain) { @@ -116,7 +116,7 @@ trait DomainTrait * @param string $default Default value for domain * @param string $check A CHECK constraint if there is one * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function createDomain($domain, $type, $length, $array, $notnull, $default, $check) { @@ -240,7 +240,7 @@ trait DomainTrait * @param string $domain The name of the domain to drop * @param string $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropDomain($domain, $cascade) { @@ -263,7 +263,7 @@ trait DomainTrait * @param string $definition The definition of the check * @param string $name (optional) The name to give the check, otherwise default name is assigned * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function addDomainCheckConstraint($domain, $definition, $name = '') { @@ -289,7 +289,7 @@ trait DomainTrait * @param string $constraint The constraint to remove * @param bool $cascade True to cascade, false otherwise * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropDomainConstraint($domain, $constraint, $cascade) { diff --git a/src/database/databasetraits/FtsTrait.php b/src/database/databasetraits/FtsTrait.php index 992b177d..2df56e3a 100644 --- a/src/database/databasetraits/FtsTrait.php +++ b/src/database/databasetraits/FtsTrait.php @@ -82,7 +82,7 @@ trait FtsTrait * * @param bool $all if false, returns schema qualified FTS confs * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFtsConfigurations($all = true) { @@ -116,7 +116,7 @@ trait FtsTrait * * @param string $ftscfg Name of the FTS configuration * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFtsConfigurationMap($ftscfg) { @@ -156,7 +156,7 @@ trait FtsTrait * * @param bool $all if false, return only Parsers from the current schema * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFtsParsers($all = true) { @@ -185,7 +185,7 @@ trait FtsTrait * * @param bool $all if false, return only Dics from the current schema * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFtsDictionaries($all = true) { @@ -211,7 +211,7 @@ trait FtsTrait /** * Returns all FTS dictionary templates available. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFtsDictionaryTemplates() { @@ -242,7 +242,7 @@ trait FtsTrait * @param string $ftscfg The configuration's name * @param bool $cascade true to Cascade to dependenced objects * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropFtsConfiguration($ftscfg, $cascade) { @@ -264,7 +264,7 @@ trait FtsTrait * @param string $ftsdict The dico's name * @param bool $cascade Cascade to dependenced objects * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet * * @todo Support of dictionary templates dropping */ @@ -469,7 +469,7 @@ trait FtsTrait * * @param string $ftsdict The name of the FTS dictionary * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFtsDictionaryByName($ftsdict) { @@ -504,7 +504,7 @@ trait FtsTrait * @param string $action What to do with the mapping: add, alter or drop * @param string $dictname Dictionary that will process tokens given or null in case of drop action * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet * * @internal param string $cfgname The name of the FTS configuration to alter */ @@ -550,7 +550,7 @@ trait FtsTrait * @param string $ftscfg The name of the FTS configuration * @param string $mapping The name of the mapping * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFtsMappingByName($ftscfg, $mapping) { @@ -590,7 +590,7 @@ trait FtsTrait * * @param string $ftscfg The config's name that use the parser * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFtsMappings($ftscfg) { @@ -608,7 +608,7 @@ trait FtsTrait * * @param string $ftscfg The name of the FTS configuration * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFtsConfigurationByName($ftscfg) { diff --git a/src/database/databasetraits/FunctionTrait.php b/src/database/databasetraits/FunctionTrait.php index e8dc715f..d6e5eee6 100644 --- a/src/database/databasetraits/FunctionTrait.php +++ b/src/database/databasetraits/FunctionTrait.php @@ -17,7 +17,7 @@ trait FunctionTrait * @param bool $all If true, will find all available functions, if false just those in search path * @param mixed $type If truthy, will return functions of type trigger * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFunctions($all = false, $type = null) { @@ -328,7 +328,7 @@ trait FunctionTrait * @param int $function_oid The OID of the function to drop * @param bool $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropFunction($function_oid, $cascade) { @@ -351,7 +351,7 @@ trait FunctionTrait * * @param int $function_oid * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet * * @internal param string The $func name of the function to retrieve */ @@ -390,7 +390,7 @@ trait FunctionTrait * * @param int $function_oid * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getFunctionDef($function_oid) { diff --git a/src/database/databasetraits/IndexTrait.php b/src/database/databasetraits/IndexTrait.php index 6c9cae4c..1c47afd4 100644 --- a/src/database/databasetraits/IndexTrait.php +++ b/src/database/databasetraits/IndexTrait.php @@ -125,7 +125,7 @@ trait IndexTrait * @param bool $force If true, recreates indexes forcedly in PostgreSQL 7.0-7.1, forces rebuild of system indexes in * 7.2-7.3, ignored in >=7.4 * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function reindex($type, $name, $force = false) { @@ -194,7 +194,7 @@ trait IndexTrait * * @param string $table the table where we are looking for fk * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getConstraintsWithFields($table) { @@ -260,7 +260,7 @@ trait IndexTrait * @param string $name (optional) The name to give the key, otherwise default name is assigned * @param string $tablespace (optional) The tablespace for the schema, '' indicates default * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function addPrimaryKey($table, $fields, $name = '', $tablespace = '') { @@ -297,7 +297,7 @@ trait IndexTrait * @param string $name (optional) The name to give the key, otherwise default name is assigned * @param string $tablespace (optional) The tablespace for the schema, '' indicates default * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function addUniqueKey($table, $fields, $name = '', $tablespace = '') { @@ -335,7 +335,7 @@ trait IndexTrait * @param string $definition The definition of the check * @param string $name (optional) The name to give the check, otherwise default name is assigned * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function addCheckConstraint($table, $definition, $name = '') { @@ -432,7 +432,7 @@ trait IndexTrait * @param string $initially The initially parameter for the FK (eg. INITIALLY IMMEDIATE) * @param string $name [optional] The name to give the key, otherwise default name is assigned * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet * * @internal param \PHPPgAdmin\Database\The $target table that contains the target columns * @internal param \PHPPgAdmin\Database\The $intially initial deferrability (eg. INITIALLY IMMEDIATE) @@ -503,7 +503,7 @@ trait IndexTrait * @param string $type The type of constraint (c, f, u or p) * @param bool $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropConstraint($constraint, $relation, $type, $cascade) { diff --git a/src/database/databasetraits/OperatorTrait.php b/src/database/databasetraits/OperatorTrait.php index c7325c8d..dfd82dd8 100644 --- a/src/database/databasetraits/OperatorTrait.php +++ b/src/database/databasetraits/OperatorTrait.php @@ -14,7 +14,7 @@ trait OperatorTrait /** * Returns a list of all operators in the database. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getOperators() { @@ -45,7 +45,7 @@ trait OperatorTrait * @param mixed $operator_oid The OID of the operator to drop * @param bool $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropOperator($operator_oid, $cascade) { @@ -81,7 +81,7 @@ trait OperatorTrait * * @param mixed $operator_oid The oid of the operator * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getOperator($operator_oid) { @@ -112,7 +112,7 @@ trait OperatorTrait /** * Gets all opclasses. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getOpClasses() { diff --git a/src/database/databasetraits/PrivilegesTrait.php b/src/database/databasetraits/PrivilegesTrait.php index 5a0c5970..b374a74c 100644 --- a/src/database/databasetraits/PrivilegesTrait.php +++ b/src/database/databasetraits/PrivilegesTrait.php @@ -240,7 +240,7 @@ trait PrivilegesTrait * @param bool $cascade True for cascade revoke, false otherwise * @param string $table the column's table if type=column * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function setPrivileges( $mode, diff --git a/src/database/databasetraits/RoleTrait.php b/src/database/databasetraits/RoleTrait.php index cde8a129..2a0e4e64 100644 --- a/src/database/databasetraits/RoleTrait.php +++ b/src/database/databasetraits/RoleTrait.php @@ -16,7 +16,7 @@ trait RoleTrait * * @param string $rolename (optional) The role name to exclude from the select * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getRoles($rolename = '') { @@ -50,7 +50,7 @@ trait RoleTrait * * @param string $rolename The name of the role to retrieve * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getRole($rolename) { @@ -79,7 +79,7 @@ trait RoleTrait /** * Returns all users in the database cluster. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getUsers() { @@ -101,7 +101,7 @@ trait RoleTrait * * @param string $username The username of the user to retrieve * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getUser($username) { @@ -137,7 +137,7 @@ trait RoleTrait * @param array $new_members_of_role (array) Roles which are automatically added as members of the new role * @param array $new_admins_of_role (array) Roles which are automatically added as admin members of the new role * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function createRole( $rolename, @@ -299,7 +299,7 @@ trait RoleTrait * @param string $rolename The name of the role to rename * @param string $newrolename The new name of the role * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function renameRole($rolename, $newrolename) { @@ -504,7 +504,7 @@ trait RoleTrait * @param string $rolename The name of the role that will belong to the target role * @param int $admin (optional) Flag to grant the admin option * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function grantRole($role, $rolename, $admin = 0) { @@ -527,7 +527,7 @@ trait RoleTrait * @param int $admin (optional) Flag to revoke only the admin option * @param string $type (optional) Type of revoke: RESTRICT | CASCADE * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function revokeRole($role, $rolename, $admin = 0, $type = 'RESTRICT') { @@ -549,7 +549,7 @@ trait RoleTrait * * @param string $rolename The name of the role to drop * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropRole($rolename) { @@ -570,7 +570,7 @@ trait RoleTrait * @param string $expiry string Format 'YYYY-MM-DD HH:MM:SS'. '' means never expire * @param array $groups The groups to create the user in * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet * * @internal param $group (array) The groups to create the user in */ @@ -647,7 +647,7 @@ trait RoleTrait * @param string $username The username of the user to rename * @param string $newname The new name of the user * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function renameUser($username, $newname) { @@ -670,7 +670,7 @@ trait RoleTrait * @param bool $createuser boolean Whether or not the user can create other users * @param string $expiry string Format 'YYYY-MM-DD HH:MM:SS'. '' means never expire. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function setUser($username, $password, $createdb, $createuser, $expiry) { @@ -700,7 +700,7 @@ trait RoleTrait * * @param string $username The username of the user to drop * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropUser($username) { @@ -717,7 +717,7 @@ trait RoleTrait * @param string $rolename The role name * @param string $password The new password * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function changePassword($rolename, $password) { @@ -736,7 +736,7 @@ trait RoleTrait * @param string $groname The name of the group * @param string $user The name of the user to add to the group * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function addGroupMember($groname, $user) { @@ -753,7 +753,7 @@ trait RoleTrait * * @param string $rolename The role name * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getMemberOf($rolename) { @@ -778,7 +778,7 @@ trait RoleTrait * @param string $rolename The role name * @param string $admin (optional) Find only admin members * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getMembers($rolename, $admin = 'f') { @@ -800,7 +800,7 @@ trait RoleTrait * @param string $groname The name of the group * @param string $user The name of the user to remove from the group * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropGroupMember($groname, $user) { @@ -817,7 +817,7 @@ trait RoleTrait * * @param string $groname The name of the group * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getGroup($groname) { @@ -834,7 +834,7 @@ trait RoleTrait /** * Returns all groups in the database cluser. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getGroups() { @@ -849,7 +849,7 @@ trait RoleTrait * @param string $groname The name of the group * @param array $users An array of users to add to the group * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function createGroup($groname, $users) { @@ -870,7 +870,7 @@ trait RoleTrait * * @param string $groname The name of the group to drop * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropGroup($groname) { diff --git a/src/database/databasetraits/RowTrait.php b/src/database/databasetraits/RowTrait.php index b0873b51..73373a1f 100644 --- a/src/database/databasetraits/RowTrait.php +++ b/src/database/databasetraits/RowTrait.php @@ -17,7 +17,7 @@ trait RowTrait * @param string $table The name of a table * @param array $key The associative array holding the key to retrieve * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function browseRow($table, $key) { @@ -107,7 +107,7 @@ trait RowTrait * @param array $format An array of the data type (VALUE or EXPRESSION) * @param array $types An array of field types * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function insertRow($table, $fields, $values, $nulls, $format, $types) { diff --git a/src/database/databasetraits/SchemaTrait.php b/src/database/databasetraits/SchemaTrait.php index f055aaa5..1cbbbc47 100644 --- a/src/database/databasetraits/SchemaTrait.php +++ b/src/database/databasetraits/SchemaTrait.php @@ -16,7 +16,7 @@ trait SchemaTrait /** * Return all schemas in the current database. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getSchemas() { @@ -99,7 +99,7 @@ trait SchemaTrait * * @param mixed $paths An array of schemas in required search order * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function setSearchPath($paths) { @@ -239,7 +239,7 @@ trait SchemaTrait * * @param string $schema The name of the schema * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getSchemaByName($schema) { @@ -262,7 +262,7 @@ trait SchemaTrait * @param string $schemaname The name of the schema to drop * @param bool $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropSchema($schemaname, $cascade) { diff --git a/src/database/databasetraits/SequenceTrait.php b/src/database/databasetraits/SequenceTrait.php index 2a33a4fe..2a76a361 100644 --- a/src/database/databasetraits/SequenceTrait.php +++ b/src/database/databasetraits/SequenceTrait.php @@ -16,7 +16,7 @@ trait SequenceTrait * * @param bool $all true to get all sequences of all schemas * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getSequences($all = false) { @@ -46,7 +46,7 @@ trait SequenceTrait * * @param string $sequence Sequence name * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function nextvalSequence($sequence) { @@ -68,7 +68,7 @@ trait SequenceTrait * @param string $sequence Sequence name * @param number $nextvalue The next value * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function setvalSequence($sequence, $nextvalue) { @@ -90,7 +90,7 @@ trait SequenceTrait * * @param string $sequence Sequence name * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function restartSequence($sequence) { @@ -108,7 +108,7 @@ trait SequenceTrait * * @param string $sequence Sequence name * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function resetSequence($sequence) { @@ -136,7 +136,7 @@ trait SequenceTrait * * @param string $sequence Sequence name * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getSequence($sequence) { @@ -169,7 +169,7 @@ trait SequenceTrait * @param number $cachevalue The cache value * @param bool $cycledvalue True if cycled, false otherwise * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function createSequence( $sequence, @@ -383,7 +383,7 @@ trait SequenceTrait * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence RecordSet returned by getSequence() * @param string $owner the new owner of the sequence * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet * * @internal string $name new owner for the sequence */ @@ -416,7 +416,7 @@ trait SequenceTrait * @param null|bool $cycledvalue Sequence can cycle ? * @param number $startvalue The sequence start value when issueing a restart * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function alterSequenceProps( $seqrs, @@ -476,7 +476,7 @@ trait SequenceTrait * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence RecordSet returned by getSequence() * @param string $name The new name for the sequence * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function alterSequenceName($seqrs, $name) { @@ -502,7 +502,7 @@ trait SequenceTrait * @param \PHPPgAdmin\ADORecordSet $seqrs The sequence RecordSet returned by getSequence() * @param string $schema * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet * * @internal param The $name new schema for the sequence */ @@ -526,7 +526,7 @@ trait SequenceTrait * @param $sequence Sequence name * @param $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropSequence($sequence, $cascade) { diff --git a/src/database/databasetraits/StatsTrait.php b/src/database/databasetraits/StatsTrait.php index 6460d4af..e15d14ea 100644 --- a/src/database/databasetraits/StatsTrait.php +++ b/src/database/databasetraits/StatsTrait.php @@ -16,7 +16,7 @@ trait StatsTrait * * @param string $database The database to fetch stats for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getStatsDatabase($database) { @@ -32,7 +32,7 @@ trait StatsTrait * * @param string $table The table to fetch stats for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getStatsTableTuples($table) { @@ -51,7 +51,7 @@ trait StatsTrait * * @param string $table The table to fetch stats for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getStatsTableIO($table) { @@ -70,7 +70,7 @@ trait StatsTrait * * @param string $table The table to fetch index stats for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getStatsIndexTuples($table) { @@ -89,7 +89,7 @@ trait StatsTrait * * @param string $table The table to fetch index stats for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getStatsIndexIO($table) { diff --git a/src/database/databasetraits/TableTrait.php b/src/database/databasetraits/TableTrait.php index 97e4bd31..cfb21ff7 100644 --- a/src/database/databasetraits/TableTrait.php +++ b/src/database/databasetraits/TableTrait.php @@ -18,7 +18,7 @@ trait TableTrait /** * Return all tables in current database excluding schemas 'pg_catalog', 'information_schema' and 'pg_toast'. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getAllTables() { @@ -36,7 +36,7 @@ trait TableTrait /** * Return all tables in current database (and schema). * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getTables() { @@ -75,7 +75,7 @@ trait TableTrait * * @param string $table The table to find the parents for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getTableParents($table) { @@ -105,7 +105,7 @@ trait TableTrait * * @param string $table The table to find the children for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getTableChildren($table) { @@ -134,8 +134,6 @@ trait TableTrait * * @param string $table The table to define * @param string $cleanprefix set to '-- ' to avoid issuing DROP statement - * - * @return null|string */ public function getTableDefPrefix($table, $cleanprefix = ''): ?string { @@ -338,8 +336,6 @@ trait TableTrait * @param mixed $i * @param int $num Table attributes count + table * constraints count - * - * @return null|string */ private function _dumpConstraints($cons, $table, $sql, $i, $num): ?string { @@ -390,8 +386,6 @@ trait TableTrait * @param \PHPPgAdmin\ADORecordSet $atts table attributes * @param \PHPPgAdmin\ADORecordSet $tblfields table field attributes * @param string $sql The sql sentence generated so far - * - * @return null|string */ private function _dumpColStats($atts, $tblfields, $sql): ?string { @@ -448,8 +442,6 @@ trait TableTrait * @param \PHPPgAdmin\ADORecordSet $privs The table privileges * @param \PHPPgAdmin\ADORecordSet $tblfields The table fields definition * @param string $sql The sql sentence generated so far - * - * @return null|string */ private function _dumpPrivileges($privs, $tblfields, $sql): ?string { @@ -585,7 +577,7 @@ trait TableTrait * * @param string $table The name of the table * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getTable($table) { @@ -620,7 +612,7 @@ trait TableTrait * @param string $table The name of the table * @param string $c_schema The name of the schema * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ private function _getTableAttributesAll($table, $c_schema) { @@ -672,7 +664,7 @@ trait TableTrait * @param string $c_schema The schema of the table * @param string $field (optional) The name of a field to return * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ private function _getTableAttribute($table, $c_schema, $field) { @@ -729,7 +721,7 @@ trait TableTrait * * @param string $table The table to find rules for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getConstraints($table) { @@ -802,8 +794,6 @@ trait TableTrait * dumped after the table contents for speed and efficiency reasons. * * @param string $table The table to define - * - * @return null|string */ public function getTableDefSuffix($table): ?string { @@ -870,7 +860,7 @@ trait TableTrait * @param string $table The name of a table whose indexes to retrieve * @param bool $unique Only get unique/pk indexes * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getIndexes($table = '', $unique = false) { @@ -897,7 +887,7 @@ trait TableTrait * * @param string $table The name of a table whose triggers to retrieve * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getTriggers($table = '') { @@ -928,7 +918,7 @@ trait TableTrait * * @param string $table The table to find rules for * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getRules($table) { @@ -1289,7 +1279,7 @@ trait TableTrait * @param \PHPPgAdmin\ADORecordSet $tblrs The table RecordSet returned by getTable() * @param null|string $owner * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function alterTableOwner($tblrs, $owner = null) { @@ -1315,7 +1305,7 @@ trait TableTrait * @param \PHPPgAdmin\ADORecordSet $tblrs The table RecordSet returned by getTable() * @param null|string $tablespace * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function alterTableTablespace($tblrs, $tablespace = null) { @@ -1341,7 +1331,7 @@ trait TableTrait * @param \PHPPgAdmin\ADORecordSet $tblrs The table RecordSet returned by getTable() * @param string $name The new table's name * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function alterTableName($tblrs, $name = null) { @@ -1372,7 +1362,7 @@ trait TableTrait * @param \PHPPgAdmin\ADORecordSet $tblrs The table RecordSet returned by getTable() * @param null|string $schema * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function alterTableSchema($tblrs, $schema = null) { @@ -1420,7 +1410,7 @@ trait TableTrait * @param string $table The table to drop * @param bool $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropTable($table, $cascade) { @@ -1498,7 +1488,7 @@ trait TableTrait * @param string $relation The name of a relation * @param bool $oids true to dump also the oids * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dumpRelation($relation, $oids) { @@ -1598,7 +1588,7 @@ trait TableTrait * @param int $vaccostdelay vacuum cost delay * @param int $vaccostlimit vacuum cost limit * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function saveAutovacuum( $table, @@ -1659,7 +1649,7 @@ trait TableTrait * * @param string $table The table * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropAutovacuum($table) { diff --git a/src/database/databasetraits/TablespaceTrait.php b/src/database/databasetraits/TablespaceTrait.php index 0308443a..8ac8cfbb 100644 --- a/src/database/databasetraits/TablespaceTrait.php +++ b/src/database/databasetraits/TablespaceTrait.php @@ -16,7 +16,7 @@ trait TablespaceTrait * * @param bool $all Include all tablespaces (necessary when moving objects back to the default space) * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getTablespaces($all = false) { @@ -42,7 +42,7 @@ trait TablespaceTrait * * @param string $spcname * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getTablespace($spcname) { @@ -154,7 +154,7 @@ trait TablespaceTrait * * @param string $spcname The name of the domain to drop * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropTablespace($spcname) { diff --git a/src/database/databasetraits/TriggerTrait.php b/src/database/databasetraits/TriggerTrait.php index c27f77fb..b11ad1fa 100644 --- a/src/database/databasetraits/TriggerTrait.php +++ b/src/database/databasetraits/TriggerTrait.php @@ -17,7 +17,7 @@ trait TriggerTrait * @param string $table The name of a table whose triggers to retrieve * @param string $trigger The name of the trigger to retrieve * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getTrigger($table, $trigger) { @@ -47,7 +47,7 @@ trait TriggerTrait * @param string $tgfrequency * @param string $tgargs The function arguments * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function createTrigger($tgname, $table, $tgproc, $tgtime, $tgevent, $tgfrequency, $tgargs) { @@ -72,7 +72,7 @@ trait TriggerTrait * @param string $trigger The name of the trigger to alter * @param string $name The new name for the trigger * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function alterTrigger($table, $trigger, $name) { @@ -94,7 +94,7 @@ trait TriggerTrait * @param string $table The table from which to drop the trigger * @param bool $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropTrigger($tgname, $table, $cascade) { @@ -117,7 +117,7 @@ trait TriggerTrait * @param string $tgname The name of the trigger to enable * @param string $table The table in which to enable the trigger * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function enableTrigger($tgname, $table) { @@ -137,7 +137,7 @@ trait TriggerTrait * @param string $tgname The name of the trigger to disable * @param string $table The table in which to disable the trigger * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function disableTrigger($tgname, $table) { @@ -188,7 +188,7 @@ trait TriggerTrait * @param bool $replace (optional) True to replace existing rule, false * otherwise * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function createRule($name, $event, $table, $where, $instead, $type, $action, $replace = false) { @@ -232,7 +232,7 @@ trait TriggerTrait * @param string $relation The relation from which to drop * @param string $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropRule($rule, $relation, $cascade) { diff --git a/src/database/databasetraits/TypeTrait.php b/src/database/databasetraits/TypeTrait.php index 25d73d46..a487603a 100644 --- a/src/database/databasetraits/TypeTrait.php +++ b/src/database/databasetraits/TypeTrait.php @@ -69,7 +69,7 @@ trait TypeTrait * * @param string $typname The name of the view to retrieve * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getType($typname) { @@ -88,7 +88,7 @@ trait TypeTrait * @param bool $tabletypes If true, will include table types * @param bool $domains If true, will include domains * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getTypes($all = false, $tabletypes = false, $domains = false) { @@ -145,7 +145,7 @@ trait TypeTrait * @param string $typalign * @param string $typstorage * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet * * @internal param $ ... */ @@ -207,7 +207,7 @@ trait TypeTrait * @param string $typname The name of the type to drop * @param bool $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropType($typname, $cascade) { @@ -283,7 +283,7 @@ trait TypeTrait * * @param string $name * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getEnumValues($name) { @@ -425,7 +425,7 @@ trait TypeTrait /** * Returns a list of all casts in the database. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getCasts() { @@ -470,7 +470,7 @@ trait TypeTrait /** * Returns a list of all conversions in the database. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getConversions() { diff --git a/src/database/databasetraits/ViewTrait.php b/src/database/databasetraits/ViewTrait.php index 7562b4c7..aab8218a 100644 --- a/src/database/databasetraits/ViewTrait.php +++ b/src/database/databasetraits/ViewTrait.php @@ -14,7 +14,7 @@ trait ViewTrait /** * Returns a list of all views in the database. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getViews() { @@ -34,7 +34,7 @@ trait ViewTrait /** * Returns a list of all materialized views in the database. * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getMaterializedViews() { @@ -159,7 +159,7 @@ trait ViewTrait * * @param string $view The name of the view or materialized to retrieve * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function getView($view) { @@ -232,7 +232,7 @@ trait ViewTrait * @param \PHPPgAdmin\ADORecordSet $vwrs The view recordSet returned by getView() * @param null|string $owner * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet * * @internal param $name new view's owner */ @@ -260,7 +260,7 @@ trait ViewTrait * @param \PHPPgAdmin\ADORecordSet $vwrs The view recordSet returned by getView() * @param string $name The new view's name * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function alterViewName($vwrs, $name) { @@ -288,7 +288,7 @@ trait ViewTrait * @param \PHPPgAdmin\ADORecordSet $vwrs The view recordSet returned by getView() * @param string $schema * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet * * @internal param The $name new view's schema */ @@ -316,7 +316,7 @@ trait ViewTrait * @param string $viewname The name of the view to drop * @param string $cascade True to cascade drop, false to restrict * - * @return \PHPPgAdmin\ADORecordSet|int + * @return int|\PHPPgAdmin\ADORecordSet */ public function dropView($viewname, $cascade) { diff --git a/src/decorators/ActionUrlDecorator.php b/src/decorators/ActionUrlDecorator.php index b2087d0a..484e87ce 100644 --- a/src/decorators/ActionUrlDecorator.php +++ b/src/decorators/ActionUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ArrayMergeDecorator.php b/src/decorators/ArrayMergeDecorator.php index aa05ed2c..fced29c7 100644 --- a/src/decorators/ArrayMergeDecorator.php +++ b/src/decorators/ArrayMergeDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/BranchUrlDecorator.php b/src/decorators/BranchUrlDecorator.php index 1911cb95..7ff3cbd3 100644 --- a/src/decorators/BranchUrlDecorator.php +++ b/src/decorators/BranchUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/CallbackDecorator.php b/src/decorators/CallbackDecorator.php index 1e2bb05c..1f36b730 100644 --- a/src/decorators/CallbackDecorator.php +++ b/src/decorators/CallbackDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ConcatDecorator.php b/src/decorators/ConcatDecorator.php index 9b185ec0..d76cf7d3 100644 --- a/src/decorators/ConcatDecorator.php +++ b/src/decorators/ConcatDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/Decorator.php b/src/decorators/Decorator.php index 6e83d48d..722dd8ef 100644 --- a/src/decorators/Decorator.php +++ b/src/decorators/Decorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/FieldDecorator.php b/src/decorators/FieldDecorator.php index e5738012..ed72ba16 100644 --- a/src/decorators/FieldDecorator.php +++ b/src/decorators/FieldDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/IfEmptyDecorator.php b/src/decorators/IfEmptyDecorator.php index f6261205..14855238 100644 --- a/src/decorators/IfEmptyDecorator.php +++ b/src/decorators/IfEmptyDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/RedirectUrlDecorator.php b/src/decorators/RedirectUrlDecorator.php index 0576eee3..4d127871 100644 --- a/src/decorators/RedirectUrlDecorator.php +++ b/src/decorators/RedirectUrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/ReplaceDecorator.php b/src/decorators/ReplaceDecorator.php index a3afe609..f4f04be2 100644 --- a/src/decorators/ReplaceDecorator.php +++ b/src/decorators/ReplaceDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/decorators/UrlDecorator.php b/src/decorators/UrlDecorator.php index 8c879184..b52924f1 100644 --- a/src/decorators/UrlDecorator.php +++ b/src/decorators/UrlDecorator.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Decorators; diff --git a/src/help/PostgresDoc10.php b/src/help/PostgresDoc10.php index 71544ae6..87993f8c 100644 --- a/src/help/PostgresDoc10.php +++ b/src/help/PostgresDoc10.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc74.php b/src/help/PostgresDoc74.php index 998ee821..76bcd9f8 100644 --- a/src/help/PostgresDoc74.php +++ b/src/help/PostgresDoc74.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc80.php b/src/help/PostgresDoc80.php index 5b8462c5..662efef0 100644 --- a/src/help/PostgresDoc80.php +++ b/src/help/PostgresDoc80.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc81.php b/src/help/PostgresDoc81.php index e2b76c9b..5329dcef 100644 --- a/src/help/PostgresDoc81.php +++ b/src/help/PostgresDoc81.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc82.php b/src/help/PostgresDoc82.php index 5c150c9d..15cb62e6 100644 --- a/src/help/PostgresDoc82.php +++ b/src/help/PostgresDoc82.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc83.php b/src/help/PostgresDoc83.php index 41440e62..c9932e89 100644 --- a/src/help/PostgresDoc83.php +++ b/src/help/PostgresDoc83.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc84.php b/src/help/PostgresDoc84.php index 75fb61f8..5fb1482e 100644 --- a/src/help/PostgresDoc84.php +++ b/src/help/PostgresDoc84.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc90.php b/src/help/PostgresDoc90.php index dca7ede5..88b03e14 100644 --- a/src/help/PostgresDoc90.php +++ b/src/help/PostgresDoc90.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc91.php b/src/help/PostgresDoc91.php index b14493c2..bdec28eb 100644 --- a/src/help/PostgresDoc91.php +++ b/src/help/PostgresDoc91.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc92.php b/src/help/PostgresDoc92.php index 6d8c8faf..9c6d76ce 100644 --- a/src/help/PostgresDoc92.php +++ b/src/help/PostgresDoc92.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc93.php b/src/help/PostgresDoc93.php index fd768034..57000af1 100644 --- a/src/help/PostgresDoc93.php +++ b/src/help/PostgresDoc93.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc94.php b/src/help/PostgresDoc94.php index f4543ef1..c73716e8 100644 --- a/src/help/PostgresDoc94.php +++ b/src/help/PostgresDoc94.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc95.php b/src/help/PostgresDoc95.php index a642849e..44bfe3fd 100644 --- a/src/help/PostgresDoc95.php +++ b/src/help/PostgresDoc95.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/help/PostgresDoc96.php b/src/help/PostgresDoc96.php index 473a9060..6c828a80 100644 --- a/src/help/PostgresDoc96.php +++ b/src/help/PostgresDoc96.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Help; diff --git a/src/traits/AdminTrait.php b/src/traits/AdminTrait.php index a59eabd7..7e87f656 100644 --- a/src/traits/AdminTrait.php +++ b/src/traits/AdminTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/ExportTrait.php b/src/traits/ExportTrait.php index 29349361..f45f8f08 100644 --- a/src/traits/ExportTrait.php +++ b/src/traits/ExportTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/FormTrait.php b/src/traits/FormTrait.php index e98cb8e7..3b69e00a 100644 --- a/src/traits/FormTrait.php +++ b/src/traits/FormTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/HelperTrait.php b/src/traits/HelperTrait.php index 28ca8c1e..1ef43d6a 100644 --- a/src/traits/HelperTrait.php +++ b/src/traits/HelperTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/InsertEditRowTrait.php b/src/traits/InsertEditRowTrait.php index ae1d8069..8cf32982 100644 --- a/src/traits/InsertEditRowTrait.php +++ b/src/traits/InsertEditRowTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/MiscTrait.php b/src/traits/MiscTrait.php index 4f02b72b..71409463 100644 --- a/src/traits/MiscTrait.php +++ b/src/traits/MiscTrait.php @@ -90,7 +90,7 @@ trait MiscTrait 'subject' => 'table', 'table' => $_REQUEST['table'], 'action' => 'confselectrows', - ])]; + ]), ]; break; case 'view': @@ -163,10 +163,10 @@ trait MiscTrait } if (!isset($vars['url'])) { - $vars['url'] = SUBFOLDER . '/redirect'; + $vars['url'] = SUBFOLDER.'/redirect'; } - if ($vars['url'] == SUBFOLDER . '/redirect' && isset($vars['params']['subject'])) { - $vars['url'] = SUBFOLDER . '/redirect/' . $vars['params']['subject']; + if ($vars['url'] == SUBFOLDER.'/redirect' && isset($vars['params']['subject'])) { + $vars['url'] = SUBFOLDER.'/redirect/'.$vars['params']['subject']; unset($vars['params']['subject']); } @@ -185,7 +185,7 @@ trait MiscTrait $maxlen = isset($params['cliplen']) && is_integer($params['cliplen']) ? $params['cliplen'] : $this->conf['max_chars']; $ellipsis = isset($params['ellipsis']) ? $params['ellipsis'] : $this->lang['strellipsis']; if (strlen($str) > $maxlen) { - $str = substr($str, 0, $maxlen - 1) . $ellipsis; + $str = substr($str, 0, $maxlen - 1).$ellipsis; } return $str; @@ -621,7 +621,7 @@ trait MiscTrait 'icon' => 'Views', ], 'matviews' => [ - 'title' => 'M ' . $lang['strviews'], + 'title' => 'M '.$lang['strviews'], 'url' => 'materializedviews', 'urlvars' => ['subject' => 'schema'], 'help' => 'pg.matview', @@ -995,7 +995,7 @@ trait MiscTrait 'icon' => 'Privileges', ], 'show' => [ - 'title' => $lang['strshow'] . ' ' . $lang['strdefinition'], + 'title' => $lang['strshow'].' '.$lang['strdefinition'], 'url' => 'functions', 'urlvars' => [ 'subject' => 'function', @@ -1055,14 +1055,14 @@ trait MiscTrait $tabs = [ 'sql' => [ 'title' => $lang['strsql'], - 'url' => \SUBFOLDER . '/src/views/sqledit', + 'url' => \SUBFOLDER.'/src/views/sqledit', 'urlvars' => ['action' => 'sql', 'subject' => 'schema'], 'help' => 'pg.sql', 'icon' => 'SqlEditor', ], 'find' => [ 'title' => $lang['strfind'], - 'url' => \SUBFOLDER . '/src/views/sqledit', + 'url' => \SUBFOLDER.'/src/views/sqledit', 'urlvars' => ['action' => 'find', 'subject' => 'schema'], 'icon' => 'Search', ], diff --git a/src/traits/ServersTrait.php b/src/traits/ServersTrait.php index da852c17..c206cf01 100644 --- a/src/traits/ServersTrait.php +++ b/src/traits/ServersTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/ViewsMatViewsPropertiesTrait.php b/src/traits/ViewsMatViewsPropertiesTrait.php index ec94d192..294578d4 100644 --- a/src/traits/ViewsMatViewsPropertiesTrait.php +++ b/src/traits/ViewsMatViewsPropertiesTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Traits; diff --git a/src/traits/ViewsMatviewsTrait.php b/src/traits/ViewsMatviewsTrait.php index bd33d807..b404668c 100644 --- a/src/traits/ViewsMatviewsTrait.php +++ b/src/traits/ViewsMatviewsTrait.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Traits; diff --git a/src/translations/Afrikaans.php b/src/translations/Afrikaans.php index deef3810..4f4a8f25 100644 --- a/src/translations/Afrikaans.php +++ b/src/translations/Afrikaans.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Arabic.php b/src/translations/Arabic.php index e0abcc08..feb47502 100644 --- a/src/translations/Arabic.php +++ b/src/translations/Arabic.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Catalan.php b/src/translations/Catalan.php index da434eb6..b65df235 100644 --- a/src/translations/Catalan.php +++ b/src/translations/Catalan.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseSim.php b/src/translations/ChineseSim.php index 7c75508a..c98568db 100644 --- a/src/translations/ChineseSim.php +++ b/src/translations/ChineseSim.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseTr.php b/src/translations/ChineseTr.php index b3334c56..158552d3 100644 --- a/src/translations/ChineseTr.php +++ b/src/translations/ChineseTr.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseUtf8ZhCn.php b/src/translations/ChineseUtf8ZhCn.php index 88ce47c5..22190407 100644 --- a/src/translations/ChineseUtf8ZhCn.php +++ b/src/translations/ChineseUtf8ZhCn.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/ChineseUtf8ZhTw.php b/src/translations/ChineseUtf8ZhTw.php index a8c65847..c5bb3291 100644 --- a/src/translations/ChineseUtf8ZhTw.php +++ b/src/translations/ChineseUtf8ZhTw.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Czech.php b/src/translations/Czech.php index 9abc3f20..25254785 100644 --- a/src/translations/Czech.php +++ b/src/translations/Czech.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Danish.php b/src/translations/Danish.php index 997a29c6..dfd7d26b 100644 --- a/src/translations/Danish.php +++ b/src/translations/Danish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Dutch.php b/src/translations/Dutch.php index d25f68ba..de7af4ac 100644 --- a/src/translations/Dutch.php +++ b/src/translations/Dutch.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/English.php b/src/translations/English.php index d66ebf6e..a2595c49 100644 --- a/src/translations/English.php +++ b/src/translations/English.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/French.php b/src/translations/French.php index 4a7ded4b..b0fefded 100644 --- a/src/translations/French.php +++ b/src/translations/French.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Galician.php b/src/translations/Galician.php index 7e014c16..d4e4f601 100644 --- a/src/translations/Galician.php +++ b/src/translations/Galician.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/German.php b/src/translations/German.php index d1ed7876..d7e4eaa0 100644 --- a/src/translations/German.php +++ b/src/translations/German.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Greek.php b/src/translations/Greek.php index 2d989429..b8d32047 100644 --- a/src/translations/Greek.php +++ b/src/translations/Greek.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Hebrew.php b/src/translations/Hebrew.php index 8e950559..3b5e6c3e 100644 --- a/src/translations/Hebrew.php +++ b/src/translations/Hebrew.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Hungarian.php b/src/translations/Hungarian.php index 0a812992..3787f2ff 100644 --- a/src/translations/Hungarian.php +++ b/src/translations/Hungarian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Italian.php b/src/translations/Italian.php index 21849e5e..2199365e 100644 --- a/src/translations/Italian.php +++ b/src/translations/Italian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Japanese.php b/src/translations/Japanese.php index 40564282..e74c7321 100644 --- a/src/translations/Japanese.php +++ b/src/translations/Japanese.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Lithuanian.php b/src/translations/Lithuanian.php index d388402b..3ac2f5c7 100644 --- a/src/translations/Lithuanian.php +++ b/src/translations/Lithuanian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Mongol.php b/src/translations/Mongol.php index 0d9ae2fb..a3ce6c1c 100644 --- a/src/translations/Mongol.php +++ b/src/translations/Mongol.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Polish.php b/src/translations/Polish.php index 6f7c76a8..98270656 100644 --- a/src/translations/Polish.php +++ b/src/translations/Polish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/PortugueseBr.php b/src/translations/PortugueseBr.php index be1aee4e..271c3c92 100644 --- a/src/translations/PortugueseBr.php +++ b/src/translations/PortugueseBr.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/PortuguesePt.php b/src/translations/PortuguesePt.php index fd358333..f5ae4e01 100644 --- a/src/translations/PortuguesePt.php +++ b/src/translations/PortuguesePt.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Romanian.php b/src/translations/Romanian.php index e244e90d..bfe2ade5 100644 --- a/src/translations/Romanian.php +++ b/src/translations/Romanian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Russian.php b/src/translations/Russian.php index 5ad2217c..82616515 100644 --- a/src/translations/Russian.php +++ b/src/translations/Russian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/RussianUtf8.php b/src/translations/RussianUtf8.php index 123286e9..5322dd9a 100644 --- a/src/translations/RussianUtf8.php +++ b/src/translations/RussianUtf8.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Slovak.php b/src/translations/Slovak.php index 2cff78d9..34e857cd 100644 --- a/src/translations/Slovak.php +++ b/src/translations/Slovak.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Spanish.php b/src/translations/Spanish.php index 5548288c..36172f67 100644 --- a/src/translations/Spanish.php +++ b/src/translations/Spanish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Swedish.php b/src/translations/Swedish.php index a0cd6448..c492ff54 100644 --- a/src/translations/Swedish.php +++ b/src/translations/Swedish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Turkish.php b/src/translations/Turkish.php index 70bcb8b9..b499472a 100644 --- a/src/translations/Turkish.php +++ b/src/translations/Turkish.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/translations/Ukrainian.php b/src/translations/Ukrainian.php index 717c65ad..e1e90c59 100644 --- a/src/translations/Ukrainian.php +++ b/src/translations/Ukrainian.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\Translations; diff --git a/src/xhtml/HTMLController.php b/src/xhtml/HTMLController.php index 28c4d93b..010bc34a 100644 --- a/src/xhtml/HTMLController.php +++ b/src/xhtml/HTMLController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLFooterController.php b/src/xhtml/HTMLFooterController.php index eaaa1904..a823b310 100644 --- a/src/xhtml/HTMLFooterController.php +++ b/src/xhtml/HTMLFooterController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLHeaderController.php b/src/xhtml/HTMLHeaderController.php index 60d50ba6..73cb6d17 100644 --- a/src/xhtml/HTMLHeaderController.php +++ b/src/xhtml/HTMLHeaderController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/HTMLNavbarController.php b/src/xhtml/HTMLNavbarController.php index eb4b2a42..2e1b79c0 100644 --- a/src/xhtml/HTMLNavbarController.php +++ b/src/xhtml/HTMLNavbarController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\XHtml; @@ -43,7 +43,7 @@ class HTMLNavbarController extends HTMLController } /** - * @param array $viewVars + * @param mixed $crumbs */ private function _getSearchPathsCrumbs($crumbs, array $viewVars) { @@ -181,8 +181,6 @@ class HTMLNavbarController extends HTMLController * * @param bool $do_print true to print, false to return html * @param null|mixed $from which method is calling this one - * - * @return null|string */ private function printTopbar($do_print = true, $from = null): ?string { diff --git a/src/xhtml/HTMLTableController.php b/src/xhtml/HTMLTableController.php index 4f567411..161c3d54 100644 --- a/src/xhtml/HTMLTableController.php +++ b/src/xhtml/HTMLTableController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\XHtml; @@ -65,8 +65,6 @@ class HTMLTableController extends HTMLController * It can return an array of actions specific to the row, or if nothing is returned then the standard actions are used. * (see TblpropertiesController and ConstraintsController for examples) * The function must not must not store urls because they are relative and won't work out of context. - * - * @return void */ public function initialize(&$tabledata, &$columns, &$actions, $place, $nodata = '', $pre_fn = null): void { diff --git a/src/xhtml/TreeController.php b/src/xhtml/TreeController.php index c524c75b..4347b005 100644 --- a/src/xhtml/TreeController.php +++ b/src/xhtml/TreeController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlButton.php b/src/xhtml/XHtmlButton.php index bf18cf8d..61b30cfa 100644 --- a/src/xhtml/XHtmlButton.php +++ b/src/xhtml/XHtmlButton.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlOption.php b/src/xhtml/XHtmlOption.php index e6fcf559..2a563ba9 100644 --- a/src/xhtml/XHtmlOption.php +++ b/src/xhtml/XHtmlOption.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSelect.php b/src/xhtml/XHtmlSelect.php index 779e03e4..c87d058c 100644 --- a/src/xhtml/XHtmlSelect.php +++ b/src/xhtml/XHtmlSelect.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\XHtml; diff --git a/src/xhtml/XHtmlSimpleElement.php b/src/xhtml/XHtmlSimpleElement.php index 7d938368..b5a10805 100644 --- a/src/xhtml/XHtmlSimpleElement.php +++ b/src/xhtml/XHtmlSimpleElement.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace PHPPgAdmin\XHtml; diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php index 4b5b4380..355ea599 100644 --- a/tests/_support/AcceptanceTester.php +++ b/tests/_support/AcceptanceTester.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ class AcceptanceTester extends \Codeception\Actor diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php index f4194f50..7c712c7b 100644 --- a/tests/_support/FunctionalTester.php +++ b/tests/_support/FunctionalTester.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ class FunctionalTester extends \Codeception\Actor diff --git a/tests/_support/Helper/Acceptance.php b/tests/_support/Helper/Acceptance.php index d34ee39d..ec3dee7d 100644 --- a/tests/_support/Helper/Acceptance.php +++ b/tests/_support/Helper/Acceptance.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace Helper; diff --git a/tests/_support/Helper/Functional.php b/tests/_support/Helper/Functional.php index 92e1cbd9..6e60102e 100644 --- a/tests/_support/Helper/Functional.php +++ b/tests/_support/Helper/Functional.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace Helper; diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php index 11c94d8b..84c82e5b 100644 --- a/tests/_support/Helper/Unit.php +++ b/tests/_support/Helper/Unit.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace Helper; diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php index 9a7ed543..218e677a 100644 --- a/tests/_support/UnitTester.php +++ b/tests/_support/UnitTester.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ class UnitTester extends \Codeception\Actor diff --git a/tests/_support/_generated/UnitTesterActions.php b/tests/_support/_generated/UnitTesterActions.php index 3d59bcde..ee1f441d 100644 --- a/tests/_support/_generated/UnitTesterActions.php +++ b/tests/_support/_generated/UnitTesterActions.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ namespace _generated; diff --git a/tests/unit/ContainerTest.php b/tests/unit/ContainerTest.php index 7b1c57d9..7553c7a1 100644 --- a/tests/unit/ContainerTest.php +++ b/tests/unit/ContainerTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ class ContainerTest extends \Codeception\Test\Unit diff --git a/tests/unit/ViewTest.php b/tests/unit/ViewTest.php index b311a213..5aa145c3 100644 --- a/tests/unit/ViewTest.php +++ b/tests/unit/ViewTest.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ class ViewTest extends \Codeception\Test\Unit diff --git a/tests/views/acinsert.php b/tests/views/acinsert.php index 438c3404..a5e4a014 100644 --- a/tests/views/acinsert.php +++ b/tests/views/acinsert.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ $do_render = false; diff --git a/tests/views/aggregates.php b/tests/views/aggregates.php index 3c2b460d..eea98714 100644 --- a/tests/views/aggregates.php +++ b/tests/views/aggregates.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/alldb.php b/tests/views/alldb.php index 59bf9efc..e4096824 100644 --- a/tests/views/alldb.php +++ b/tests/views/alldb.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/browser.php b/tests/views/browser.php index 7ace7562..33b128f0 100644 --- a/tests/views/browser.php +++ b/tests/views/browser.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ $do_render = false; diff --git a/tests/views/casts.php b/tests/views/casts.php index e7afab8e..37868863 100644 --- a/tests/views/casts.php +++ b/tests/views/casts.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/colproperties.php b/tests/views/colproperties.php index 8b1a5ded..ee7345e0 100644 --- a/tests/views/colproperties.php +++ b/tests/views/colproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/constraints.php b/tests/views/constraints.php index 2718a7b6..7abf15b2 100644 --- a/tests/views/constraints.php +++ b/tests/views/constraints.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/conversions.php b/tests/views/conversions.php index ad6d3d88..52deec74 100644 --- a/tests/views/conversions.php +++ b/tests/views/conversions.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/database.php b/tests/views/database.php index 0aa97b05..09b15f66 100644 --- a/tests/views/database.php +++ b/tests/views/database.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/dataexport.php b/tests/views/dataexport.php index f8b7ac66..320ac062 100644 --- a/tests/views/dataexport.php +++ b/tests/views/dataexport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ $do_render = false; diff --git a/tests/views/dataimport.php b/tests/views/dataimport.php index 41514cd4..87fb2428 100644 --- a/tests/views/dataimport.php +++ b/tests/views/dataimport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ $do_render = false; diff --git a/tests/views/dbexport.php b/tests/views/dbexport.php index e02725ca..57483a18 100644 --- a/tests/views/dbexport.php +++ b/tests/views/dbexport.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ $do_render = false; diff --git a/tests/views/display.php b/tests/views/display.php index ceaa9c3c..3db8c274 100644 --- a/tests/views/display.php +++ b/tests/views/display.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/domains.php b/tests/views/domains.php index 780d8539..d60991c1 100644 --- a/tests/views/domains.php +++ b/tests/views/domains.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/fulltext.php b/tests/views/fulltext.php index 0674cf43..f99bdbb2 100644 --- a/tests/views/fulltext.php +++ b/tests/views/fulltext.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/functions.php b/tests/views/functions.php index 3b83635a..6247a8cc 100644 --- a/tests/views/functions.php +++ b/tests/views/functions.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/groups.php b/tests/views/groups.php index e2aa9d9b..de94990f 100644 --- a/tests/views/groups.php +++ b/tests/views/groups.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/help.php b/tests/views/help.php index 335e1f16..f690063e 100644 --- a/tests/views/help.php +++ b/tests/views/help.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/history.php b/tests/views/history.php index e0b299d6..a678d0ce 100644 --- a/tests/views/history.php +++ b/tests/views/history.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/indexes.php b/tests/views/indexes.php index 51636f72..53620e08 100644 --- a/tests/views/indexes.php +++ b/tests/views/indexes.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/info.php b/tests/views/info.php index 92c3b546..c000a771 100644 --- a/tests/views/info.php +++ b/tests/views/info.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/intro.php b/tests/views/intro.php index db0c90eb..4f8f6b86 100644 --- a/tests/views/intro.php +++ b/tests/views/intro.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ $do_render = false; diff --git a/tests/views/languages.php b/tests/views/languages.php index 7481f820..46e02fd4 100644 --- a/tests/views/languages.php +++ b/tests/views/languages.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/login.php b/tests/views/login.php index 62541a3a..def89502 100644 --- a/tests/views/login.php +++ b/tests/views/login.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ $do_render = false; diff --git a/tests/views/materializedviewproperties.php b/tests/views/materializedviewproperties.php index 6130a1b2..e7bc6940 100644 --- a/tests/views/materializedviewproperties.php +++ b/tests/views/materializedviewproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/materializedviews.php b/tests/views/materializedviews.php index 142e2ea4..c15353a1 100644 --- a/tests/views/materializedviews.php +++ b/tests/views/materializedviews.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/opclasses.php b/tests/views/opclasses.php index 9a6bfa27..353622f9 100644 --- a/tests/views/opclasses.php +++ b/tests/views/opclasses.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/operators.php b/tests/views/operators.php index d7d24a8b..4f7ff984 100644 --- a/tests/views/operators.php +++ b/tests/views/operators.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/privileges.php b/tests/views/privileges.php index 2350dc53..f9096ee5 100644 --- a/tests/views/privileges.php +++ b/tests/views/privileges.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ $do_render = false; diff --git a/tests/views/roles.php b/tests/views/roles.php index 7a9b2135..b8b73057 100644 --- a/tests/views/roles.php +++ b/tests/views/roles.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/rules.php b/tests/views/rules.php index 967c4e16..29f3119f 100644 --- a/tests/views/rules.php +++ b/tests/views/rules.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/schemas.php b/tests/views/schemas.php index f674dc8b..8cd3f457 100644 --- a/tests/views/schemas.php +++ b/tests/views/schemas.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/sequences.php b/tests/views/sequences.php index 097bd985..79cf2890 100644 --- a/tests/views/sequences.php +++ b/tests/views/sequences.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/servers.php b/tests/views/servers.php index fc1f3551..f3fa88ac 100644 --- a/tests/views/servers.php +++ b/tests/views/servers.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ $do_render = false; diff --git a/tests/views/sql.php b/tests/views/sql.php index eb0b5761..00ca2b22 100644 --- a/tests/views/sql.php +++ b/tests/views/sql.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/sqledit.php b/tests/views/sqledit.php index 7fba3c06..5b75a56c 100644 --- a/tests/views/sqledit.php +++ b/tests/views/sqledit.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/tables.php b/tests/views/tables.php index aeeb6c77..96f31e11 100644 --- a/tests/views/tables.php +++ b/tests/views/tables.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ $do_render = false; diff --git a/tests/views/tablespaces.php b/tests/views/tablespaces.php index 9c75d14b..68289217 100644 --- a/tests/views/tablespaces.php +++ b/tests/views/tablespaces.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/tblproperties.php b/tests/views/tblproperties.php index 692ea294..f9a0b0f8 100644 --- a/tests/views/tblproperties.php +++ b/tests/views/tblproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/triggers.php b/tests/views/triggers.php index 5c0b9434..a482604f 100644 --- a/tests/views/triggers.php +++ b/tests/views/triggers.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/types.php b/tests/views/types.php index 1dc04aab..ad998b86 100644 --- a/tests/views/types.php +++ b/tests/views/types.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/users.php b/tests/views/users.php index a67d6b2f..8bfda679 100644 --- a/tests/views/users.php +++ b/tests/views/users.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/viewproperties.php b/tests/views/viewproperties.php index c8939a2e..55dfd197 100644 --- a/tests/views/viewproperties.php +++ b/tests/views/viewproperties.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions diff --git a/tests/views/views.php b/tests/views/views.php index c0bb5198..6501fca8 100644 --- a/tests/views/views.php +++ b/tests/views/views.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-RC8 + * PHPPgAdmin v6.0.0-RC9 */ // Include application functions |