Merge branch '1.x' into 2.x-merge

# Conflicts:
#	.github/workflows/ci.yml
#	.phive/phars.xml
#	composer.json
#	psalm.xml

Author: LordSimal

psalm-baseline.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.x-dev@">
+  <file src="src/Plugin.php">
+    <InvalidArgument occurrences="1">
+      <code>$pathMap</code>
+    </InvalidArgument>
+  </file>
+</files>