Merge branch refs/heads/1.12.x into 2.0.x

phpcs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <ruleset name="PHPStan">
 	<config name="php_version" value="70400"/>
+	<arg name="basepath" value="."/>
 	<arg name="colors"/>
 	<arg name="extensions" value="php"/>
 	<arg name="encoding" value="utf-8"/>