Merge branch '2.11.x' into 3.0.x

.gitattributes

@@ -1,15 +1,16 @@
 /.appveyor.yml export-ignore
+/composer.lock export-ignore
+/docs export-ignore
+/.doctrine-project.json export-ignore
 /.gitattributes export-ignore
 /.github export-ignore
 /.gitignore export-ignore
-/.scrutinizer.yml export-ignore
-/.travis.yml export-ignore
-/build.properties export-ignore
-/build.xml export-ignore
-/composer.lock export-ignore
-/docs export-ignore
 /phpcs.xml.dist export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
 /run-all.sh export-ignore
+/.scrutinizer.yml export-ignore
+/SECURITY.md export-ignore
 /tests export-ignore
+/.travis.yml export-ignore
+/UPGRADE.md export-ignore

composer.json

@@ -40,7 +40,7 @@
     "require-dev": {
         "doctrine/coding-standard": "^6.0",
         "jetbrains/phpstorm-stubs": "^2019.1",
-        "phpstan/phpstan": "^0.11.3",
+        "phpstan/phpstan": "^0.12",
         "phpunit/phpunit": "^9.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
     },