Merge pull request #13 from PowerKiKi/drop-bridge

Ocramius · web-flow · commit 0330a1ba84c6 · 2021-12-08T16:01:55.000+01:00
Drop `laminas/laminas-zendframework-bridge` and `zendframework/*` compatibility
diff --git a/composer.json b/composer.json
@@ -27,7 +27,6 @@
     },
     "require": {
         "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "mezzio/mezzio-authentication": "^1.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1"
@@ -60,7 +59,7 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
         "static-analysis": "psalm --shepherd --stats"
     },
-    "replace": {
-        "zendframework/zend-expressive-authentication-basic": "^1.0.0"
+    "conflict": {
+        "zendframework/zend-expressive-authentication-basic": "*"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files>
+  <file src="vendor/symfony/polyfill-mbstring/bootstrap80.php">
+    <ParseError occurrences="1">
+      <code>=</code>
+    </ParseError>
+  </file>
+</files>
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -4,6 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src"/>

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`5`	`5`	`xmlns="https://getpsalm.org/schema/config"`
`6`	`6`	`xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"`
	`7`	`+ errorBaseline="psalm-baseline.xml"`
`7`	`8`	`>`
`8`	`9`	`<projectFiles>`
`9`	`10`	`<directory name="src"/>`