Merge pull request #966 from noplanman/psr12-code-style

Use PSR-12 and fix code issues. Move phpcs parameters into phpcs.xml.

CHANGELOG.md

@@ -6,6 +6,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ## [Unreleased]
 ### Added
 ### Changed
+- Use PSR-12 for code style.
 ### Deprecated
 ### Removed
 ### Fixed

composer.json

@@ -47,7 +47,7 @@
     },
     "scripts": {
         "check-code": [
-            "\"vendor/bin/phpcs\" --standard=phpcs.xml -snp --encoding=utf-8 src/ tests/ --report-width=150"
+            "\"vendor/bin/phpcs\" --standard=phpcs.xml -snp src/ tests/"
         ],
         "test": [
             "\"vendor/bin/phpunit\""

phpcs.xml

@@ -3,8 +3,11 @@
     <description>PHP Code Sniffer</description>
 
     <arg name="colors"/>
+    <arg name="parallel" value="8"/>
+    <arg name="encoding" value="utf-8"/>
+    <arg name="report-width" value="150"/>
 
-    <rule ref="PSR2"/>
+    <rule ref="PSR12"/>
 
     <rule ref="Generic.CodeAnalysis.EmptyStatement"/>
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>

tests/unit/Commands/CommandTest.php

@@ -74,7 +74,7 @@ class CommandTest extends TestCase
             [null],
             [12345],
             ['something'],
-            [new \stdClass],
+            [new \stdClass()],
             [$this->telegram], // only this one is valid
         ];