Skip to content

Commit 5b1eabe

Browse files
authored
Support laminas-cache:3, drop laminas-cache:2 (#35)
1 parent f8ba97d commit 5b1eabe

File tree

5 files changed

+13
-25
lines changed

5 files changed

+13
-25
lines changed

.github/workflows/integrate.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ jobs:
7272

7373
- name: "Install lowest dependencies"
7474
if: ${{ matrix.dependencies == 'lowest' }}
75-
run: "composer update --no-interaction --no-progress --ignore-platform-reqs --prefer-lowest"
75+
run: "composer update --no-interaction --no-progress --prefer-lowest"
7676

7777
- name: "Install highest dependencies"
7878
if: ${{ matrix.dependencies == 'highest' }}
79-
run: "composer update --no-interaction --no-progress --ignore-platform-reqs"
79+
run: "composer update --no-interaction --no-progress"
8080

8181
- name: "Run tests"
8282
timeout-minutes: 5
@@ -115,7 +115,7 @@ jobs:
115115
restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
116116

117117
- name: "Install dependencies"
118-
run: "composer update --no-interaction --no-progress --ignore-platform-reqs"
118+
run: "composer update --no-interaction --no-progress"
119119

120120
- name: "Run tests"
121121
timeout-minutes: 3
@@ -160,7 +160,7 @@ jobs:
160160
restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
161161

162162
- name: "Install dependencies"
163-
run: "composer update --no-interaction --no-progress --ignore-platform-reqs"
163+
run: "composer update --no-interaction --no-progress"
164164

165165
- name: "Check coding standards"
166166
run: "vendor/bin/php-cs-fixer fix --verbose --dry-run --diff"
@@ -198,7 +198,7 @@ jobs:
198198
restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
199199

200200
- name: "Install dependencies"
201-
run: "composer update --no-interaction --no-progress --ignore-platform-reqs"
201+
run: "composer update --no-interaction --no-progress"
202202

203203
- name: "Run static analysis"
204204
run: "vendor/bin/phpstan analyse --no-progress --error-format=checkstyle | cs2pr"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ all: csfix static-analysis test
22
@echo "Done."
33

44
vendor: composer.json
5-
composer update --ignore-platform-reqs
5+
composer update
66
touch vendor
77

88
.PHONY: csfix

composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,31 @@
1818
}
1919
],
2020
"require": {
21-
"php": ">=8.0",
22-
"phpstan/phpstan": "^1.5.6"
21+
"php": "~8.0.0 || ~8.1.0",
22+
"phpstan/phpstan": "^1.7.3"
2323
},
2424
"require-dev": {
25-
"laminas/laminas-cache": "^2.13.2",
25+
"laminas/laminas-cache": "^3.1.3",
26+
"laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
2627
"laminas/laminas-filter": "^2.14.0",
2728
"laminas/laminas-form": "^3.1.1",
2829
"laminas/laminas-hydrator": "^4.3.1",
2930
"laminas/laminas-i18n": "^2.15.0",
3031
"laminas/laminas-inputfilter": "^2.13.0",
31-
"laminas/laminas-log": "^2.15.0",
32+
"laminas/laminas-log": "^2.15.1",
3233
"laminas/laminas-mail": "^2.16.0",
3334
"laminas/laminas-mvc": "^3.3.3",
3435
"laminas/laminas-paginator": "^2.12.2",
3536
"laminas/laminas-validator": "^2.17.0",
3637
"malukenho/mcbumpface": "^1.1.5",
3738
"phpstan/phpstan-deprecation-rules": "^1.0.0",
38-
"phpstan/phpstan-phpunit": "^1.1.0",
39+
"phpstan/phpstan-phpunit": "^1.1.1",
3940
"phpunit/phpunit": "^9.5.20",
4041
"slam/php-cs-fixer-extensions": "^v3.1.0",
4142
"slam/php-debug-r": "^v1.7.0"
4243
},
4344
"conflict": {
44-
"laminas/laminas-cache": "<2.13",
45+
"laminas/laminas-cache": "<3.1",
4546
"laminas/laminas-filter": "<2.14",
4647
"laminas/laminas-form": "<3.1",
4748
"laminas/laminas-hydrator": "<4.3",

phpstan-baseline.neon

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,3 @@ parameters:
44
message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'LaminasPhpStan\\\\\\\\TestAsset\\\\\\\\BarService' and Laminas\\\\Stdlib\\\\DispatchableInterface will always evaluate to false\\.$#"
55
count: 1
66
path: tests/Type/Laminas/ServiceManagerLoaderTest.php
7-
8-
-
9-
message:
10-
"""
11-
#^Fetching class constant class of deprecated class Laminas\\\\Cache\\\\PatternPluginManager\\:
12-
This will be removed in v3\\.0\\.0\\. Cache pattern will require dependency injection and thus, a generic
13-
plugin manager makes no sense anymore\\.$#
14-
"""
15-
count: 1
16-
path: tests/Type/Laminas/ServiceManagerLoaderTest.php
17-

tests/Type/Laminas/ServiceManagerLoaderTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace LaminasPhpStan\Tests\Type\Laminas;
66

7-
use Laminas\Cache\PatternPluginManager as CachePatternPluginManager;
87
use Laminas\Cache\Storage\AdapterPluginManager as CacheStorageAdapterPluginManager;
98
use Laminas\Cache\Storage\PluginManager as CacheStoragePluginManager;
109
use Laminas\Config\ReaderPluginManager as ConfigReaderPluginManager;
@@ -60,7 +59,6 @@ public function testGetSubserviceDependingOnCallOnTypeGiven(): void
6059
{
6160
$serviceManagerLoader = new ServiceManagerLoader(null);
6261
$knownPluginManagers = [
63-
CachePatternPluginManager::class,
6462
CacheStorageAdapterPluginManager::class,
6563
CacheStoragePluginManager::class,
6664
// ConfigReaderPluginManager::class,

0 commit comments

Comments
 (0)