From 6ecd16dd63bde1148f1e3d07fd0af7aa5eda4e13 Mon Sep 17 00:00:00 2001 From: Felipe Figueroa Date: Tue, 16 Mar 2021 05:34:41 -0300 Subject: updates composer --- composer.json | 4 +- composer.lock | 603 ++++++++++-------------- src/controllers/TreeController.php | 3 +- src/database/ADOdbBase.php | 34 +- src/database/Postgres.php | 15 +- src/database/Postgres10.php | 2 +- src/database/Postgres11.php | 2 +- src/database/Postgres12.php | 3 +- src/database/Postgres91.php | 9 +- src/database/Postgres92.php | 6 +- src/database/Postgres93.php | 2 +- src/database/Postgres96.php | 7 +- src/database/databasetraits/AggregateTrait.php | 16 +- src/database/databasetraits/ColumnTrait.php | 22 +- src/database/databasetraits/DatabaseTrait.php | 34 +- src/database/databasetraits/DomainTrait.php | 16 +- src/database/databasetraits/FtsTrait.php | 32 +- src/database/databasetraits/FunctionTrait.php | 14 +- src/database/databasetraits/HasTrait.php | 88 ++-- src/database/databasetraits/IndexTrait.php | 32 +- src/database/databasetraits/OperatorTrait.php | 8 +- src/database/databasetraits/PrivilegesTrait.php | 6 +- src/database/databasetraits/RoleTrait.php | 52 +- src/database/databasetraits/RowTrait.php | 10 +- src/database/databasetraits/SchemaTrait.php | 12 +- src/database/databasetraits/SequenceTrait.php | 28 +- src/database/databasetraits/StatsTrait.php | 10 +- src/database/databasetraits/TableTrait.php | 46 +- src/database/databasetraits/TablespaceTrait.php | 10 +- src/database/databasetraits/TriggerTrait.php | 16 +- src/database/databasetraits/TypeTrait.php | 20 +- src/database/databasetraits/ViewTrait.php | 20 +- 32 files changed, 580 insertions(+), 602 deletions(-) diff --git a/composer.json b/composer.json index 9f5da389..03205de0 100644 --- a/composer.json +++ b/composer.json @@ -72,13 +72,13 @@ "scripts": { "post-install-cmd": "@clear_twig_cache", "post-autoload-dump": "@composer normalize", - "test": "pest", "post-create-project-cmd": "@clear_twig_cache", "clear_twig_cache": [ "make fix_permissions", "php -r \"array_map( 'unlink', array_filter((array) glob('temp/twigcache/**/*.php', GLOB_BRACE)));\"", "php -r \"array_map( 'rmdir', array_filter((array) glob('temp/twigcache/*', GLOB_BRACE)));\"" ], - "phpstan": "phpstan analyse src " + "phpstan": "phpstan analyse src ", + "test": "pest" } } diff --git a/composer.lock b/composer.lock index 48f446e4..d1cffbf4 100644 --- a/composer.lock +++ b/composer.lock @@ -8,20 +8,20 @@ "packages": [ { "name": "adodb/adodb-php", - "version": "v5.20.18", + "version": "v5.21.0", "source": { "type": "git", "url": "https://github.com/ADOdb/ADOdb.git", - "reference": "0363eca78eed8bd02d1456072c729da302655241" + "reference": "199391f639a0b3346a80d66c00c87230fa3e6a07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/0363eca78eed8bd02d1456072c729da302655241", - "reference": "0363eca78eed8bd02d1456072c729da302655241", + "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/199391f639a0b3346a80d66c00c87230fa3e6a07", + "reference": "199391f639a0b3346a80d66c00c87230fa3e6a07", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^5.5.9 || ^7.0 || ^8.0" }, "type": "library", "autoload": { @@ -50,7 +50,7 @@ } ], "description": "ADOdb is a PHP database abstraction layer library", - "homepage": "http://adodb.org/", + "homepage": "https://adodb.org/", "keywords": [ "abstraction", "database", @@ -62,7 +62,7 @@ "issues": "https://github.com/ADOdb/ADOdb/issues", "source": "https://github.com/ADOdb/ADOdb" }, - "time": "2020-06-28T17:52:20+00:00" + "time": "2021-02-27T11:38:53+00:00" }, { "name": "nikic/fast-route", @@ -116,29 +116,29 @@ }, { "name": "pimple/pimple", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "e55d12f9d6a0e7f9c85992b73df1267f46279930" + "reference": "86406047271859ffc13424a048541f4531f53601" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/e55d12f9d6a0e7f9c85992b73df1267f46279930", - "reference": "e55d12f9d6a0e7f9c85992b73df1267f46279930", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/86406047271859ffc13424a048541f4531f53601", + "reference": "86406047271859ffc13424a048541f4531f53601", "shasum": "" }, "require": { - "php": "^7.2.5", - "psr/container": "^1.0" + "php": ">=7.2.5", + "psr/container": "^1.1" }, "require-dev": { - "symfony/phpunit-bridge": "^3.4|^4.4|^5.0" + "symfony/phpunit-bridge": "^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3.x-dev" + "dev-master": "3.4.x-dev" } }, "autoload": { @@ -163,10 +163,9 @@ "dependency injection" ], "support": { - "issues": "https://github.com/silexphp/Pimple/issues", - "source": "https://github.com/silexphp/Pimple/tree/master" + "source": "https://github.com/silexphp/Pimple/tree/v3.4.0" }, - "time": "2020-03-03T09:12:48+00:00" + "time": "2021-03-06T08:28:00+00:00" }, { "name": "psr/container", @@ -681,16 +680,16 @@ }, { "name": "symfony/polyfill-php74", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php74.git", - "reference": "b3a1d2953afb225535abdf966c91dcb3c60786db" + "reference": "577e147350331efeb816897e004d85e6e765daaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php74/zipball/b3a1d2953afb225535abdf966c91dcb3c60786db", - "reference": "b3a1d2953afb225535abdf966c91dcb3c60786db", + "url": "https://api.github.com/repos/symfony/polyfill-php74/zipball/577e147350331efeb816897e004d85e6e765daaf", + "reference": "577e147350331efeb816897e004d85e6e765daaf", "shasum": "" }, "require": { @@ -699,7 +698,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -741,7 +740,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php74/tree/v1.20.0" + "source": "https://github.com/symfony/polyfill-php74/tree/v1.22.1" }, "funding": [ { @@ -757,20 +756,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/yaml", - "version": "v5.1.7", + "version": "v5.2.5", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a" + "reference": "298a08ddda623485208506fcee08817807a251dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a", - "reference": "e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a", + "url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd", + "reference": "298a08ddda623485208506fcee08817807a251dd", "shasum": "" }, "require": { @@ -791,11 +790,6 @@ "Resources/bin/yaml-lint" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.1-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" @@ -818,10 +812,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Yaml Component", + "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.1.7" + "source": "https://github.com/symfony/yaml/tree/v5.2.5" }, "funding": [ { @@ -837,20 +831,20 @@ "type": "tidelift" } ], - "time": "2020-09-27T03:44:28+00:00" + "time": "2021-03-06T07:59:01+00:00" }, { "name": "twig/twig", - "version": "v3.0.5", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9b76b1535483cdf4edf01bb787b0217b62bd68a5" + "reference": "1f3b7e2c06cc05d42936a8ad508ff1db7975cdc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9b76b1535483cdf4edf01bb787b0217b62bd68a5", - "reference": "9b76b1535483cdf4edf01bb787b0217b62bd68a5", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/1f3b7e2c06cc05d42936a8ad508ff1db7975cdc5", + "reference": "1f3b7e2c06cc05d42936a8ad508ff1db7975cdc5", "shasum": "" }, "require": { @@ -865,7 +859,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -901,7 +895,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.0.5" + "source": "https://github.com/twigphp/Twig/tree/v3.3.0" }, "funding": [ { @@ -913,7 +907,7 @@ "type": "tidelift" } ], - "time": "2020-08-05T15:13:19+00:00" + "time": "2021-02-08T09:54:36+00:00" } ], "packages-dev": [ @@ -1152,28 +1146,29 @@ }, { "name": "composer/semver", - "version": "1.7.1", + "version": "3.2.4", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "38276325bd896f90dfcfe30029aa5db40df387a7" + "reference": "a02fdf930a3c1c3ed3a49b5f63859c0c20e10464" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/38276325bd896f90dfcfe30029aa5db40df387a7", - "reference": "38276325bd896f90dfcfe30029aa5db40df387a7", + "url": "https://api.github.com/repos/composer/semver/zipball/a02fdf930a3c1c3ed3a49b5f63859c0c20e10464", + "reference": "a02fdf930a3c1c3ed3a49b5f63859c0c20e10464", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.5 || ^5.0.5" + "phpstan/phpstan": "^0.12.54", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -1212,7 +1207,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/1.7.1" + "source": "https://github.com/composer/semver/tree/3.2.4" }, "funding": [ { @@ -1228,20 +1223,20 @@ "type": "tidelift" } ], - "time": "2020-09-27T13:13:07+00:00" + "time": "2020-11-13T08:59:24+00:00" }, { "name": "composer/xdebug-handler", - "version": "1.4.3", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ebd27a9866ae8254e873866f795491f02418c5a5" + "reference": "f28d44c286812c714741478d968104c5e604a1d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ebd27a9866ae8254e873866f795491f02418c5a5", - "reference": "ebd27a9866ae8254e873866f795491f02418c5a5", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f28d44c286812c714741478d968104c5e604a1d4", + "reference": "f28d44c286812c714741478d968104c5e604a1d4", "shasum": "" }, "require": { @@ -1275,7 +1270,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/1.4.3" + "source": "https://github.com/composer/xdebug-handler/tree/1.4.5" }, "funding": [ { @@ -1291,7 +1286,7 @@ "type": "tidelift" } ], - "time": "2020-08-19T10:27:58+00:00" + "time": "2020-11-13T08:04:11+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -1332,16 +1327,16 @@ }, { "name": "doctrine/annotations", - "version": "1.10.4", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "bfe91e31984e2ba76df1c1339681770401ec262f" + "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/bfe91e31984e2ba76df1c1339681770401ec262f", - "reference": "bfe91e31984e2ba76df1c1339681770401ec262f", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b", + "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b", "shasum": "" }, "require": { @@ -1351,15 +1346,11 @@ }, "require-dev": { "doctrine/cache": "1.*", + "doctrine/coding-standard": "^6.0 || ^8.1", "phpstan/phpstan": "^0.12.20", "phpunit/phpunit": "^7.5 || ^9.1.5" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" @@ -1392,7 +1383,7 @@ } ], "description": "Docblock Annotations Parser", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org/projects/annotations.html", "keywords": [ "annotations", "docblock", @@ -1400,9 +1391,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.10.x" + "source": "https://github.com/doctrine/annotations/tree/1.12.1" }, - "time": "2020-08-10T19:35:50+00:00" + "time": "2021-02-21T21:00:45+00:00" }, { "name": "doctrine/instantiator", @@ -1555,43 +1546,49 @@ }, { "name": "ergebnis/composer-normalize", - "version": "2.8.2", + "version": "2.13.3", "source": { "type": "git", "url": "https://github.com/ergebnis/composer-normalize.git", - "reference": "0a25a226c5503659179c8ea440d1c76599e434fd" + "reference": "eff003890c655ee0e4b6ac5d4c5b40ce61247f7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/0a25a226c5503659179c8ea440d1c76599e434fd", - "reference": "0a25a226c5503659179c8ea440d1c76599e434fd", + "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/eff003890c655ee0e4b6ac5d4c5b40ce61247f7c", + "reference": "eff003890c655ee0e4b6ac5d4c5b40ce61247f7c", "shasum": "" }, "require": { "composer-plugin-api": "^1.1.0 || ^2.0.0", - "ergebnis/json-normalizer": "~0.13.1", + "ergebnis/json-normalizer": "^1.0.3", "ergebnis/json-printer": "^3.1.1", "justinrainbow/json-schema": "^5.2.10", "localheinz/diff": "^1.1.1", "php": "^7.2 || ^8.0" }, "require-dev": { - "composer/composer": "^1.10.13 || ^2.0.0", - "composer/package-versions-deprecated": "^1.11.99", - "ergebnis/phpstan-rules": "~0.15.2", - "ergebnis/test-util": "^1.1.0", - "jangregor/phpstan-prophecy": "~0.8.0", - "phpstan/extension-installer": "^1.0.5", - "phpstan/phpstan": "~0.12.43", - "phpstan/phpstan-deprecation-rules": "~0.12.5", - "phpstan/phpstan-phpunit": "~0.12.16", - "phpstan/phpstan-strict-rules": "~0.12.5", - "phpunit/phpunit": "^8.5.8", - "symfony/filesystem": "^5.1.5" + "composer/composer": "^1.10.19 || ^2.0.8", + "ergebnis/license": "^1.1.0", + "ergebnis/php-cs-fixer-config": "^2.13.0", + "ergebnis/phpstan-rules": "~0.15.3", + "ergebnis/test-util": "^1.4.0", + "phpstan/extension-installer": "^1.1.0", + "phpstan/phpstan": "~0.12.80", + "phpstan/phpstan-deprecation-rules": "~0.12.6", + "phpstan/phpstan-phpunit": "~0.12.18", + "phpstan/phpstan-strict-rules": "~0.12.9", + "phpunit/phpunit": "^8.5.14", + "psalm/plugin-phpunit": "~0.15.0", + "symfony/filesystem": "^5.2.4", + "vimeo/psalm": "^4.6.2" }, "type": "composer-plugin", "extra": { - "class": "Ergebnis\\Composer\\Normalize\\NormalizePlugin" + "class": "Ergebnis\\Composer\\Normalize\\NormalizePlugin", + "composer-normalize": { + "indent-size": 2, + "indent-style": "space" + } }, "autoload": { "psr-4": { @@ -1626,43 +1623,43 @@ "type": "github" } ], - "time": "2020-09-22T09:55:49+00:00" + "time": "2021-03-06T14:00:23+00:00" }, { "name": "ergebnis/json-normalizer", - "version": "0.13.1", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/ergebnis/json-normalizer.git", - "reference": "82897f7a0b6a896462a08ac02bee33ccf4ece0bb" + "reference": "4a7f064ce34d5a2e382564565cdd433dbc5b9494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/82897f7a0b6a896462a08ac02bee33ccf4ece0bb", - "reference": "82897f7a0b6a896462a08ac02bee33ccf4ece0bb", + "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/4a7f064ce34d5a2e382564565cdd433dbc5b9494", + "reference": "4a7f064ce34d5a2e382564565cdd433dbc5b9494", "shasum": "" }, "require": { - "ergebnis/json-printer": "^3.1.0", + "ergebnis/json-printer": "^3.1.1", "ext-json": "*", "justinrainbow/json-schema": "^5.2.10", "php": "^7.2 || ^8.0" }, "require-dev": { - "ergebnis/license": "^1.0.0", - "ergebnis/php-cs-fixer-config": "^2.2.1", - "ergebnis/phpstan-rules": "~0.15.2", - "ergebnis/test-util": "^1.1.0", + "ergebnis/license": "^1.1.0", + "ergebnis/php-cs-fixer-config": "^2.10.0", + "ergebnis/phpstan-rules": "~0.15.3", + "ergebnis/test-util": "^1.4.0", "infection/infection": "~0.15.3", - "jangregor/phpstan-prophecy": "~0.8.0", - "phpstan/extension-installer": "^1.0.4", - "phpstan/phpstan": "~0.12.40", - "phpstan/phpstan-deprecation-rules": "~0.12.5", - "phpstan/phpstan-phpunit": "~0.12.16", - "phpstan/phpstan-strict-rules": "~0.12.4", - "phpunit/phpunit": "^8.5.8", - "psalm/plugin-phpunit": "~0.11.0", - "vimeo/psalm": "^3.14.2" + "jangregor/phpstan-prophecy": "~0.8.1", + "phpstan/extension-installer": "^1.1.0", + "phpstan/phpstan": "~0.12.80", + "phpstan/phpstan-deprecation-rules": "~0.12.6", + "phpstan/phpstan-phpunit": "~0.12.17", + "phpstan/phpstan-strict-rules": "~0.12.9", + "phpunit/phpunit": "^8.5.14", + "psalm/plugin-phpunit": "~0.12.2", + "vimeo/psalm": "^3.18" }, "type": "library", "autoload": { @@ -1696,7 +1693,7 @@ "type": "github" } ], - "time": "2020-08-30T12:00:06+00:00" + "time": "2021-03-06T13:33:57+00:00" }, { "name": "ergebnis/json-printer", @@ -1769,41 +1766,47 @@ }, { "name": "ergebnis/php-cs-fixer-config", - "version": "2.3.0", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/ergebnis/php-cs-fixer-config.git", - "reference": "0bcde3f7cd0c4f01f6135f80ddd9cadcbf341879" + "reference": "b1ea74fb5b013293ef06566a0b5dc1a81b49bb21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/php-cs-fixer-config/zipball/0bcde3f7cd0c4f01f6135f80ddd9cadcbf341879", - "reference": "0bcde3f7cd0c4f01f6135f80ddd9cadcbf341879", + "url": "https://api.github.com/repos/ergebnis/php-cs-fixer-config/zipball/b1ea74fb5b013293ef06566a0b5dc1a81b49bb21", + "reference": "b1ea74fb5b013293ef06566a0b5dc1a81b49bb21", "shasum": "" }, "require": { "ext-filter": "*", - "friendsofphp/php-cs-fixer": "~2.16.4", - "php": "^7.2" + "friendsofphp/php-cs-fixer": "~2.18.2", + "php": "^7.2 || ^8.0" }, "require-dev": { - "ergebnis/composer-normalize": "^2.8.2", + "ergebnis/composer-normalize": "^2.13.2", "ergebnis/license": "^1.1.0", - "ergebnis/phpstan-rules": "~0.15.2", - "ergebnis/test-util": "^1.3.0", + "ergebnis/phpstan-rules": "~0.15.3", + "ergebnis/test-util": "^1.4.0", "infection/infection": "~0.15.3", - "jangregor/phpstan-prophecy": "~0.8.0", - "phpstan/extension-installer": "^1.0.5", - "phpstan/phpstan": "~0.12.48", - "phpstan/phpstan-deprecation-rules": "~0.12.5", - "phpstan/phpstan-phpunit": "~0.12.16", - "phpstan/phpstan-strict-rules": "~0.12.5", - "phpunit/phpunit": "^8.5.8", - "psalm/plugin-phpunit": "~0.12.2", + "jangregor/phpstan-prophecy": "~0.8.1", + "phpstan/extension-installer": "^1.1.0", + "phpstan/phpstan": "~0.12.70", + "phpstan/phpstan-deprecation-rules": "~0.12.6", + "phpstan/phpstan-phpunit": "~0.12.17", + "phpstan/phpstan-strict-rules": "~0.12.9", + "phpunit/phpunit": "^8.5.14", + "psalm/plugin-phpunit": "~0.15.1", "symfony/filesystem": "^4.4.0", - "vimeo/psalm": "^3.16" + "vimeo/psalm": "^4.4.1" }, "type": "library", + "extra": { + "composer-normalize": { + "indent-size": 2, + "indent-style": "space" + } + }, "autoload": { "psr-4": { "Ergebnis\\PhpCsFixer\\Config\\": "src" @@ -1831,7 +1834,7 @@ "type": "github" } ], - "time": "2020-10-08T18:03:06+00:00" + "time": "2021-01-30T10:07:31+00:00" }, { "name": "facade/ignition-contracts", @@ -2060,27 +2063,27 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.16.4", + "version": "v2.18.3", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13" + "reference": "ab99202fccff2a9f97592fbe1b5c76dd06df3513" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1023c3458137ab052f6ff1e09621a721bfdeca13", - "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ab99202fccff2a9f97592fbe1b5c76dd06df3513", + "reference": "ab99202fccff2a9f97592fbe1b5c76dd06df3513", "shasum": "" }, "require": { - "composer/semver": "^1.4", + "composer/semver": "^1.4 || ^2.0 || ^3.0", "composer/xdebug-handler": "^1.2", "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", - "php": "^5.6 || ^7.0", + "php": "^5.6 || ^7.0 || ^8.0", "php-cs-fixer/diff": "^1.3", - "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0", + "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", "symfony/filesystem": "^3.0 || ^4.0 || ^5.0", "symfony/finder": "^3.0 || ^4.0 || ^5.0", @@ -2091,17 +2094,19 @@ "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" }, "require-dev": { - "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.2", + "keradus/cli-executor": "^1.4", "mikey179/vfsstream": "^1.6", - "php-coveralls/php-coveralls": "^2.1", + "php-coveralls/php-coveralls": "^2.4.2", "php-cs-fixer/accessible-object": "^1.0", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1", - "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1", - "phpunitgoodpractices/traits": "^1.8", - "symfony/phpunit-bridge": "^5.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", + "phpspec/prophecy-phpunit": "^1.1 || ^2.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5", + "phpunitgoodpractices/polyfill": "^1.5", + "phpunitgoodpractices/traits": "^1.9.1", + "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1", + "symfony/phpunit-bridge": "^5.2.1", "symfony/yaml": "^3.0 || ^4.0 || ^5.0" }, "suggest": { @@ -2129,6 +2134,7 @@ "tests/Test/IntegrationCaseFactoryInterface.php", "tests/Test/InternalIntegrationCaseFactory.php", "tests/Test/IsIdenticalConstraint.php", + "tests/Test/TokensWithObservedTransformers.php", "tests/TestCase.php" ] }, @@ -2149,7 +2155,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.16.4" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.3" }, "funding": [ { @@ -2157,7 +2163,7 @@ "type": "github" } ], - "time": "2020-06-27T23:57:46+00:00" + "time": "2021-03-10T19:39:05+00:00" }, { "name": "justinrainbow/json-schema", @@ -2669,68 +2675,18 @@ }, "time": "2019-03-29T20:06:56+00:00" }, - { - "name": "paragonie/random_compat", - "version": "v9.99.100", - "source": { - "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", - "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", - "shasum": "" - }, - "require": { - "php": ">= 7" - }, - "require-dev": { - "phpunit/phpunit": "4.*|5.*", - "vimeo/psalm": "^1" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" - } - ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", - "keywords": [ - "csprng", - "polyfill", - "pseudorandom", - "random" - ], - "support": { - "email": "info@paragonie.com", - "issues": "https://github.com/paragonie/random_compat/issues", - "source": "https://github.com/paragonie/random_compat" - }, - "time": "2020-10-15T08:29:30+00:00" - }, { "name": "pdepend/pdepend", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "c64472f8e76ca858c79ad9a4cf1e2734b3f8cc38" + "reference": "b6452ce4b570f540be3a4f46276dd8d8f4fa5ead" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/c64472f8e76ca858c79ad9a4cf1e2734b3f8cc38", - "reference": "c64472f8e76ca858c79ad9a4cf1e2734b3f8cc38", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/b6452ce4b570f540be3a4f46276dd8d8f4fa5ead", + "reference": "b6452ce4b570f540be3a4f46276dd8d8f4fa5ead", "shasum": "" }, "require": { @@ -2740,9 +2696,9 @@ "symfony/filesystem": "^2.3.0|^3|^4|^5" }, "require-dev": { - "easy-doc/easy-doc": "0.0.0 || ^1.2.3", + "easy-doc/easy-doc": "0.0.0|^1.2.3", "gregwar/rst": "^1.0", - "phpunit/phpunit": "^4.8.35|^5.7", + "phpunit/phpunit": "^4.8.36|^5.7.27", "squizlabs/php_codesniffer": "^2.0.0" }, "bin": [ @@ -2766,7 +2722,7 @@ "description": "Official version of pdepend to be handled with Composer", "support": { "issues": "https://github.com/pdepend/pdepend/issues", - "source": "https://github.com/pdepend/pdepend/tree/master" + "source": "https://github.com/pdepend/pdepend/tree/2.9.0" }, "funding": [ { @@ -2774,7 +2730,7 @@ "type": "tidelift" } ], - "time": "2020-06-20T10:53:13+00:00" + "time": "2021-03-11T09:20:40+00:00" }, { "name": "pestphp/pest", @@ -3713,16 +3669,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.64", + "version": "0.12.81", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa" + "reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa", - "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0dd5b0ebeff568f7000022ea5f04aa86ad3124b8", + "reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8", "shasum": "" }, "require": { @@ -3753,7 +3709,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.12.64" + "source": "https://github.com/phpstan/phpstan/tree/0.12.81" }, "funding": [ { @@ -3769,7 +3725,7 @@ "type": "tidelift" } ], - "time": "2020-12-21T11:59:02+00:00" + "time": "2021-03-08T22:03:02+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5366,21 +5322,22 @@ }, { "name": "staabm/annotate-pull-request-from-checkstyle", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/staabm/annotate-pull-request-from-checkstyle.git", - "reference": "88a16cf5fae6d31ae38a4518ec1bf10e71137e04" + "reference": "ef8c1e14a1274e53c720bf393bba0ed9434443d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staabm/annotate-pull-request-from-checkstyle/zipball/88a16cf5fae6d31ae38a4518ec1bf10e71137e04", - "reference": "88a16cf5fae6d31ae38a4518ec1bf10e71137e04", + "url": "https://api.github.com/repos/staabm/annotate-pull-request-from-checkstyle/zipball/ef8c1e14a1274e53c720bf393bba0ed9434443d4", + "reference": "ef8c1e14a1274e53c720bf393bba0ed9434443d4", "shasum": "" }, "require": { + "ext-libxml": "*", "ext-simplexml": "*", - "php": "^7.0 || ^8.0" + "php": "^5.3 || ^7.0 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.16.1" @@ -5400,7 +5357,7 @@ ], "support": { "issues": "https://github.com/staabm/annotate-pull-request-from-checkstyle/issues", - "source": "https://github.com/staabm/annotate-pull-request-from-checkstyle/tree/1.4.0" + "source": "https://github.com/staabm/annotate-pull-request-from-checkstyle/tree/1.5.0" }, "funding": [ { @@ -5408,20 +5365,20 @@ "type": "github" } ], - "time": "2020-09-26T11:36:44+00:00" + "time": "2021-03-13T09:58:02+00:00" }, { "name": "symfony/config", - "version": "v5.2.1", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "d0a82d965296083fe463d655a3644cbe49cbaa80" + "reference": "212d54675bf203ff8aef7d8cee8eecfb72f4a263" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/d0a82d965296083fe463d655a3644cbe49cbaa80", - "reference": "d0a82d965296083fe463d655a3644cbe49cbaa80", + "url": "https://api.github.com/repos/symfony/config/zipball/212d54675bf203ff8aef7d8cee8eecfb72f4a263", + "reference": "212d54675bf203ff8aef7d8cee8eecfb72f4a263", "shasum": "" }, "require": { @@ -5467,10 +5424,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Config Component", + "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.2.1" + "source": "https://github.com/symfony/config/tree/v5.2.4" }, "funding": [ { @@ -5486,7 +5443,7 @@ "type": "tidelift" } ], - "time": "2020-12-09T18:54:12+00:00" + "time": "2021-02-23T23:58:19+00:00" }, { "name": "symfony/console", @@ -5587,16 +5544,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v5.2.1", + "version": "v5.2.5", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "7f8a9e9eff0581a33e20f6c5d41096fe22832d25" + "reference": "be0c7926f5729b15e4e79fd2bf917cac584b1970" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/7f8a9e9eff0581a33e20f6c5d41096fe22832d25", - "reference": "7f8a9e9eff0581a33e20f6c5d41096fe22832d25", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/be0c7926f5729b15e4e79fd2bf917cac584b1970", + "reference": "be0c7926f5729b15e4e79fd2bf917cac584b1970", "shasum": "" }, "require": { @@ -5614,7 +5571,7 @@ }, "provide": { "psr/container-implementation": "1.0", - "symfony/service-implementation": "1.0" + "symfony/service-implementation": "1.0|2.0" }, "require-dev": { "symfony/config": "^5.1", @@ -5651,10 +5608,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony DependencyInjection Component", + "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.2.1" + "source": "https://github.com/symfony/dependency-injection/tree/v5.2.5" }, "funding": [ { @@ -5670,20 +5627,20 @@ "type": "tidelift" } ], - "time": "2020-12-18T08:03:05+00:00" + "time": "2021-03-05T20:13:41+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.1.7", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d5de97d6af175a9e8131c546db054ca32842dd0f" + "reference": "d08d6ec121a425897951900ab692b612a61d6240" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d5de97d6af175a9e8131c546db054ca32842dd0f", - "reference": "d5de97d6af175a9e8131c546db054ca32842dd0f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d08d6ec121a425897951900ab692b612a61d6240", + "reference": "d08d6ec121a425897951900ab692b612a61d6240", "shasum": "" }, "require": { @@ -5714,11 +5671,6 @@ "symfony/http-kernel": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.1-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" @@ -5741,10 +5693,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.1.7" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.4" }, "funding": [ { @@ -5760,7 +5712,7 @@ "type": "tidelift" } ], - "time": "2020-09-18T14:27:32+00:00" + "time": "2021-02-18T17:12:37+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -5843,16 +5795,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.1.7", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "1a8697545a8d87b9f2f6b1d32414199cc5e20aae" + "reference": "710d364200997a5afde34d9fe57bd52f3cc1e108" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/1a8697545a8d87b9f2f6b1d32414199cc5e20aae", - "reference": "1a8697545a8d87b9f2f6b1d32414199cc5e20aae", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/710d364200997a5afde34d9fe57bd52f3cc1e108", + "reference": "710d364200997a5afde34d9fe57bd52f3cc1e108", "shasum": "" }, "require": { @@ -5860,11 +5812,6 @@ "symfony/polyfill-ctype": "~1.8" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.1-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Filesystem\\": "" @@ -5887,10 +5834,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Filesystem Component", + "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.1.7" + "source": "https://github.com/symfony/filesystem/tree/v5.2.4" }, "funding": [ { @@ -5906,31 +5853,26 @@ "type": "tidelift" } ], - "time": "2020-09-27T14:02:37+00:00" + "time": "2021-02-12T10:38:38+00:00" }, { "name": "symfony/finder", - "version": "v5.1.7", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8" + "reference": "0d639a0943822626290d169965804f79400e6a04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8", - "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8", + "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04", + "reference": "0d639a0943822626290d169965804f79400e6a04", "shasum": "" }, "require": { "php": ">=7.2.5" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.1-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Finder\\": "" @@ -5953,10 +5895,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Finder Component", + "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.1.7" + "source": "https://github.com/symfony/finder/tree/v5.2.4" }, "funding": [ { @@ -5972,33 +5914,29 @@ "type": "tidelift" } ], - "time": "2020-09-02T16:23:27+00:00" + "time": "2021-02-15T18:55:04+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.1.7", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "4c7e155bf7d93ea4ba3824d5a14476694a5278dd" + "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4c7e155bf7d93ea4ba3824d5a14476694a5278dd", - "reference": "4c7e155bf7d93ea4ba3824d5a14476694a5278dd", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce", + "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-php73": "~1.0", "symfony/polyfill-php80": "^1.15" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.1-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\OptionsResolver\\": "" @@ -6021,7 +5959,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony OptionsResolver Component", + "description": "Provides an improved replacement for the array_replace PHP function", "homepage": "https://symfony.com", "keywords": [ "config", @@ -6029,7 +5967,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.1.7" + "source": "https://github.com/symfony/options-resolver/tree/v5.2.4" }, "funding": [ { @@ -6045,7 +5983,7 @@ "type": "tidelift" } ], - "time": "2020-09-27T03:44:28+00:00" + "time": "2021-01-27T12:56:27+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -6214,43 +6152,31 @@ }, { "name": "symfony/polyfill-php70", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3" + "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", - "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644", + "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644", "shasum": "" }, "require": { - "paragonie/random_compat": "~1.0|~2.0|~9.99", - "php": ">=5.3.3" + "php": ">=7.1" }, - "type": "library", + "type": "metapackage", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -6274,7 +6200,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php70/tree/master" + "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0" }, "funding": [ { @@ -6290,29 +6216,29 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.18.1", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "639447d008615574653fb3bc60d1986d7172eaae" + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae", - "reference": "639447d008615574653fb3bc60d1986d7172eaae", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6350,7 +6276,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/master" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1" }, "funding": [ { @@ -6366,7 +6292,7 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php73", @@ -6532,16 +6458,16 @@ }, { "name": "symfony/process", - "version": "v5.1.7", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d3a2e64866169586502f0cd9cab69135ad12cee9" + "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d3a2e64866169586502f0cd9cab69135ad12cee9", - "reference": "d3a2e64866169586502f0cd9cab69135ad12cee9", + "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f", + "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f", "shasum": "" }, "require": { @@ -6549,11 +6475,6 @@ "symfony/polyfill-php80": "^1.15" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.1-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Process\\": "" @@ -6576,10 +6497,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Process Component", + "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/5.1" + "source": "https://github.com/symfony/process/tree/v5.2.4" }, "funding": [ { @@ -6595,7 +6516,7 @@ "type": "tidelift" } ], - "time": "2020-09-02T16:23:27+00:00" + "time": "2021-01-27T10:15:41+00:00" }, { "name": "symfony/service-contracts", @@ -6678,16 +6599,16 @@ }, { "name": "symfony/stopwatch", - "version": "v5.1.7", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323" + "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0f7c58cf81dbb5dd67d423a89d577524a2ec0323", - "reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b12274acfab9d9850c52583d136a24398cdf1a0c", + "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c", "shasum": "" }, "require": { @@ -6695,11 +6616,6 @@ "symfony/service-contracts": "^1.0|^2" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.1-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Stopwatch\\": "" @@ -6722,10 +6638,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Stopwatch Component", + "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.1.4" + "source": "https://github.com/symfony/stopwatch/tree/v5.2.4" }, "funding": [ { @@ -6741,7 +6657,7 @@ "type": "tidelift" } ], - "time": "2020-05-20T17:43:50+00:00" + "time": "2021-01-27T10:15:41+00:00" }, { "name": "symfony/string", @@ -6982,30 +6898,35 @@ }, { "name": "webmozart/assert", - "version": "1.9.1", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0 || ^8.0", + "php": "^7.2 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<3.9.1" + "vimeo/psalm": "<4.6.1 || 4.6.2" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" + "phpunit/phpunit": "^8.5.13" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, "autoload": { "psr-4": { "Webmozart\\Assert\\": "src/" @@ -7029,9 +6950,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.9.1" + "source": "https://github.com/webmozarts/assert/tree/1.10.0" }, - "time": "2020-07-08T17:02:28+00:00" + "time": "2021-03-09T10:59:23+00:00" }, { "name": "webmozart/path-util", diff --git a/src/controllers/TreeController.php b/src/controllers/TreeController.php index e4b3cdf7..01bfb635 100644 --- a/src/controllers/TreeController.php +++ b/src/controllers/TreeController.php @@ -6,8 +6,7 @@ namespace PHPPgAdmin\Controller; -use PHPPgAdmin\Interfaces\Recordset; -use ADORecordSet; + use ADORecordSet; use PHPPgAdmin\ArrayRecordSet; use PHPPgAdmin\ContainerUtils; use PHPPgAdmin\Decorators\Decorator; diff --git a/src/database/ADOdbBase.php b/src/database/ADOdbBase.php index 059a9e9d..3922f70c 100644 --- a/src/database/ADOdbBase.php +++ b/src/database/ADOdbBase.php @@ -83,9 +83,9 @@ class ADOdbBase * @param string $table The table to get attributes for * @param array $atts An array of attribute numbers * - * @return array|int An array mapping attnum to attname or error code - * - -1 $atts must be an array - * - -2 wrong number of attributes found + * @return array|int An array mapping attnum to attname or error code - -1 $atts must be an array - -2 wrong number of attributes found + * + * @psalm-return -2|-1|array */ public function getAttributeNames($table, $atts) { @@ -138,7 +138,7 @@ class ADOdbBase * @param string $comment the comment to add * @param null|string $basetype * - * @return ADORecordSet|int recordset of results or error code + * @return int|string recordset of results or error code */ public function setComment($obj_type, $obj_name, $table, $comment, $basetype = null) { @@ -296,7 +296,7 @@ class ADOdbBase * * @param string $sql The SQL query to execute * - * @return int|string A recordset or an error code + * @return \the|int|string A recordset or an error code */ public function execute($sql) { @@ -386,7 +386,9 @@ class ADOdbBase * @param array $conditions (array) A map of field names to conditions * @param string $schema (optional) The table's schema * - * @return int 0 success + * @return \the|int 0 success + * + * @psalm-return -2|-1|\the */ public function delete($table, $conditions, $schema = '') { @@ -491,7 +493,9 @@ class ADOdbBase * @param string $table The table to insert into * @param array $vars (array) A mapping of the field names to the values to be inserted * - * @return int 0 success + * @return \the|int 0 success + * + * @psalm-return -2|-1|\the */ public function insert($table, $vars) { @@ -557,7 +561,9 @@ class ADOdbBase * @param array $where (array) A mapping of field names to values for the where clause * @param array $nulls (array, optional) An array of fields to be set null * - * @return int 0 success + * @return \the|int 0 success + * + * @psalm-return -3|-2|-1|\the */ public function update($table, $vars, $where, $nulls = []) { @@ -653,6 +659,8 @@ class ADOdbBase * Begin a transaction. * * @return int 0 success + * + * @psalm-return 0|1 */ public function beginTransaction() { @@ -663,6 +671,8 @@ class ADOdbBase * End a transaction. * * @return int 0 success + * + * @psalm-return 0|1 */ public function endTransaction() { @@ -673,6 +683,8 @@ class ADOdbBase * Roll back a transaction. * * @return int 0 success + * + * @psalm-return 0|1 */ public function rollbackTransaction() { @@ -702,7 +714,7 @@ class ADOdbBase * * @param mixed $parameter the parameter * - * @return string boolean database representation + * @return string boolean database representation */ public function dbBool(&$parameter) { @@ -728,9 +740,11 @@ class ADOdbBase * * @param string $dbarr * - * @return array A PHP array + * @return (false|string)[] A PHP array * * @internal param String $arr representing the DB array + * + * @psalm-return non-empty-list */ public function phpArray($dbarr) { diff --git a/src/database/Postgres.php b/src/database/Postgres.php index 4b718de5..584255e9 100644 --- a/src/database/Postgres.php +++ b/src/database/Postgres.php @@ -93,7 +93,9 @@ class Postgres extends ADOdbBase * * @param string $help * - * @return null|array|string the help page or pages related to the $help topic, or null if none exists + * @return null|string|string[] the help page or pages related to the $help topic, or null if none exists + * + * @psalm-return non-empty-list|null|string */ public function getHelp($help) { @@ -250,7 +252,7 @@ class Postgres extends ADOdbBase * @param string $term The search term * @param string $filter The object type to restrict to ('' means no restriction) * - * @return ADORecordSet|int A recordset + * @return \RecordSet|int|string A recordset */ public function findObject($term, $filter) { @@ -449,7 +451,7 @@ class Postgres extends ADOdbBase * * @param bool $all True to get all languages, regardless of show_system * - * @return ADORecordSet|int A recordset + * @return \RecordSet|int|string A recordset */ public function getLanguages($all = false) { @@ -764,12 +766,7 @@ class Postgres extends ADOdbBase * @param null|int $page_size The number of rows per page * @param int $max_pages (return-by-ref) The max number of pages in the relation * - * @return ADORecordSet|int A recordset on success or an int with error code - * - -1 transaction error - * - -2 counting error - * - -3 page or page_size invalid - * - -4 unknown type - * - -5 failed setting transaction read only + * @return \RecordSet|int|string A recordset on success or an int with error code - -1 transaction error - -2 counting error - -3 page or page_size invalid - -4 unknown type - -5 failed setting transaction read only */ public function browseQuery($type, $table, $query, $sortkey, $sortdir, $page, $page_size, &$max_pages) { diff --git a/src/database/Postgres10.php b/src/database/Postgres10.php index 47a3ff50..b283f1a9 100644 --- a/src/database/Postgres10.php +++ b/src/database/Postgres10.php @@ -35,7 +35,7 @@ class Postgres10 extends Postgres96 /** * Return all tables in current database (and schema). * - * @return ADORecordSet|int All tables, sorted alphabetically + * @return \RecordSet|int|string All tables, sorted alphabetically */ public function getTables() { diff --git a/src/database/Postgres11.php b/src/database/Postgres11.php index 9dc9192b..ff790b80 100644 --- a/src/database/Postgres11.php +++ b/src/database/Postgres11.php @@ -37,7 +37,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 ADORecordSet|int All functions + * @return \RecordSet|int|string All functions */ public function getFunctions($all = false, $type = null) { diff --git a/src/database/Postgres12.php b/src/database/Postgres12.php index 75f97e8d..21f311da 100644 --- a/src/database/Postgres12.php +++ b/src/database/Postgres12.php @@ -31,11 +31,12 @@ class Postgres12 extends Postgres11 * Checks to see whether or not a table has a unique id column. * * @deprecated this field has been removed of pg_class as of PG 12 + * * @see https://www.postgresql.org/docs/12/catalog-pg-class.html * * @param string $table The table name * - * @return bool + * @return false */ public function hasObjectID($table) { diff --git a/src/database/Postgres91.php b/src/database/Postgres91.php index 119246da..e61e86e8 100644 --- a/src/database/Postgres91.php +++ b/src/database/Postgres91.php @@ -35,7 +35,7 @@ class Postgres91 extends Postgres92 * * @param null|string $database (optional) Find only connections to specified database * - * @return ADORecordSet|int A recordset + * @return \RecordSet|int|string A recordset */ public function getProcesses($database = null) { @@ -64,7 +64,7 @@ class Postgres91 extends Postgres92 * * @param bool $all Include all tablespaces (necessary when moving objects back to the default space) * - * @return ADORecordSet|int A recordset + * @return \RecordSet|int|string A recordset */ public function getTablespaces($all = false) { @@ -88,7 +88,7 @@ class Postgres91 extends Postgres92 * * @param string $spcname * - * @return ADORecordSet|int A recordset + * @return \RecordSet|int|string A recordset */ public function getTablespace($spcname) { @@ -105,6 +105,9 @@ class Postgres91 extends Postgres92 } // Capabilities + /** + * @return false + */ public function hasUserSignals() { return false; diff --git a/src/database/Postgres92.php b/src/database/Postgres92.php index ee3ccade..61b658e3 100644 --- a/src/database/Postgres92.php +++ b/src/database/Postgres92.php @@ -32,7 +32,7 @@ class Postgres92 extends Postgres93 * * @param null|string $database (optional) Find only connections to specified database * - * @return ADORecordSet|int A recordset + * @return \RecordSet|int|string A recordset */ public function getProcesses($database = null) { @@ -61,7 +61,7 @@ class Postgres92 extends Postgres93 * * @param bool $all Include all tablespaces (necessary when moving objects back to the default space) * - * @return ADORecordSet|int A recordset + * @return \RecordSet|int|string A recordset */ public function getTablespaces($all = false) { @@ -87,7 +87,7 @@ class Postgres92 extends Postgres93 * * @param string $spcname * - * @return ADORecordSet|int A recordset + * @return \RecordSet|int|string A recordset */ public function getTablespace($spcname) { diff --git a/src/database/Postgres93.php b/src/database/Postgres93.php index 215a477d..425d6100 100644 --- a/src/database/Postgres93.php +++ b/src/database/Postgres93.php @@ -31,7 +31,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 ADORecordSet|int All functions + * @return \RecordSet|int|string All functions */ public function getFunctions($all = false, $type = null) { diff --git a/src/database/Postgres96.php b/src/database/Postgres96.php index f3939c74..557f12f8 100644 --- a/src/database/Postgres96.php +++ b/src/database/Postgres96.php @@ -34,7 +34,7 @@ class Postgres96 extends Postgres * * @param null|string $database (optional) Find only connections to specified database * - * @return ADORecordSet|int A recordset + * @return \RecordSet|int|string A recordset */ public function getProcesses($database = null) { @@ -64,6 +64,9 @@ class Postgres96 extends Postgres return $this->selectSet($sql); } + /** + * @return true + */ public function hasUserSignals() { return true; @@ -81,7 +84,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 ADORecordSet|int 0 if operation was successful + * @return int|string 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 91363f98..7f0a5195 100644 --- a/src/database/databasetraits/AggregateTrait.php +++ b/src/database/databasetraits/AggregateTrait.php @@ -25,7 +25,7 @@ trait AggregateTrait * @param string $sortop The sort operator for the aggregate * @param string $comment Aggregate comment * - * @return bool|int 0 success + * @return int 0 success */ public function createAggregate($name, $basetype, $sfunc, $stype, $ffunc, $initcond, $sortop, $comment) { @@ -101,7 +101,7 @@ trait AggregateTrait * @param string $aggrtype The input data type of the aggregate * @param bool $cascade True to cascade drop, false to restrict * - * @return ADORecordSet|int + * @return int|string */ public function dropAggregate($aggrname, $aggrtype, $cascade) { @@ -130,7 +130,7 @@ trait AggregateTrait * @param string $name The name of the aggregate * @param string $basetype The input data type of the aggregate * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getAggregate($name, $basetype) { @@ -163,7 +163,7 @@ trait AggregateTrait /** * Gets all aggregates. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getAggregates() { @@ -195,7 +195,7 @@ trait AggregateTrait * @param string $newaggrschema The new schema where the aggregate will belong to * @param string $newaggrcomment The new comment for the aggregate * - * @return bool|int 0 success + * @return int 0 success */ public function alterAggregate( $aggrname, @@ -273,7 +273,7 @@ trait AggregateTrait * @param string $aggrtype The input data type of the aggregate * @param string $newaggrowner The new owner of the aggregate * - * @return ADORecordSet|int + * @return int|string */ public function changeAggregateOwner($aggrname, $aggrtype, $newaggrowner) { @@ -299,7 +299,7 @@ trait AggregateTrait * @param string $aggrtype The input data type of the aggregate * @param string $newaggrschema The new schema for the aggregate * - * @return ADORecordSet|int + * @return int|string */ public function changeAggregateSchema($aggrname, $aggrtype, $newaggrschema) { @@ -326,7 +326,7 @@ trait AggregateTrait * @param string $aggrtype The actual input data type of the aggregate * @param string $newaggrname The new name of the aggregate * - * @return ADORecordSet|int + * @return int|string */ public function renameAggregate($aggrschema, $aggrname, $aggrtype, $newaggrname) { diff --git a/src/database/databasetraits/ColumnTrait.php b/src/database/databasetraits/ColumnTrait.php index 4b5778cf..e96cfd8e 100644 --- a/src/database/databasetraits/ColumnTrait.php +++ b/src/database/databasetraits/ColumnTrait.php @@ -25,7 +25,9 @@ trait ColumnTrait * @param mixed $default The default for the column. '' for none. * @param string $comment comment for the column * - * @return array first element is 0 on success, second element is sql sentence + * @return (int|string)[] first element is 0 on success, second element is sql sentence + * + * @psalm-return array{0: int, 1: string} */ public function addColumn($table, $column, $type, $array, $length, $notnull, $default, $comment) { @@ -148,7 +150,9 @@ trait ColumnTrait * @param string $oldtype The old type for the column * @param string $comment Comment for the column * - * @return array 0 success + * @return (int|string)[] 0 success + * + * @psalm-return array{0: int, 1: string} */ public function alterColumn( $table, @@ -305,7 +309,9 @@ trait ColumnTrait * @param string $column The column to be renamed * @param string $newName The new name for the column * - * @return array [0 if operation was successful, sql of sentence] + * @return (int|string)[] [0 if operation was successful, sql of sentence] + * + * @psalm-return array{0: int|string, 1: string} */ public function renameColumn($table, $column, $newName) { @@ -335,7 +341,7 @@ trait ColumnTrait * @param string $column The column name to set * @param mixed $default The new default value * - * @return ADORecordSet|int + * @return int|string */ public function setColumnDefault($table, $column, $default) { @@ -362,7 +368,7 @@ trait ColumnTrait * @param string $column The column to alter * @param bool $state True to set null, false to set not null * - * @return ADORecordSet|int + * @return int|string */ public function setColumnNull($table, $column, $state) { @@ -388,7 +394,9 @@ trait ColumnTrait * @param string $column The column to be dropped * @param bool $cascade True to cascade drop, false to restrict * - * @return array [int status, string sql sentence] + * @return (int|string)[] [int status, string sql sentence] + * + * @psalm-return array{0: int|string, 1: string} */ public function dropColumn($table, $column, $cascade) { @@ -419,7 +427,7 @@ trait ColumnTrait * @param string $table The table from which to drop * @param string $column The column name to drop default * - * @return ADORecordSet|int + * @return int|string */ public function dropColumnDefault($table, $column) { diff --git a/src/database/databasetraits/DatabaseTrait.php b/src/database/databasetraits/DatabaseTrait.php index 4f5d379a..c2d2e85d 100644 --- a/src/database/databasetraits/DatabaseTrait.php +++ b/src/database/databasetraits/DatabaseTrait.php @@ -63,7 +63,7 @@ trait DatabaseTrait * * @param string $table (optional) The table to analyze * - * @return ADORecordSet|int + * @return int|string */ public function analyzeDB($table = '') { @@ -89,7 +89,7 @@ trait DatabaseTrait * * @param string $database The name of the database to retrieve * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getDatabase($database) { @@ -107,7 +107,7 @@ trait DatabaseTrait * * @param null|string $currentdatabase database name that should be on top of the resultset * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getDatabases($currentdatabase = null) { @@ -189,7 +189,7 @@ trait DatabaseTrait * * @param string $database the name of the database to get the comment for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getDatabaseComment($database) { @@ -211,7 +211,7 @@ trait DatabaseTrait * * @param string $database the name of the database to get the owner for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getDatabaseOwner($database) { @@ -250,6 +250,8 @@ trait DatabaseTrait * @param string $lc_ctype * * @return int 0 success + * + * @psalm-return -2|-1|0 */ public function createDatabase( $database, @@ -323,7 +325,7 @@ trait DatabaseTrait * * @param string $database The name of the database to drop * - * @return ADORecordSet|int + * @return int|string */ public function dropDatabase($database) { @@ -345,7 +347,7 @@ trait DatabaseTrait * @param string $newOwner The new owner for the database * @param string $comment * - * @return bool|int 0 success + * @return int 0 success */ public function alterDatabase($dbName, $newName, $newOwner = '', $comment = '') { @@ -397,7 +399,7 @@ trait DatabaseTrait * @param string $oldName name of database to rename * @param string $newName new name of database * - * @return ADORecordSet|int + * @return int|string */ public function alterDatabaseRename($oldName, $newName) { @@ -424,7 +426,7 @@ trait DatabaseTrait * @param string $dbName database to change ownership of * @param string $newOwner user that will own the database * - * @return ADORecordSet|int + * @return int|string */ public function alterDatabaseOwner($dbName, $newOwner) { @@ -445,7 +447,7 @@ trait DatabaseTrait * * @param null|string $database (optional) Find only prepared transactions executed in a specific database * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getPreparedXacts($database = null) { @@ -468,7 +470,7 @@ trait DatabaseTrait * * @param null|string $database (optional) Find only connections to specified database * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getProcesses($database = null) { @@ -497,7 +499,7 @@ trait DatabaseTrait /** * Returns table locks information in the current database. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getLocks() { @@ -532,6 +534,8 @@ trait DatabaseTrait * @param string $signal 'CANCEL' or 'KILL' * * @return int 0 success + * + * @psalm-return -1|0 */ public function sendSignal($pid, $signal) { @@ -574,7 +578,9 @@ trait DatabaseTrait * @param bool $full If true, selects "full" vacuum * @param bool $freeze If true, selects aggressive "freezing" of tuples * - * @return array result status and sql sentence + * @return (int|string)[] result status and sql sentence + * + * @psalm-return array{0: int|string, 1: string} */ public function vacuumDB($table = '', $analyze = false, $full = false, $freeze = false) { @@ -644,7 +650,7 @@ trait DatabaseTrait /** * Returns all available variable information. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getVariables() { diff --git a/src/database/databasetraits/DomainTrait.php b/src/database/databasetraits/DomainTrait.php index 4d465298..9dc55407 100644 --- a/src/database/databasetraits/DomainTrait.php +++ b/src/database/databasetraits/DomainTrait.php @@ -18,7 +18,7 @@ trait DomainTrait * * @param string $domain The name of the domain to fetch * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getDomain($domain) { @@ -52,7 +52,7 @@ trait DomainTrait /** * Return all domains in current schema. Excludes domain constraints. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getDomains() { @@ -86,7 +86,7 @@ trait DomainTrait * * @param string $domain The name of the domain whose constraints to fetch * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getDomainConstraints($domain) { @@ -129,7 +129,7 @@ trait DomainTrait * @param string $default Default value for domain * @param string $check A CHECK constraint if there is one * - * @return ADORecordSet|int + * @return int|string */ public function createDomain($domain, $type, $length, $array, $notnull, $default, $check) { @@ -213,7 +213,7 @@ trait DomainTrait * @param bool $domnotnull True for NOT NULL, false otherwise * @param string $domowner The domain owner * - * @return bool|int 0 success + * @return int 0 success */ public function alterDomain($domain, $domdefault, $domnotnull, $domowner) { @@ -302,7 +302,7 @@ trait DomainTrait * @param string $domain The name of the domain to drop * @param string $cascade True to cascade drop, false to restrict * - * @return ADORecordSet|int + * @return int|string */ public function dropDomain($domain, $cascade) { @@ -330,7 +330,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 ADORecordSet|int + * @return int|string */ public function addDomainCheckConstraint($domain, $definition, $name = '') { @@ -367,7 +367,7 @@ trait DomainTrait * @param string $constraint The constraint to remove * @param bool $cascade True to cascade, false otherwise * - * @return ADORecordSet|int + * @return int|string */ public function dropDomainConstraint($domain, $constraint, $cascade) { diff --git a/src/database/databasetraits/FtsTrait.php b/src/database/databasetraits/FtsTrait.php index c364842f..a63c3b08 100644 --- a/src/database/databasetraits/FtsTrait.php +++ b/src/database/databasetraits/FtsTrait.php @@ -21,7 +21,7 @@ trait FtsTrait * @param array|string $template The existing FTS configuration to be used as template for the new one * @param string $comment If omitted, defaults to nothing * - * @return bool|int 0 success + * @return int 0 success * * @internal param string $locale Locale of the FTS configuration * @internal param string $withmap Should we copy whole map of existing FTS configuration to the new one @@ -104,7 +104,7 @@ trait FtsTrait * * @param bool $all if false, returns schema qualified FTS confs * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getFtsConfigurations($all = true) { @@ -142,7 +142,7 @@ trait FtsTrait * * @param string $ftscfg Name of the FTS configuration * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getFtsConfigurationMap($ftscfg) { @@ -189,7 +189,7 @@ trait FtsTrait * * @param bool $all if false, return only Parsers from the current schema * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getFtsParsers($all = true) { @@ -222,7 +222,7 @@ trait FtsTrait * * @param bool $all if false, return only Dics from the current schema * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getFtsDictionaries($all = true) { @@ -252,7 +252,7 @@ trait FtsTrait /** * Returns all FTS dictionary templates available. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getFtsDictionaryTemplates() { @@ -283,7 +283,7 @@ trait FtsTrait * @param string $ftscfg The configuration's name * @param bool $cascade true to Cascade to dependenced objects * - * @return ADORecordSet|int + * @return int|string */ public function dropFtsConfiguration($ftscfg, $cascade) { @@ -310,7 +310,7 @@ trait FtsTrait * @param string $ftsdict The dico's name * @param bool $cascade Cascade to dependenced objects * - * @return ADORecordSet|int + * @return int|string * * @todo Support of dictionary templates dropping */ @@ -341,7 +341,7 @@ trait FtsTrait * @param string $comment A comment on for the conf * @param string $name The new conf name * - * @return bool|int 0 on success + * @return int 0 on success */ public function updateFtsConfiguration($cfgname, $comment, $name) { @@ -398,7 +398,7 @@ trait FtsTrait * @param string $option Usually, it stores various options required for the dictionary * @param string $comment If omitted, defaults to nothing * - * @return bool|int 0 success + * @return int 0 success */ public function createFtsDictionary( $dictname, @@ -517,7 +517,7 @@ trait FtsTrait * @param string $comment The comment * @param string $name The new dico's name * - * @return bool|int 0 on success + * @return int 0 on success */ public function updateFtsDictionary($dictname, $comment, $name) { @@ -567,7 +567,7 @@ trait FtsTrait * * @param string $ftsdict The name of the FTS dictionary * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getFtsDictionaryByName($ftsdict) { @@ -606,7 +606,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 ADORecordSet|int + * @return int|string * * @internal param string $cfgname The name of the FTS configuration to alter */ @@ -662,7 +662,7 @@ trait FtsTrait * @param string $ftscfg The name of the FTS configuration * @param string $mapping The name of the mapping * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getFtsMappingByName($ftscfg, $mapping) { @@ -714,7 +714,7 @@ trait FtsTrait * * @param string $ftscfg The config's name that use the parser * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getFtsMappings($ftscfg) { @@ -735,7 +735,7 @@ trait FtsTrait * * @param string $ftscfg The name of the FTS configuration * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getFtsConfigurationByName($ftscfg) { diff --git a/src/database/databasetraits/FunctionTrait.php b/src/database/databasetraits/FunctionTrait.php index 7c4186eb..fa12b338 100644 --- a/src/database/databasetraits/FunctionTrait.php +++ b/src/database/databasetraits/FunctionTrait.php @@ -19,7 +19,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 ADORecordSet|int + * @return \RecordSet|int|string */ public function getFunctions($all = false, $type = null) { @@ -85,7 +85,9 @@ trait FunctionTrait * * @param array $f The array of data for the function * - * @return array|int An array containing the properties, or -1 in case of error + * @return int|string[] An array containing the properties, or -1 in case of error + * + * @psalm-return int|non-empty-list */ public function getFunctionProperties($f) { @@ -259,7 +261,7 @@ trait FunctionTrait * @param bool $replace (optional) True if OR REPLACE, false for * normal * - * @return bool|int 0 success + * @return int 0 success */ public function createFunction($funcname, $args, $returns, $definition, $language, $flags, $setof, $cost, $rows, $comment, $replace = false) { @@ -381,7 +383,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 ADORecordSet|int + * @return int|string */ public function dropFunction($function_oid, $cascade) { @@ -410,7 +412,7 @@ trait FunctionTrait * * @param int $function_oid * - * @return ADORecordSet|int + * @return \RecordSet|int|string * * @internal param string The $func name of the function to retrieve */ @@ -452,7 +454,7 @@ trait FunctionTrait * * @param int $function_oid * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getFunctionDef($function_oid) { diff --git a/src/database/databasetraits/HasTrait.php b/src/database/databasetraits/HasTrait.php index d78a268b..416a9295 100644 --- a/src/database/databasetraits/HasTrait.php +++ b/src/database/databasetraits/HasTrait.php @@ -286,7 +286,7 @@ trait HasTrait /** * Determines if it has tablespaces. * - * @return bool true if has tablespaces, False otherwise + * @return true true if has tablespaces, False otherwise */ public function hasTablespaces() { @@ -296,7 +296,7 @@ trait HasTrait /** * Determines if it has shared comments. * - * @return bool true if has shared comments, False otherwise + * @return true true if has shared comments, False otherwise */ public function hasSharedComments() { @@ -306,7 +306,7 @@ trait HasTrait /** * Determines if it has roles. * - * @return bool true if has roles, False otherwise + * @return true true if has roles, False otherwise */ public function hasRoles() { @@ -316,7 +316,7 @@ trait HasTrait /** * Determines if it has grant option. * - * @return bool true if has grant option, False otherwise + * @return true true if has grant option, False otherwise */ public function hasGrantOption() { @@ -326,7 +326,7 @@ trait HasTrait /** * Determines if it has create table like with constraints. * - * @return bool true if has create table like with constraints, False otherwise + * @return true true if has create table like with constraints, False otherwise */ public function hasCreateTableLikeWithConstraints() { @@ -336,7 +336,7 @@ trait HasTrait /** * Determines if it has create table like with indexes. * - * @return bool true if has create table like with indexes, False otherwise + * @return true true if has create table like with indexes, False otherwise */ public function hasCreateTableLikeWithIndexes() { @@ -346,7 +346,7 @@ trait HasTrait /** * Determines if it has create field with constraints. * - * @return bool true if has create field with constraints, False otherwise + * @return true true if has create field with constraints, False otherwise */ public function hasCreateFieldWithConstraints() { @@ -356,7 +356,7 @@ trait HasTrait /** * Determines if it has domain constraints. * - * @return bool true if has domain constraints, False otherwise + * @return true true if has domain constraints, False otherwise */ public function hasDomainConstraints() { @@ -366,7 +366,7 @@ trait HasTrait /** * Determines if it has function alter owner. * - * @return bool true if has function alter owner, False otherwise + * @return true true if has function alter owner, False otherwise */ public function hasFunctionAlterOwner() { @@ -376,7 +376,7 @@ trait HasTrait /** * Determines if it has function alter schema. * - * @return bool true if has function alter schema, False otherwise + * @return true true if has function alter schema, False otherwise */ public function hasFunctionAlterSchema() { @@ -386,7 +386,7 @@ trait HasTrait /** * Determines if it has read only queries. * - * @return bool true if has read only queries, False otherwise + * @return true true if has read only queries, False otherwise */ public function hasReadOnlyQueries() { @@ -396,7 +396,7 @@ trait HasTrait /** * Determines if it has aggregate sort operation. * - * @return bool true if has aggregate sort operation, False otherwise + * @return true true if has aggregate sort operation, False otherwise */ public function hasAggregateSortOp() { @@ -406,7 +406,7 @@ trait HasTrait /** * Determines if it has alter aggregate. * - * @return bool true if has alter aggregate, False otherwise + * @return true true if has alter aggregate, False otherwise */ public function hasAlterAggregate() { @@ -416,7 +416,7 @@ trait HasTrait /** * Determines if it has alter column type. * - * @return bool true if has alter column type, False otherwise + * @return true true if has alter column type, False otherwise */ public function hasAlterColumnType() { @@ -426,7 +426,7 @@ trait HasTrait /** * Determines if it has alter database owner. * - * @return bool true if has alter database owner, False otherwise + * @return true true if has alter database owner, False otherwise */ public function hasAlterDatabaseOwner() { @@ -436,7 +436,7 @@ trait HasTrait /** * Determines if it has alter schema. * - * @return bool true if has alter schema, False otherwise + * @return true true if has alter schema, False otherwise */ public function hasAlterSchema() { @@ -446,7 +446,7 @@ trait HasTrait /** * Determines if it has alter schema owner. * - * @return bool true if has alter schema owner, False otherwise + * @return true true if has alter schema owner, False otherwise */ public function hasAlterSchemaOwner() { @@ -456,7 +456,7 @@ trait HasTrait /** * Determines if it has alter sequence schema. * - * @return bool true if has alter sequence schema, False otherwise + * @return true true if has alter sequence schema, False otherwise */ public function hasAlterSequenceSchema() { @@ -466,7 +466,7 @@ trait HasTrait /** * Determines if it has alter sequence start. * - * @return bool true if has alter sequence start, False otherwise + * @return true true if has alter sequence start, False otherwise */ public function hasAlterSequenceStart() { @@ -476,7 +476,7 @@ trait HasTrait /** * Determines if it has alter table schema. * - * @return bool true if has alter table schema, False otherwise + * @return true true if has alter table schema, False otherwise */ public function hasAlterTableSchema() { @@ -486,7 +486,7 @@ trait HasTrait /** * Determines if it has autovacuum. * - * @return bool true if has autovacuum, False otherwise + * @return true true if has autovacuum, False otherwise */ public function hasAutovacuum() { @@ -496,7 +496,7 @@ trait HasTrait /** * Determines if it has create table like. * - * @return bool true if has create table like, False otherwise + * @return true true if has create table like, False otherwise */ public function hasCreateTableLike() { @@ -506,7 +506,7 @@ trait HasTrait /** * Determines if it has disable triggers. * - * @return bool true if has disable triggers, False otherwise + * @return true true if has disable triggers, False otherwise */ public function hasDisableTriggers() { @@ -516,7 +516,7 @@ trait HasTrait /** * Determines if it has alter domains. * - * @return bool true if has alter domains, False otherwise + * @return true true if has alter domains, False otherwise */ public function hasAlterDomains() { @@ -526,7 +526,7 @@ trait HasTrait /** * Determines if it has enum types. * - * @return bool true if has enum types, False otherwise + * @return true true if has enum types, False otherwise */ public function hasEnumTypes() { @@ -536,7 +536,7 @@ trait HasTrait /** * Determines if it has fts. * - * @return bool true if has fts, False otherwise + * @return true true if has fts, False otherwise */ public function hasFTS() { @@ -546,7 +546,7 @@ trait HasTrait /** * Determines if it has function costing. * - * @return bool true if has function costing, False otherwise + * @return true true if has function costing, False otherwise */ public function hasFunctionCosting() { @@ -556,7 +556,7 @@ trait HasTrait /** * Determines if it has function guc. * - * @return bool true if has function guc, False otherwise + * @return true true if has function guc, False otherwise */ public function hasFunctionGUC() { @@ -566,7 +566,7 @@ trait HasTrait /** * Determines if it has named parameters. * - * @return bool true if has named parameters, False otherwise + * @return true true if has named parameters, False otherwise */ public function hasNamedParams() { @@ -576,7 +576,7 @@ trait HasTrait /** * Determines if it has prepare. * - * @return bool true if has prepare, False otherwise + * @return true true if has prepare, False otherwise */ public function hasPrepare() { @@ -586,7 +586,7 @@ trait HasTrait /** * Determines if it has prepared xacts. * - * @return bool true if has prepared xacts, False otherwise + * @return true true if has prepared xacts, False otherwise */ public function hasPreparedXacts() { @@ -596,7 +596,7 @@ trait HasTrait /** * Determines if it has recluster. * - * @return bool true if has recluster, False otherwise + * @return true true if has recluster, False otherwise */ public function hasRecluster() { @@ -606,7 +606,7 @@ trait HasTrait /** * Determines if it has server admin funcs. * - * @return bool true if has server admin funcs, False otherwise + * @return true true if has server admin funcs, False otherwise */ public function hasServerAdminFuncs() { @@ -616,7 +616,7 @@ trait HasTrait /** * Determines if it has query cancel. * - * @return bool true if has query cancel, False otherwise + * @return true true if has query cancel, False otherwise */ public function hasQueryCancel() { @@ -626,7 +626,7 @@ trait HasTrait /** * Determines if it has user rename. * - * @return bool true if has user rename, False otherwise + * @return true true if has user rename, False otherwise */ public function hasUserRename() { @@ -636,7 +636,7 @@ trait HasTrait /** * Determines if it has user signals. * - * @return bool true if has user signals, False otherwise + * @return true true if has user signals, False otherwise */ public function hasUserSignals() { @@ -646,7 +646,7 @@ trait HasTrait /** * Determines if it has virtual transaction identifier. * - * @return bool true if has virtual transaction identifier, False otherwise + * @return true true if has virtual transaction identifier, False otherwise */ public function hasVirtualTransactionId() { @@ -666,7 +666,7 @@ trait HasTrait /** * Determines if it has alter database rename. * - * @return bool true if has alter database rename, False otherwise + * @return true true if has alter database rename, False otherwise */ public function hasAlterDatabaseRename() { @@ -676,7 +676,7 @@ trait HasTrait /** * Determines if it has database collation. * - * @return bool true if has database collation, False otherwise + * @return true true if has database collation, False otherwise */ public function hasDatabaseCollation() { @@ -686,7 +686,7 @@ trait HasTrait /** * Determines if it has magic types. * - * @return bool true if has magic types, False otherwise + * @return true true if has magic types, False otherwise */ public function hasMagicTypes() { @@ -696,7 +696,7 @@ trait HasTrait /** * Determines if it has query kill. * - * @return bool true if has query kill, False otherwise + * @return true true if has query kill, False otherwise */ public function hasQueryKill() { @@ -706,7 +706,7 @@ trait HasTrait /** * Determines if it has concurrent index build. * - * @return bool true if has concurrent index build, False otherwise + * @return true true if has concurrent index build, False otherwise */ public function hasConcurrentIndexBuild() { @@ -716,7 +716,7 @@ trait HasTrait /** * Determines if it has force reindex. * - * @return bool true if has force reindex, False otherwise + * @return false true if has force reindex, False otherwise */ public function hasForceReindex() { @@ -726,7 +726,7 @@ trait HasTrait /** * Determines if it has bytea hexadecimal default. * - * @return bool true if has bytea hexadecimal default, False otherwise + * @return true true if has bytea hexadecimal default, False otherwise */ public function hasByteaHexDefault() { diff --git a/src/database/databasetraits/IndexTrait.php b/src/database/databasetraits/IndexTrait.php index 9e381246..ca4801e9 100644 --- a/src/database/databasetraits/IndexTrait.php +++ b/src/database/databasetraits/IndexTrait.php @@ -55,7 +55,9 @@ trait IndexTrait * @param string $tablespace The tablespaces ('' means none/default) * @param bool $concurrently true to create index concurrently * - * @return array status (0 if operation was successful) and sql sentence + * @return (int|string)[] status (0 if operation was successful) and sql sentence + * + * @psalm-return array{0: int|string, 1: string} */ public function createIndex($name, $table, $columns, $type, $unique, $where, $tablespace, $concurrently) { @@ -119,7 +121,9 @@ trait IndexTrait * @param string $index The index to drop * @param bool $cascade True to cascade drop, false to restrict * - * @return array 0 if operation was successful + * @return (int|string)[] 0 if operation was successful + * + * @psalm-return array{0: int|string, 1: string} */ public function dropIndex($index, $cascade) { @@ -150,7 +154,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 ADORecordSet|int + * @return int|string */ public function reindex($type, $name, $force = false) { @@ -199,7 +203,9 @@ trait IndexTrait * @param string $table The table the index is on * @param string $index The name of the index * - * @return array 0 if operation was successful + * @return (int|string)[] 0 if operation was successful + * + * @psalm-return array{0: int|string, 1: string} */ public function clusterIndex($table = '', $index = '') { @@ -239,7 +245,7 @@ trait IndexTrait * * @param string $table the table where we are looking for fk * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getConstraintsWithFields($table) { @@ -314,7 +320,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 ADORecordSet|int + * @return int|string */ public function addPrimaryKey($table, $fields, $name = '', $tablespace = '') { @@ -362,7 +368,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 ADORecordSet|int + * @return int|string */ public function addUniqueKey($table, $fields, $name = '', $tablespace = '') { @@ -411,7 +417,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 ADORecordSet|int + * @return int|string */ public function addCheckConstraint($table, $definition, $name = '') { @@ -448,7 +454,7 @@ trait IndexTrait * @param string $table The table from which to drop the check * @param string $name The name of the check to be dropped * - * @return bool|int 0 success + * @return int 0 success */ public function dropCheckConstraint($table, $name) { @@ -537,7 +543,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 ADORecordSet|int + * @return int|string * * @internal param \PHPPgAdmin\Database\The $target table that contains the target columns * @internal param \PHPPgAdmin\Database\The $intially initial deferrability (eg. INITIALLY IMMEDIATE) @@ -636,7 +642,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 ADORecordSet|int + * @return int|string */ public function dropConstraint($constraint, $relation, $type, $cascade) { @@ -664,7 +670,7 @@ trait IndexTrait * * @param array $tables multi dimensional assoc array that holds schema and table name * - * @return ADORecordSet|int recordset of linked tables and columns or -1 if $tables isn't an array + * @return \RecordSet|int|string recordset of linked tables and columns or -1 if $tables isn't an array */ public function getLinkingKeys($tables) { @@ -792,7 +798,7 @@ trait IndexTrait * * @param string $table The table to find referrers for * - * @return ADORecordSet|int A recordset or -1 in case of error + * @return \RecordSet|int|string A recordset or -1 in case of error */ public function getReferrers($table) { diff --git a/src/database/databasetraits/OperatorTrait.php b/src/database/databasetraits/OperatorTrait.php index 040cb3fb..479844be 100644 --- a/src/database/databasetraits/OperatorTrait.php +++ b/src/database/databasetraits/OperatorTrait.php @@ -16,7 +16,7 @@ trait OperatorTrait /** * Returns a list of all operators in the database. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getOperators() { @@ -50,7 +50,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 ADORecordSet|int + * @return int|string */ public function dropOperator($operator_oid, $cascade) { @@ -90,7 +90,7 @@ trait OperatorTrait * * @param mixed $operator_oid The oid of the operator * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getOperator($operator_oid) { @@ -124,7 +124,7 @@ trait OperatorTrait /** * Gets all opclasses. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getOpClasses() { diff --git a/src/database/databasetraits/PrivilegesTrait.php b/src/database/databasetraits/PrivilegesTrait.php index a9f6aa45..5c395472 100644 --- a/src/database/databasetraits/PrivilegesTrait.php +++ b/src/database/databasetraits/PrivilegesTrait.php @@ -134,7 +134,7 @@ trait PrivilegesTrait * @param bool $cascade True for cascade revoke, false otherwise * @param string $table the column's table if type=column * - * @return ADORecordSet|int + * @return int|string */ public function setPrivileges( $mode, @@ -337,9 +337,11 @@ trait PrivilegesTrait * * @param string $acl The ACL to parse (of type aclitem[]) * - * @return array|int Privileges array or integer with error code + * @return (array|false|null|string)[][]|int Privileges array or integer with error code * * @internal bool $in_quotes toggles acl in_quotes attribute + * + * @psalm-return int|non-empty-list, 3: false|string, 4: list}> */ protected function parseACL($acl) { diff --git a/src/database/databasetraits/RoleTrait.php b/src/database/databasetraits/RoleTrait.php index 6b7150cc..0de70375 100644 --- a/src/database/databasetraits/RoleTrait.php +++ b/src/database/databasetraits/RoleTrait.php @@ -18,7 +18,7 @@ trait RoleTrait * * @param string $rolename (optional) The role name to exclude from the select * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getRoles($rolename = '') { @@ -56,7 +56,7 @@ trait RoleTrait * * @param string $rolename The name of the role to retrieve * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getRole($rolename) { @@ -88,7 +88,7 @@ trait RoleTrait /** * Returns all users in the database cluster. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getUsers() { @@ -110,7 +110,7 @@ trait RoleTrait * * @param string $username The username of the user to retrieve * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getUser($username) { @@ -149,7 +149,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 ADORecordSet|int + * @return int|string */ public function createRole( $rolename, @@ -258,7 +258,7 @@ trait RoleTrait * @param string $original_admins Original roles that are admin members of the role, comma separated * @param string $newrolename The new name of the role * - * @return bool|int 0 success + * @return int 0 success */ public function setRenameRole( $rolename, @@ -328,7 +328,7 @@ trait RoleTrait * @param string $rolename The name of the role to rename * @param string $newrolename The new name of the role * - * @return ADORecordSet|int + * @return int|string */ public function renameRole($rolename, $newrolename) { @@ -364,6 +364,8 @@ trait RoleTrait * @param string $original_admins Original roles that are admin members of the role, comma separated * * @return int 0 if operation was successful + * + * @psalm-return -1|0 */ public function setRole( $rolename, @@ -431,7 +433,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 ADORecordSet|int + * @return int|string */ public function grantRole($role, $rolename, $admin = 0) { @@ -459,7 +461,7 @@ trait RoleTrait * @param int $admin (optional) Flag to revoke only the admin option * @param string $type (optional) Type of revoke: RESTRICT | CASCADE * - * @return ADORecordSet|int + * @return int|string */ public function revokeRole($role, $rolename, $admin = 0, $type = 'RESTRICT') { @@ -487,7 +489,7 @@ trait RoleTrait * * @param string $rolename The name of the role to drop * - * @return ADORecordSet|int + * @return int|string */ public function dropRole($rolename) { @@ -511,7 +513,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 ADORecordSet|int + * @return int|string * * @internal param $group (array) The groups to create the user in */ @@ -564,7 +566,7 @@ trait RoleTrait * @param string $expiry string Format 'YYYY-MM-DD HH:MM:SS'. '' means never expire. * @param string $newname The new name of the user * - * @return bool|int 0 success + * @return int 0 success */ public function setRenameUser($username, $password, $createdb, $createuser, $expiry, $newname) { @@ -602,7 +604,7 @@ trait RoleTrait * @param string $username The username of the user to rename * @param string $newname The new name of the user * - * @return ADORecordSet|int + * @return int|string */ public function renameUser($username, $newname) { @@ -629,7 +631,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 ADORecordSet|int + * @return int|string */ public function setUser($username, $password, $createdb, $createuser, $expiry) { @@ -670,7 +672,7 @@ trait RoleTrait * * @param string $username The username of the user to drop * - * @return ADORecordSet|int + * @return int|string */ public function dropUser($username) { @@ -690,7 +692,7 @@ trait RoleTrait * @param string $rolename The role name * @param string $password The new password * - * @return ADORecordSet|int + * @return int|string */ public function changePassword($rolename, $password) { @@ -713,7 +715,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 ADORecordSet|int + * @return int|string */ public function addGroupMember($groname, $user) { @@ -734,7 +736,7 @@ trait RoleTrait * * @param string $rolename The role name * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getMemberOf($rolename) { @@ -762,7 +764,7 @@ trait RoleTrait * @param string $rolename The role name * @param string $admin (optional) Find only admin members * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getMembers($rolename, $admin = 'f') { @@ -788,7 +790,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 ADORecordSet|int + * @return int|string */ public function dropGroupMember($groname, $user) { @@ -809,7 +811,7 @@ trait RoleTrait * * @param string $groname The name of the group * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getGroup($groname) { @@ -829,7 +831,7 @@ trait RoleTrait /** * Returns all groups in the database cluser. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getGroups() { @@ -844,7 +846,7 @@ trait RoleTrait * @param string $groname The name of the group * @param array $users An array of users to add to the group * - * @return ADORecordSet|int + * @return int|string */ public function createGroup($groname, $users) { @@ -868,7 +870,7 @@ trait RoleTrait * * @param string $groname The name of the group to drop * - * @return ADORecordSet|int + * @return int|string */ public function dropGroup($groname) { @@ -1029,7 +1031,7 @@ trait RoleTrait * @param mixed $inherits * @param mixed $login * - * @return int|ADORecordSet + * @return int|string */ private function _alterRole($rolename, $password, $connlimit, $expiry, $superuser, $createdb, $createrole, $inherits, $login) { diff --git a/src/database/databasetraits/RowTrait.php b/src/database/databasetraits/RowTrait.php index 10b71d46..935b1be8 100644 --- a/src/database/databasetraits/RowTrait.php +++ b/src/database/databasetraits/RowTrait.php @@ -19,7 +19,7 @@ trait RowTrait * @param string $table The name of a table * @param array $key The associative array holding the key to retrieve * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function browseRow($table, $key) { @@ -55,7 +55,7 @@ trait RowTrait * * @param string $table The table for which to retrieve the identifier * - * @return array|array|int An array mapping attribute number to attribute name, empty for no identifiers + * @return array|int An array mapping attribute number to attribute name, empty for no identifiers */ public function getRowIdentifier($table) { @@ -126,7 +126,7 @@ trait RowTrait * @param array $format An array of the data type (VALUE or EXPRESSION) * @param array $types An array of field types * - * @return ADORecordSet|int + * @return int|string */ public function insertRow($table, $fields, $values, $nulls, $format, $types) { @@ -252,7 +252,7 @@ trait RowTrait * @param array $types An array of field types * @param array $keyarr An array mapping column => value to update * - * @return bool|int 0 success + * @return int 0 success */ public function editRow($table, $vars, $nulls, $format, $types, $keyarr) { @@ -346,7 +346,7 @@ trait RowTrait * @param array $key An array mapping column => value to delete * @param string $schema the schema of the table * - * @return bool|int 0 success + * @return int 0 success */ public function deleteRow($table, $key, $schema = '') { diff --git a/src/database/databasetraits/SchemaTrait.php b/src/database/databasetraits/SchemaTrait.php index c2982d16..fc2cc407 100644 --- a/src/database/databasetraits/SchemaTrait.php +++ b/src/database/databasetraits/SchemaTrait.php @@ -18,7 +18,7 @@ trait SchemaTrait /** * Return all schemas in the current database. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getSchemas() { @@ -104,7 +104,7 @@ trait SchemaTrait * * @param mixed $paths An array of schemas in required search order * - * @return ADORecordSet|int + * @return int|string */ public function setSearchPath($paths) { @@ -143,7 +143,7 @@ trait SchemaTrait * @param string $authorization (optional) The username to create the schema for * @param string $comment (optional) If omitted, defaults to nothing * - * @return bool|int 0 success + * @return int 0 success */ public function createSchema($schemaname, $authorization = '', $comment = '') { @@ -203,7 +203,7 @@ trait SchemaTrait * @param string $name new name for this schema * @param string $owner The new owner for this schema * - * @return bool|int 0 success + * @return int 0 success */ public function updateSchema($schemaname, $comment, $name, $owner) { @@ -268,7 +268,7 @@ trait SchemaTrait * * @param string $schema The name of the schema * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getSchemaByName($schema) { @@ -294,7 +294,7 @@ trait SchemaTrait * @param string $schemaname The name of the schema to drop * @param bool $cascade True to cascade drop, false to restrict * - * @return ADORecordSet|int + * @return int|string */ public function dropSchema($schemaname, $cascade) { diff --git a/src/database/databasetraits/SequenceTrait.php b/src/database/databasetraits/SequenceTrait.php index 0efcafbd..9fd8e146 100644 --- a/src/database/databasetraits/SequenceTrait.php +++ b/src/database/databasetraits/SequenceTrait.php @@ -18,7 +18,7 @@ trait SequenceTrait * * @param bool $all true to get all sequences of all schemas * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getSequences($all = false) { @@ -51,7 +51,7 @@ trait SequenceTrait * * @param string $sequence Sequence name * - * @return ADORecordSet|int + * @return int|string */ public function nextvalSequence($sequence) { @@ -77,7 +77,7 @@ trait SequenceTrait * @param string $sequence Sequence name * @param int $nextvalue The next value * - * @return ADORecordSet|int + * @return int|string */ public function setvalSequence($sequence, $nextvalue) { @@ -104,7 +104,7 @@ trait SequenceTrait * * @param string $sequence Sequence name * - * @return ADORecordSet|int + * @return int|string */ public function restartSequence($sequence) { @@ -126,7 +126,7 @@ trait SequenceTrait * * @param string $sequence Sequence name * - * @return ADORecordSet|int + * @return int|string */ public function resetSequence($sequence) { @@ -160,7 +160,7 @@ trait SequenceTrait * * @param string $sequence Sequence name * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getSequence($sequence) { @@ -198,7 +198,7 @@ trait SequenceTrait * @param int $cachevalue The cache value * @param bool $cycledvalue True if cycled, false otherwise * - * @return ADORecordSet|int + * @return int|string */ public function createSequence( $sequence, @@ -282,7 +282,7 @@ trait SequenceTrait * @param null|bool $cycledvalue True if cycled, false otherwise * @param int $startvalue The sequence start value when issueing a restart * - * @return bool|int 0 success + * @return int 0 success */ public function alterSequence( $sequence, @@ -346,7 +346,7 @@ trait SequenceTrait * @param ADORecordSet $seqrs The sequence RecordSet returned by getSequence() * @param string $owner the new owner of the sequence * - * @return ADORecordSet|int + * @return int|string * * @internal string $name new owner for the sequence */ @@ -384,7 +384,7 @@ trait SequenceTrait * @param null|bool $cycledvalue Sequence can cycle ? * @param int $startvalue The sequence start value when issueing a restart * - * @return ADORecordSet|int + * @return int|string */ public function alterSequenceProps( $seqrs, @@ -467,7 +467,7 @@ trait SequenceTrait * @param ADORecordSet $seqrs The sequence RecordSet returned by getSequence() * @param string $name The new name for the sequence * - * @return ADORecordSet|int + * @return int|string */ public function alterSequenceName($seqrs, $name) { @@ -499,7 +499,7 @@ trait SequenceTrait * @param ADORecordSet $seqrs The sequence RecordSet returned by getSequence() * @param string $schema * - * @return ADORecordSet|int + * @return int|string * * @internal param The $name new schema for the sequence */ @@ -528,7 +528,7 @@ trait SequenceTrait * @param string $sequence Sequence name * @param bool $cascade True to cascade drop, false to restrict * - * @return ADORecordSet|int + * @return int|string */ public function dropSequence($sequence, $cascade = false) { @@ -585,6 +585,8 @@ trait SequenceTrait * @param int $startvalue The sequence start value when issueing a restart * * @return int 0 success + * + * @psalm-return -7|-6|-5|-4|-3|0 */ protected function _alterSequence( $seqrs, diff --git a/src/database/databasetraits/StatsTrait.php b/src/database/databasetraits/StatsTrait.php index a9228c6a..f7b85386 100644 --- a/src/database/databasetraits/StatsTrait.php +++ b/src/database/databasetraits/StatsTrait.php @@ -18,7 +18,7 @@ trait StatsTrait * * @param string $database The database to fetch stats for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getStatsDatabase($database) { @@ -37,7 +37,7 @@ trait StatsTrait * * @param string $table The table to fetch stats for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getStatsTableTuples($table) { @@ -60,7 +60,7 @@ trait StatsTrait * * @param string $table The table to fetch stats for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getStatsTableIO($table) { @@ -83,7 +83,7 @@ trait StatsTrait * * @param string $table The table to fetch index stats for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getStatsIndexTuples($table) { @@ -106,7 +106,7 @@ trait StatsTrait * * @param string $table The table to fetch index stats for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getStatsIndexIO($table) { diff --git a/src/database/databasetraits/TableTrait.php b/src/database/databasetraits/TableTrait.php index c992d2e3..999b96f2 100644 --- a/src/database/databasetraits/TableTrait.php +++ b/src/database/databasetraits/TableTrait.php @@ -21,7 +21,7 @@ trait TableTrait /** * Return all tables in current database excluding schemas 'pg_catalog', 'information_schema' and 'pg_toast'. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getAllTables() { @@ -39,7 +39,7 @@ trait TableTrait /** * Return all tables in current database (and schema). * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getTables() { @@ -81,7 +81,7 @@ trait TableTrait * * @param string $table The table to find the parents for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getTableParents($table) { @@ -115,7 +115,7 @@ trait TableTrait * * @param string $table The table to find the children for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getTableChildren($table) { @@ -148,6 +148,8 @@ 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 { @@ -262,7 +264,7 @@ trait TableTrait * * @param string $table The name of the table * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getTable($table) { @@ -325,7 +327,7 @@ trait TableTrait * * @param string $table The table to find rules for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getConstraints($table) { @@ -479,7 +481,7 @@ trait TableTrait * @param string $table The name of a table whose indexes to retrieve * @param bool $unique Only get unique/pk indexes * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getIndexes($table = '', $unique = false) { @@ -510,7 +512,7 @@ trait TableTrait * * @param string $table The name of a table whose triggers to retrieve * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getTriggers($table = '') { @@ -545,7 +547,7 @@ trait TableTrait * * @param string $table The table to find rules for * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getRules($table) { @@ -586,7 +588,7 @@ trait TableTrait * @param array $uniquekey An Array indicating the fields that are unique (those indexes that are set) * @param array $primarykey An Array indicating the field used for the primarykey (those indexes that are set) * - * @return bool|int 0 success + * @return int 0 success */ public function createTable( $name, @@ -815,7 +817,7 @@ trait TableTrait * @param bool $idx * @param string $tablespace The tablespace name ('' means none/default) * - * @return bool|int + * @return int */ public function createTableLike($name, $like, $defaults = false, $constraints = false, $idx = false, $tablespace = '') { @@ -887,7 +889,7 @@ trait TableTrait * @param string $tablespace The new tablespace for the table ('' means leave as is) * @param bool $with_oids If set to FALSE, will drop oids column * - * @return bool|int 0 success + * @return int 0 success */ public function alterTable($table, $name, $owner, $schema, $comment, $tablespace, bool $with_oids = true) { @@ -1119,7 +1121,9 @@ trait TableTrait * @param string $table The table to be emptied * @param bool $cascade True to cascade truncate, false to restrict * - * @return array 0 if operation was successful + * @return (int|string)[] 0 if operation was successful + * + * @psalm-return array{0: int|string, 1: string} */ public function emptyTable($table, $cascade) { @@ -1148,7 +1152,7 @@ trait TableTrait * @param string $table The table to drop * @param bool $cascade True to cascade drop, false to restrict * - * @return ADORecordSet|int + * @return int|string */ public function dropTable($table, $cascade) { @@ -1174,6 +1178,8 @@ trait TableTrait * transaction, sets variables, etc. * * @return int 0 success + * + * @psalm-return -1|0 */ public function beginDump() { @@ -1235,7 +1241,7 @@ trait TableTrait * @param string $relation The name of a relation * @param bool $oids true to dump also the oids * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function dumpRelation($relation, $oids) { @@ -1342,7 +1348,7 @@ trait TableTrait * @param int $vaccostdelay vacuum cost delay * @param int $vaccostlimit vacuum cost limit * - * @return ADORecordSet|int + * @return int|string */ public function saveAutovacuum( $table, @@ -1434,7 +1440,7 @@ trait TableTrait * * @param string $table The table * - * @return ADORecordSet|int + * @return int|string */ public function dropAutovacuum($table) { @@ -1506,6 +1512,8 @@ trait TableTrait * @param bool $withoutoids If set to TRUE, will drop oids column * * @return int 0 success + * + * @psalm-return -7|-6|-5|-4|-3|0 */ protected function _alterTable($tblrs, $name, $owner, $schema, $comment, $tablespace, bool $withoutoids = false) { @@ -1994,7 +2002,7 @@ trait TableTrait * @param string $table The name of the table * @param string $c_schema The name of the schema * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ private function _getTableAttributesAll($table, $c_schema) { @@ -2050,7 +2058,7 @@ trait TableTrait * @param string $c_schema The schema of the table * @param string $field (optional) The name of a field to return * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ private function _getTableAttribute($table, $c_schema, $field) { diff --git a/src/database/databasetraits/TablespaceTrait.php b/src/database/databasetraits/TablespaceTrait.php index f8030426..cafd4bc3 100644 --- a/src/database/databasetraits/TablespaceTrait.php +++ b/src/database/databasetraits/TablespaceTrait.php @@ -18,7 +18,7 @@ trait TablespaceTrait * * @param bool $all Include all tablespaces (necessary when moving objects back to the default space) * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getTablespaces($all = false) { @@ -44,7 +44,7 @@ trait TablespaceTrait * * @param string $spcname * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getTablespace($spcname) { @@ -66,6 +66,8 @@ trait TablespaceTrait * @param string $comment * * @return int 0 success + * + * @psalm-return -2|-1|0 */ public function createTablespace($spcname, $spcowner, $spcloc, $comment = '') { @@ -106,7 +108,7 @@ trait TablespaceTrait * @param string $owner The new owner for the tablespace * @param string $comment * - * @return bool|int 0 success + * @return int 0 success */ public function alterTablespace($spcname, $name, $owner, $comment = '') { @@ -162,7 +164,7 @@ trait TablespaceTrait * * @param string $spcname The name of the domain to drop * - * @return ADORecordSet|int + * @return int|string */ public function dropTablespace($spcname) { diff --git a/src/database/databasetraits/TriggerTrait.php b/src/database/databasetraits/TriggerTrait.php index bfa89fd1..8339358d 100644 --- a/src/database/databasetraits/TriggerTrait.php +++ b/src/database/databasetraits/TriggerTrait.php @@ -19,7 +19,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 ADORecordSet|int + * @return \RecordSet|int|string */ public function getTrigger($table, $trigger) { @@ -49,7 +49,7 @@ trait TriggerTrait * @param string $tgfrequency * @param string $tgargs The function arguments * - * @return ADORecordSet|int + * @return int|string */ public function createTrigger($tgname, $table, $tgproc, $tgtime, $tgevent, $tgfrequency, $tgargs) { @@ -74,7 +74,7 @@ trait TriggerTrait * @param string $trigger The name of the trigger to alter * @param string $name The new name for the trigger * - * @return ADORecordSet|int + * @return int|string */ public function alterTrigger($table, $trigger, $name) { @@ -96,7 +96,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 ADORecordSet|int + * @return int|string */ public function dropTrigger($tgname, $table, $cascade) { @@ -120,7 +120,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 ADORecordSet|int + * @return int|string */ public function enableTrigger($tgname, $table) { @@ -140,7 +140,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 ADORecordSet|int + * @return int|string */ public function disableTrigger($tgname, $table) { @@ -189,7 +189,7 @@ trait TriggerTrait * @param bool $replace (optional) True to replace existing rule, false * otherwise * - * @return ADORecordSet|int + * @return int|string */ public function createRule($name, $event, $table, $where, $instead, $type, $action, $replace = false) { @@ -236,7 +236,7 @@ trait TriggerTrait * @param string $relation The relation from which to drop * @param string $cascade True to cascade drop, false to restrict * - * @return ADORecordSet|int + * @return int|string */ public function dropRule($rule, $relation, $cascade) { diff --git a/src/database/databasetraits/TypeTrait.php b/src/database/databasetraits/TypeTrait.php index 2aa7dd93..1fb36f80 100644 --- a/src/database/databasetraits/TypeTrait.php +++ b/src/database/databasetraits/TypeTrait.php @@ -20,7 +20,7 @@ trait TypeTrait * @param string $typname The name of the type * @param int $typmod The contents of the typmod field * - * @return bool|string + * @return false|string */ public function formatType($typname, $typmod) { @@ -75,7 +75,7 @@ trait TypeTrait * * @param string $typname The name of the view to retrieve * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getType($typname) { @@ -94,7 +94,7 @@ trait TypeTrait * @param bool $tabletypes If true, will include table types * @param bool $domains If true, will include domains * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getTypes($all = false, $tabletypes = false, $domains = false) { @@ -152,7 +152,7 @@ trait TypeTrait * @param string $typalign * @param string $typstorage * - * @return ADORecordSet|int + * @return int|string * * @internal param $ ... */ @@ -215,7 +215,7 @@ trait TypeTrait * @param string $typname The name of the type to drop * @param bool $cascade True to cascade drop, false to restrict * - * @return ADORecordSet|int + * @return int|string */ public function dropType($typname, $cascade) { @@ -239,7 +239,7 @@ trait TypeTrait * @param array $values An array of values * @param string $typcomment Type comment * - * @return bool|int 0 success + * @return int 0 success */ public function createEnumType($name, $values, $typcomment) { @@ -295,7 +295,7 @@ trait TypeTrait * * @param string $name * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getEnumValues($name) { @@ -322,7 +322,7 @@ trait TypeTrait * @param array $colcomment An array of comments * @param string $typcomment Type comment * - * @return bool|int 0 success + * @return int 0 success */ public function createCompositeType($name, $fields, $field, $type, $array, $length, $colcomment, $typcomment) { @@ -447,7 +447,7 @@ trait TypeTrait /** * Returns a list of all casts in the database. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getCasts() { @@ -492,7 +492,7 @@ trait TypeTrait /** * Returns a list of all conversions in the database. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getConversions() { diff --git a/src/database/databasetraits/ViewTrait.php b/src/database/databasetraits/ViewTrait.php index b61cd9cb..2081eda7 100644 --- a/src/database/databasetraits/ViewTrait.php +++ b/src/database/databasetraits/ViewTrait.php @@ -16,7 +16,7 @@ trait ViewTrait /** * Returns a list of all views in the database. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getViews() { @@ -36,7 +36,7 @@ trait ViewTrait /** * Returns a list of all materialized views in the database. * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getMaterializedViews() { @@ -77,7 +77,7 @@ trait ViewTrait * @param string $comment * @param bool $materialized tells if it's a materialized view * - * @return bool|int 0 success + * @return int 0 success */ public function createView($viewname, $definition, $replace, $comment, $materialized = false) { @@ -131,7 +131,7 @@ trait ViewTrait * @param string $schema The new schema for the view * @param string $comment The comment on the view * - * @return bool|int 0 success + * @return int 0 success */ public function alterView($view, $name, $owner, $schema, $comment) { @@ -165,7 +165,7 @@ trait ViewTrait * * @param string $view The name of the view or materialized to retrieve * - * @return ADORecordSet|int + * @return \RecordSet|int|string */ public function getView($view) { @@ -191,7 +191,7 @@ trait ViewTrait * @param ADORecordSet $vwrs The view recordSet returned by getView() * @param null|string $owner * - * @return ADORecordSet|int + * @return int|string * * @internal param $name new view's owner */ @@ -219,7 +219,7 @@ trait ViewTrait * @param ADORecordSet $vwrs The view recordSet returned by getView() * @param string $name The new view's name * - * @return ADORecordSet|int + * @return int|string */ public function alterViewName($vwrs, $name) { @@ -248,7 +248,7 @@ trait ViewTrait * @param ADORecordSet $vwrs The view recordSet returned by getView() * @param string $schema * - * @return ADORecordSet|int + * @return int|string * * @internal param The $name new view's schema */ @@ -276,7 +276,7 @@ trait ViewTrait * @param string $viewname The name of the view to drop * @param string $cascade True to cascade drop, false to restrict * - * @return ADORecordSet|int + * @return int|string */ public function dropView($viewname, $cascade) { @@ -325,6 +325,8 @@ trait ViewTrait * @param string $comment The comment on the view * * @return int 0 success + * + * @psalm-return -6|-5|-4|-3|0 */ protected function _alterView($vwrs, $name, $owner, $schema, $comment) { -- cgit v1.2.3