Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit e72846e

Browse files
authored
Merge pull request #9 from PowerKiKi/drop-bridge
Drop `laminas/laminas-zendframework-bridge` and `zendframework/*` compatibility
2 parents 0476953 + e927d7b commit e72846e

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
},
2121
"require": {
2222
"php": "^7.3 || ~8.0.0",
23-
"laminas/laminas-stdlib": "^2.7.7 || ^3.1",
24-
"laminas/laminas-zendframework-bridge": "^1.0"
23+
"laminas/laminas-stdlib": "^2.7.7 || ^3.1"
2524
},
2625
"require-dev": {
2726
"laminas/laminas-coding-standard": "~1.0.0",
@@ -58,7 +57,7 @@
5857
"test": "phpunit --colors=always",
5958
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
6059
},
61-
"replace": {
62-
"zendframework/zend-file": "^2.8.3"
60+
"conflict": {
61+
"zendframework/zend-file": "*"
6362
}
6463
}

composer.lock

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

test/ClassFileLocatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ public function testIgnoresMethodsNamedAfterKeywords()
191191
}, []);
192192

193193
$expected = [
194-
TestAsset\WithMethodsNamedAfterKeywords\WithReturnTypeDeclaration::class,
195194
TestAsset\WithMethodsNamedAfterKeywords\WithoutReturnTypeDeclaration::class,
195+
TestAsset\WithMethodsNamedAfterKeywords\WithReturnTypeDeclaration::class,
196196
];
197197

198198
$this->assertEquals($expected, $classNames, '', 0.0, 10, true);

0 commit comments

Comments
 (0)