Swich from PHP CS Fixer to PHP CS and PSR-12

Author: realFlowControl

.php_cs.dist

@@ -23,8 +23,8 @@ before_script:
     - composer install --no-interaction --no-progress --no-suggest --no-ansi
 
 script:
-    - composer phpcsfix-test
-    - composer phpstan
-    - composer psalm
-    - composer phpunit 
-    - composer infection
+    - composer test:lint
+    - composer test:phpstan
+    - composer test:psalm
+    - composer test:unit 
+    - composer test:mutation

.travis.yml

@@ -20,18 +20,18 @@
         }
     },
     "scripts": {
-        "phpcsfix-test": "./tools/php-cs-fixer fix --config .php_cs.dist --dry-run",
-        "phpcsfix": "./tools/php-cs-fixer fix --config .php_cs.dist",
-        "phpstan": "./tools/phpstan analyse --level max examples/ src/",
-        "psalm": "./tools/psalm src/ examples/",
-        "phpunit": "./tools/phpunit",
-        "infection": "./tools/infection --min-msi=40 --no-interaction --no-ansi --no-progress",
+        "fix": "./tools/phpcbf --standard=PSR12 --extensions=php -p src/ tests/ examples/",
+        "test:lint": "./tools/phpcs --standard=PSR12 --extensions=php -p src/ tests/ examples/",
+        "test:phpstan": "./tools/phpstan analyse --level max examples/ src/",
+        "test:psalm": "./tools/psalm src/ examples/",
+        "test:unit": "./tools/phpunit",
+        "test:mutation": "./tools/infection --min-msi=60 --no-interaction --no-ansi --no-progress",
         "test": [
-            "@phpcsfix",
-            "@phpstan",
-            "@psalm",
-            "@phpunit",
-            "@infection"
+            "@test:lint",
+            "@test:phpstan",
+            "@test:psalm",
+            "@test:unit",
+            "@test:mutation"
         ]
     }
 }

composer.json

@@ -22,7 +22,7 @@
     print_r($data);
 });
 
-touch(__DIR__.'/testfile');
-unlink(__DIR__.'/testfile');
+touch(__DIR__ . '/testfile');
+unlink(__DIR__ . '/testfile');
 
 $loop->run();

examples/01-watcher.php

@@ -3,6 +3,7 @@
   <phar name="phpunit" version="^8.4.3" installed="8.4.3" location="./tools/phpunit" copy="true"/>
   <phar name="phpstan" version="^0.11.19" installed="0.11.19" location="./tools/phpstan" copy="true"/>
   <phar name="psalm" version="^3.6.4" installed="3.6.4" location="./tools/psalm" copy="true"/>
-  <phar name="php-cs-fixer" version="^2.16.0" installed="2.16.0" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="infection" version="^0.14.2" installed="0.14.2" location="./tools/infection" copy="true"/>
+  <phar name="phpcs" version="^3.4.2" installed="3.4.2" location="./tools/phpcs" copy="true"/>
+  <phar name="phpcbf" version="^3.5.2" installed="3.5.2" location="./tools/phpcbf" copy="true"/>
 </phive>

phive.xml

@@ -36,7 +36,8 @@ final class InotifyStream extends EventEmitter
     public function __construct($stream, LoopInterface $loop)
     {
         if (!\is_resource($stream) ||
-            \get_resource_type($stream) !== "stream") {
+            \get_resource_type($stream) !== "stream"
+        ) {
             throw new \InvalidArgumentException(
                 'First parameter must be a valid stream resource'
             );
@@ -46,7 +47,8 @@ public function __construct($stream, LoopInterface $loop)
         $meta = \stream_get_meta_data($stream);
         if (isset($meta['mode']) &&
             $meta['mode'] !== '' &&
-            \strpos($meta['mode'], 'r') === \strpos($meta['mode'], '+')) {
+            \strpos($meta['mode'], 'r') === \strpos($meta['mode'], '+')
+        ) {
             throw new \InvalidArgumentException(
                 'Given stream resource is not opened in read mode'
             );
@@ -93,7 +95,8 @@ public function pause(): void
     public function resume(): void
     {
         if (!$this->listening &&
-            !$this->closed) {
+            !$this->closed
+        ) {
             $this->loop->addReadStream($this->stream, [$this, 'handleData']);
             $this->listening = true;
         }

src/InotifyStream.php

@@ -61,8 +61,8 @@ public function testValidStreamWithEvent(): void
         inotify_add_watch($fd, __DIR__, IN_CLOSE_WRITE);
         $watcher = new InotifyStream($fd, $loop);
         $watcher->on('event', $this->expectCallableOnce());
-        touch(__DIR__.'/testfile');
-        unlink(__DIR__.'/testfile');
+        touch(__DIR__ . '/testfile');
+        unlink(__DIR__ . '/testfile');
         $watcher->handleData();
         fclose($fd);
     }