Skip to content

Commit 4af64c1

Browse files
authored
Merge pull request laminas#252 from laminas/renovate/laminas
Update dependency laminas/laminas-coding-standard to ~2.4.0
2 parents 4136ef0 + 6406976 commit 4af64c1

File tree

4 files changed

+71
-71
lines changed

4 files changed

+71
-71
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"config": {
1919
"sort-packages": true,
2020
"platform": {
21-
"php": "7.3.99"
21+
"php": "7.4.99"
2222
},
2323
"allow-plugins": {
2424
"dealerdirect/phpcodesniffer-composer-installer": true
@@ -31,13 +31,13 @@
3131
}
3232
},
3333
"require": {
34-
"php": "^7.3 || ~8.0.0 || ~8.1.0",
34+
"php": "^7.4 || ~8.0.0 || ~8.1.0",
3535
"laminas/laminas-stdlib": "^3.7.1"
3636
},
3737
"require-dev": {
38-
"laminas/laminas-coding-standard": "~2.2.1",
38+
"laminas/laminas-coding-standard": "^2.4.0",
3939
"laminas/laminas-eventmanager": "^3.4.0",
40-
"laminas/laminas-hydrator": "^3.2 || ^4.3",
40+
"laminas/laminas-hydrator": "^4.3",
4141
"laminas/laminas-servicemanager": "^3.7.0",
4242
"phpunit/phpunit": "^9.5.19"
4343
},

composer.lock

Lines changed: 55 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpcs.xml.dist

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@
1717
<file>test</file>
1818

1919
<!-- Include all rules from Laminas Coding Standard -->
20-
<rule ref="LaminasCodingStandard"/>
20+
<rule ref="LaminasCodingStandard">
21+
<!--
22+
declare(strict_types=1) is too risky for a security-only component,
23+
and should only be reconsidered once this package receives new feature work.
24+
-->
25+
<exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing"/>
26+
</rule>
2127

2228
<rule ref="PSR1.Files.SideEffects">
2329
<exclude-pattern>*/test/unit/Adapter/Driver/IbmDb2/StatementTest.php</exclude-pattern>

test/unit/Adapter/Driver/TestAsset/PdoMock.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace LaminasTest\Db\Adapter\Driver\TestAsset;
44

55
use PDO;
6+
use ReturnTypeWillChange;
67

78
/**
89
* Stub class
@@ -13,14 +14,12 @@ public function __construct()
1314
{
1415
}
1516

16-
/** @return bool */
17-
public function beginTransaction()
17+
public function beginTransaction(): bool
1818
{
1919
return true;
2020
}
2121

22-
/** @return bool */
23-
public function commit()
22+
public function commit(): bool
2423
{
2524
return true;
2625
}
@@ -29,13 +28,13 @@ public function commit()
2928
* @param string $attribute
3029
* @return null
3130
*/
31+
#[ReturnTypeWillChange]
3232
public function getAttribute($attribute)
3333
{
3434
return null;
3535
}
3636

37-
/** @return bool */
38-
public function rollBack()
37+
public function rollBack(): bool
3938
{
4039
return true;
4140
}

0 commit comments

Comments
 (0)