Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependency laminas/laminas-coding-standard to ~2.4.0 #252

Merged
merged 2 commits into from
Aug 24, 2022
Merged

Update dependency laminas/laminas-coding-standard to ~2.4.0 #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f42869c
Update dependency laminas/laminas-coding-standard to ~2.4.0
renovate[bot] Aug 24, 2022
6406976
Upgraded to `laminas/laminas-coding-standard:^2.4`, excluded strict t…
Ocramius Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"config": {
"sort-packages": true,
"platform": {
"php": "7.3.99"
"php": "7.4.99"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
Expand All @@ -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"
},
Expand Down
115 changes: 55 additions & 60 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion phpcs.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@
<file>test</file>

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

<rule ref="PSR1.Files.SideEffects">
<exclude-pattern>*/test/unit/Adapter/Driver/IbmDb2/StatementTest.php</exclude-pattern>
Expand Down
11 changes: 5 additions & 6 deletions test/unit/Adapter/Driver/TestAsset/PdoMock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace LaminasTest\Db\Adapter\Driver\TestAsset;

use PDO;
use ReturnTypeWillChange;

/**
* Stub class
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down