Fix code style issues, fix grumphp TypeError

.php_cs → .php-cs-fixer.php

@@ -3,13 +3,13 @@
 use PhpCsFixer\Finder;
 use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
 
-return Config::create()
+return (new Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
         'array_syntax' => ['syntax' => 'short'],
         'ordered_imports' => [
-            'importsOrder' => [
+            'imports_order' => [
                 OrderedImportsFixer::IMPORT_TYPE_CLASS,
                 OrderedImportsFixer::IMPORT_TYPE_CONST,
                 OrderedImportsFixer::IMPORT_TYPE_FUNCTION,
@@ -22,7 +22,7 @@
         'dir_constant' => true,
         'ereg_to_preg' => true,
         'modernize_types_casting' => true,
-        'no_multiline_whitespace_before_semicolons' => true,
+        'multiline_whitespace_before_semicolons' => false,
         'no_php4_constructor' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
@@ -34,6 +34,7 @@
         'yoda_style' => false,
         'increment_style' => false,
         'phpdoc_no_empty_return' => false,
+        'single_line_throw' => false,
     ])
     ->setFinder(
         Finder::create()

CHANGELOG.md

@@ -8,6 +8,8 @@ There are next changes:
 - PHPUnit version upgraded to 9
 - Add run unit tests Github action
 - Remove travis
+- Fix code style issues
+- Fix by workaround grumphp issue with TypeError, see [phpro/grumphp#957](https://github.com/phpro/grumphp/issues/957)
 
 ### [v0.4.1]
 

composer.json

@@ -8,12 +8,15 @@
     },
     "require-dev": {
         "ext-dom": "*",
-        "roave/security-advisories": "dev-master",
+        "roave/security-advisories": "dev-latest",
         "phpro/grumphp": "^1.5",
         "friendsofphp/php-cs-fixer": "^2.12.1",
         "phpunit/phpunit": "^9.0",
         "amphp/log": "^1.0.0"
     },
+    "conflict": {
+        "amphp/parallel-functions": "=1.1.0"
+    },
     "license": "MIT",
     "authors": [
         {