diff --git a/composer.json b/composer.json
index be7db1db..e4139acf 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"config": {
"sort-packages": true,
"platform": {
- "php": "7.3.99"
+ "php": "7.4.99"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
@@ -31,13 +31,13 @@
}
},
"require": {
- "php": "^7.3 || ~8.0.0 || ~8.1.0",
+ "php": "^7.4 || ~8.0.0 || ~8.1.0",
"laminas/laminas-stdlib": "^3.7.1"
},
"require-dev": {
- "laminas/laminas-coding-standard": "~2.2.1",
+ "laminas/laminas-coding-standard": "^2.4.0",
"laminas/laminas-eventmanager": "^3.4.0",
- "laminas/laminas-hydrator": "^3.2 || ^4.3",
+ "laminas/laminas-hydrator": "^4.3",
"laminas/laminas-servicemanager": "^3.7.0",
"phpunit/phpunit": "^9.5.19"
},
diff --git a/composer.lock b/composer.lock
index 1ed8c142..f7275ddf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,34 +4,35 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "5fc4a788c1c5079ecaecef7dd1cd9bd4",
+ "content-hash": "6edb8b5c8b62c96ac581a2470a6e1b6d",
"packages": [
{
"name": "laminas/laminas-stdlib",
- "version": "3.11.0",
+ "version": "3.13.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-stdlib.git",
- "reference": "aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f"
+ "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f",
- "reference": "aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f",
+ "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/66a6d03c381f6c9f1dd988bf8244f9afb9380d76",
+ "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76",
"shasum": ""
},
"require": {
- "php": "^7.3 || ~8.0.0 || ~8.1.0"
+ "php": "^7.4 || ~8.0.0 || ~8.1.0"
},
"conflict": {
"zendframework/zend-stdlib": "*"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.3.0",
- "phpbench/phpbench": "^1.0",
- "phpunit/phpunit": "^9.3.7",
+ "phpbench/phpbench": "^1.2.6",
+ "phpstan/phpdoc-parser": "^0.5.4",
+ "phpunit/phpunit": "^9.5.23",
"psalm/plugin-phpunit": "^0.17.0",
- "vimeo/psalm": "^4.7"
+ "vimeo/psalm": "^4.26"
},
"type": "library",
"autoload": {
@@ -63,7 +64,7 @@
"type": "community_bridge"
}
],
- "time": "2022-07-27T12:28:58+00:00"
+ "time": "2022-08-24T13:56:50+00:00"
}
],
"packages-dev": [
@@ -250,24 +251,27 @@
},
{
"name": "laminas/laminas-coding-standard",
- "version": "2.2.1",
+ "version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-coding-standard.git",
- "reference": "c953ecb1d37034f4aa326046e2c24a10fe0a2845"
+ "reference": "eb076dd86aa93dd424856b150c9b6f76c1fdfabc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/c953ecb1d37034f4aa326046e2c24a10fe0a2845",
- "reference": "c953ecb1d37034f4aa326046e2c24a10fe0a2845",
+ "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/eb076dd86aa93dd424856b150c9b6f76c1fdfabc",
+ "reference": "eb076dd86aa93dd424856b150c9b6f76c1fdfabc",
"shasum": ""
},
"require": {
- "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
- "php": "^7.3 || ~8.0.0",
- "slevomat/coding-standard": "^6.4.1",
- "squizlabs/php_codesniffer": "^3.5.8",
- "webimpress/coding-standard": "^1.1.6"
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+ "php": "^7.4 || ^8.0",
+ "slevomat/coding-standard": "^7.0",
+ "squizlabs/php_codesniffer": "^3.6",
+ "webimpress/coding-standard": "^1.2"
+ },
+ "conflict": {
+ "phpstan/phpdoc-parser": ">=1.6.0"
},
"type": "phpcodesniffer-standard",
"autoload": {
@@ -299,7 +303,7 @@
"type": "community_bridge"
}
],
- "time": "2021-05-17T17:39:41+00:00"
+ "time": "2022-08-24T17:45:47+00:00"
},
{
"name": "laminas/laminas-eventmanager",
@@ -1050,39 +1054,30 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "0.4.9",
+ "version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "98a088b17966bdf6ee25c8a4b634df313d8aa531"
+ "reference": "981cc368a216c988e862a75e526b6076987d1b50"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/98a088b17966bdf6ee25c8a4b634df313d8aa531",
- "reference": "98a088b17966bdf6ee25c8a4b634df313d8aa531",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/981cc368a216c988e862a75e526b6076987d1b50",
+ "reference": "981cc368a216c988e862a75e526b6076987d1b50",
"shasum": ""
},
"require": {
- "php": "^7.1 || ^8.0"
+ "php": "^7.2 || ^8.0"
},
"require-dev": {
- "consistence/coding-standard": "^3.5",
- "ergebnis/composer-normalize": "^2.0.2",
- "jakub-onderka/php-parallel-lint": "^0.9.2",
- "phing/phing": "^2.16.0",
+ "php-parallel-lint/php-parallel-lint": "^1.2",
"phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "^0.12.26",
- "phpstan/phpstan-strict-rules": "^0.12",
- "phpunit/phpunit": "^6.3",
- "slevomat/coding-standard": "^4.7.2",
- "symfony/process": "^4.0"
+ "phpstan/phpstan": "^1.5",
+ "phpstan/phpstan-strict-rules": "^1.0",
+ "phpunit/phpunit": "^9.5",
+ "symfony/process": "^5.2"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "0.4-dev"
- }
- },
"autoload": {
"psr-4": {
"PHPStan\\PhpDocParser\\": [
@@ -1097,9 +1092,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/master"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.5.1"
},
- "time": "2020-08-03T20:32:43+00:00"
+ "time": "2022-05-05T11:32:40+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -2535,37 +2530,37 @@
},
{
"name": "slevomat/coding-standard",
- "version": "6.4.1",
+ "version": "7.2.1",
"source": {
"type": "git",
"url": "https://github.com/slevomat/coding-standard.git",
- "reference": "696dcca217d0c9da2c40d02731526c1e25b65346"
+ "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/696dcca217d0c9da2c40d02731526c1e25b65346",
- "reference": "696dcca217d0c9da2c40d02731526c1e25b65346",
+ "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/aff06ae7a84e4534bf6f821dc982a93a5d477c90",
+ "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90",
"shasum": ""
},
"require": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
- "php": "^7.1 || ^8.0",
- "phpstan/phpdoc-parser": "0.4.5 - 0.4.9",
- "squizlabs/php_codesniffer": "^3.5.6"
+ "php": "^7.2 || ^8.0",
+ "phpstan/phpdoc-parser": "^1.5.1",
+ "squizlabs/php_codesniffer": "^3.6.2"
},
"require-dev": {
- "phing/phing": "2.16.3",
- "php-parallel-lint/php-parallel-lint": "1.2.0",
- "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": "7.5.20|8.5.5|9.4.0"
+ "phing/phing": "2.17.3",
+ "php-parallel-lint/php-parallel-lint": "1.3.2",
+ "phpstan/phpstan": "1.4.10|1.7.1",
+ "phpstan/phpstan-deprecation-rules": "1.0.0",
+ "phpstan/phpstan-phpunit": "1.0.0|1.1.1",
+ "phpstan/phpstan-strict-rules": "1.2.3",
+ "phpunit/phpunit": "7.5.20|8.5.21|9.5.20"
},
"type": "phpcodesniffer-standard",
"extra": {
"branch-alias": {
- "dev-master": "6.x-dev"
+ "dev-master": "7.x-dev"
}
},
"autoload": {
@@ -2580,7 +2575,7 @@
"description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
"support": {
"issues": "https://github.com/slevomat/coding-standard/issues",
- "source": "https://github.com/slevomat/coding-standard/tree/6.4.1"
+ "source": "https://github.com/slevomat/coding-standard/tree/7.2.1"
},
"funding": [
{
@@ -2592,7 +2587,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-05T12:39:37+00:00"
+ "time": "2022-05-25T10:58:12+00:00"
},
{
"name": "squizlabs/php_codesniffer",
@@ -2820,11 +2815,11 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": "^7.3 || ~8.0.0 || ~8.1.0"
+ "php": "^7.4 || ~8.0.0 || ~8.1.0"
},
"platform-dev": [],
"platform-overrides": {
- "php": "7.3.99"
+ "php": "7.4.99"
},
"plugin-api-version": "2.3.0"
}
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 741502f3..cd6a44ac 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -17,7 +17,13 @@
test
-
+
+
+
+
*/test/unit/Adapter/Driver/IbmDb2/StatementTest.php
diff --git a/test/unit/Adapter/Driver/TestAsset/PdoMock.php b/test/unit/Adapter/Driver/TestAsset/PdoMock.php
index d4546048..6f532435 100644
--- a/test/unit/Adapter/Driver/TestAsset/PdoMock.php
+++ b/test/unit/Adapter/Driver/TestAsset/PdoMock.php
@@ -3,6 +3,7 @@
namespace LaminasTest\Db\Adapter\Driver\TestAsset;
use PDO;
+use ReturnTypeWillChange;
/**
* Stub class
@@ -13,14 +14,12 @@ public function __construct()
{
}
- /** @return bool */
- public function beginTransaction()
+ public function beginTransaction(): bool
{
return true;
}
- /** @return bool */
- public function commit()
+ public function commit(): bool
{
return true;
}
@@ -29,13 +28,13 @@ public function commit()
* @param string $attribute
* @return null
*/
+ #[ReturnTypeWillChange]
public function getAttribute($attribute)
{
return null;
}
- /** @return bool */
- public function rollBack()
+ public function rollBack(): bool
{
return true;
}