Merge branch 'psr-12' into v6

Author: jfcherng

composer.json

@@ -34,7 +34,7 @@
         "friendsofphp/php-cs-fixer": "^2.15",
         "phan/phan": "^2.0",
         "phpunit/phpunit": "^7.5 || ^8.0",
-        "squizlabs/php_codesniffer": "^3.4"
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "config": {
         "sort-packages": true