Merge pull request #9 from PowerKiKi/drop-bridge

Drop `laminas/laminas-zendframework-bridge` and `zendframework/*` compatibility
laminas · Dec 8, 2021 · e72846e · e72846e
2 parents 0476953 + e927d7b
commit e72846e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -20,8 +20,7 @@
     },
     "require": {
         "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "laminas/laminas-stdlib": "^2.7.7 || ^3.1"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~1.0.0",
@@ -58,7 +57,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-file": "^2.8.3"
+    "conflict": {
+        "zendframework/zend-file": "*"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/test/ClassFileLocatorTest.php b/test/ClassFileLocatorTest.php
@@ -191,8 +191,8 @@ public function testIgnoresMethodsNamedAfterKeywords()
         }, []);
 
         $expected = [
-            TestAsset\WithMethodsNamedAfterKeywords\WithReturnTypeDeclaration::class,
             TestAsset\WithMethodsNamedAfterKeywords\WithoutReturnTypeDeclaration::class,
+            TestAsset\WithMethodsNamedAfterKeywords\WithReturnTypeDeclaration::class,
         ];
 
         $this->assertEquals($expected, $classNames, '', 0.0, 10, true);