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.

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

Update dependency laminas/laminas-coding-standard to v3 #340

Merged
merged 2 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
"webmozart/assert": "^1.9"
},
"require-dev": {
"laminas/laminas-cli": "^1.7",
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-config-aggregator": "^1.13",
"laminas/laminas-serializer": "^3.0",
"phpunit/phpunit": "^9.5.27",
"laminas/laminas-cli": "^1.11",
"laminas/laminas-coding-standard": "~3.0.1",
"laminas/laminas-config-aggregator": "^1.17",
"laminas/laminas-serializer": "^3.1",
"phpunit/phpunit": "^9.6.21",
"psalm/plugin-phpunit": "^0.19.0",
"vimeo/psalm": "^5.24"
"vimeo/psalm": "^5.26.1"
},
"conflict": {
"laminas/laminas-serializer": "<3.0",
Expand Down
335 changes: 161 additions & 174 deletions composer.lock

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions src/Pattern/PatternOptions.php
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,6 @@ public function setObjectCacheMethods(array $objectCacheMethods): self

/**
* Get list of object methods for which to cache return values
*
* @return array
*/
public function getObjectCacheMethods(): array
{
Expand Down Expand Up @@ -455,8 +453,6 @@ public function setObjectNonCacheMethods(array $objectNonCacheMethods): self

/**
* Get list of object methods for which NOT to cache return values
*
* @return array
*/
public function getObjectNonCacheMethods(): array
{
Expand Down Expand Up @@ -505,8 +501,6 @@ public function getPublicDir(): null|string
/**
* Recursively apply strtolower on all values of an array, and return as a
* list of unique values
*
* @return array
*/
protected function recursiveStrtolower(array $array): array
{
Expand All @@ -519,8 +513,6 @@ protected function recursiveStrtolower(array $array): array
* Recursively casts values to lowercase, then determines if any are in a
* list of methods not handled, raising an exception if so.
*
* @param array $methods
* @return array
* @throws Exception\InvalidArgumentException
*/
protected function normalizeObjectMethods(array $methods): array
Expand Down
1 change: 0 additions & 1 deletion src/Service/StorageAdapterFactoryInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

/**
* @psalm-type InternalOptionalPriorityConfigurationType = array{priority?:int}
* NOTE: have to re-declare this here until https://github.com/vimeo/psalm/issues/5148 is fixed.
* @psalm-type InternalPluginArrayConfigurationType = array{name:non-empty-string,options?:array<string,mixed>}
* @psalm-type PluginArrayConfigurationWithPriorityType =
* InternalPluginArrayConfigurationType&InternalOptionalPriorityConfigurationType
Expand Down
1 change: 0 additions & 1 deletion test/Pattern/AbstractCommonStoragePatternTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
abstract class AbstractCommonStoragePatternTest extends AbstractCommonPatternTest
{
/** @var StorageInterface&MockObject */
protected StorageInterface&MockObject $storage;

/** @var TPattern */
Expand Down
1 change: 1 addition & 0 deletions test/Psr/SimpleCache/SimpleCacheDecoratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
* try/catch blocks and assert identity against the result of getPrevious().
*
* phpcs:disable Generic.Files.LineLength.TooLong
*
* @psalm-import-type SupportedDataTypesArrayShape from Capabilities
*/
final class SimpleCacheDecoratorTest extends TestCase
Expand Down
1 change: 0 additions & 1 deletion test/Psr/SimpleCache/TestAsset/TtlStorage.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ class TtlStorage extends Adapter\AbstractAdapter
{
private array $data = [];

/** @var array */
public array $ttl = [];

protected function internalGetItem(string $normalizedKey, ?bool &$success = null, mixed &$casToken = null): mixed
Expand Down