Merge branch 'develop'

Baptouuuu · Baptouuuu · commit 596ab495e5e4 · 2025-02-09T13:12:09.000+01:00
* develop:
  use psalm 6 to support php 8.4
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "issues": "http://github.com/innmind/static-analysis/issues"
     },
     "require": {
-        "vimeo/psalm": "~5.13|dev-master"
+        "vimeo/psalm": "~6.0"
     },
     "minimum-stability": "dev"
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"issues": "http://github.com/innmind/static-analysis/issues"`
`16`	`16`	`},`
`17`	`17`	`"require": {`
`18`		`- "vimeo/psalm": "~5.13\|dev-master"`
	`18`	`+ "vimeo/psalm": "~6.0"`
`19`	`19`	`},`
`20`	`20`	`"minimum-stability": "dev"`
`21`	`21`	`}`