From c6a4f106aadfe0b907174453879457365b7436a0 Mon Sep 17 00:00:00 2001
From: "seregazhuk88@gmail.com" <seregazhuk88@gmail.com>
Date: Wed, 20 May 2020 20:31:53 +0300
Subject: [PATCH 01/10] Use different fs watchers

---
 .travis.yml                                   | 16 ----
 CHANGELOG.md                                  |  4 +-
 README.md                                     |  9 ++
 composer.json                                 |  5 +-
 phpunit.xml.dist                              |  3 -
 src/Filesystem/ChangesListener.php            |  7 +-
 src/Filesystem/Factory.php                    | 22 +++++
 .../FsWatchBased/ChangesListener.php          | 89 +++++++++++++++++++
 .../ResourceWatcherBased/ChangesListener.php  | 28 +++---
 src/Watcher.php                               | 10 +--
 src/WatcherCommand.php                        | 20 +++--
 tests/Feature/ChangesListenerTest.php         |  4 +-
 tests/Feature/Helper/Filesystem.php           |  2 +-
 tests/Feature/Helper/WatcherTestCase.php      |  5 +-
 tests/Feature/IgnoreFilesTest.php             |  1 -
 15 files changed, 168 insertions(+), 57 deletions(-)
 create mode 100644 src/Filesystem/Factory.php
 create mode 100644 src/Filesystem/FsWatchBased/ChangesListener.php

diff --git a/.travis.yml b/.travis.yml
index 12a2442..dae8b72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,22 +2,6 @@ language: php
 
 jobs:
   include:
-    - stage: "PHP7.2 - lowest"
-      php: 7.2
-      script:
-        - composer update -n --prefer-dist --prefer-lowest --no-suggest
-        - composer dump-autoload
-        - composer ci:tests
-        - composer ci:php:psalm
-
-    - stage: "PHP7.3 - highest"
-      php: 7.3
-      script:
-        - composer update -n --prefer-dist --no-suggest
-        - composer dump-autoload
-        - composer ci:tests
-        - composer ci:php:psalm
-
     - stage: "PHP7.4 - highest"
       php: 7.4
       script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73c77d6..cf9a5e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
-## 0.6.0 (2020-05-11)
+## 0.6.0 (2020-05-20)
 * Fix: don't use child process for resource watching
+* Feature: add fswatch support
+* Fix: min required PHP version is set to 7.4
 
 ## 0.5.2 (2019-12-07)
 * Fix: use predefined const for PHP binary [#59](https://github.com/seregazhuk/php-watcher/pull/59)
diff --git a/README.md b/README.md
index 7538d8e..bd9c30b 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ PHP-watcher does not require any additional changes to your code or method of
 * [Default executable](#default-executable)
 * [Gracefully reloading down your script](#gracefully-reloading-down-your-script)
 * [Automatic restart](#automatic-restart)
+* [Performance](#performance)
 * [Spinner](#spinner)
 
 ## Installation
@@ -235,6 +236,14 @@ script crashes PHP-watcher will notify you about that.
 
 ![app exit](images/exit.svg)
 
+## Performance
+
+The watcher can use different strategies to monitor your file system changes. Under the hood it 
+detects the environment and chooses the best suitable strategy.
+
+By default, it uses [yosymfony/resource-watcher](https://github.com/yosymfony/resource-watcher
+) which 
+
 ## Spinner
 
 By default the watcher outputs a nice spinner which indicates that the process is running
diff --git a/composer.json b/composer.json
index 9bed73c..e3e63d2 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.4",
         "ext-json": "*",
         "ext-pcntl": "*",
         "yosymfony/resource-watcher": "^2.0",
@@ -34,7 +34,8 @@
         "react/child-process": "^0.6.1",
         "react/stream": "^1.0.0",
         "symfony/finder": "^4.3 || ^5.0",
-        "alecrabbit/php-cli-snake": "^0.5"
+        "alecrabbit/php-cli-snake": "^0.5",
+        "seregazhuk/reactphp-fswatch": "^0.1.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4c99dc1..23319e3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,9 +16,6 @@
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src</directory>
-            <exclude>
-                <file>src/Filesystem/watcher.php</file>
-            </exclude>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/src/Filesystem/ChangesListener.php b/src/Filesystem/ChangesListener.php
index 5acf8d7..00c0f74 100644
--- a/src/Filesystem/ChangesListener.php
+++ b/src/Filesystem/ChangesListener.php
@@ -1,13 +1,14 @@
 <?php
 
 declare(strict_types=1);
-namespace seregazhuk\PhpWatcher\Filesystem;
 
-use seregazhuk\PhpWatcher\Config\WatchList;
+namespace seregazhuk\PhpWatcher\Filesystem;
 
 interface ChangesListener
 {
-    public function start(WatchList $watchList): void;
+    public function start(): void;
 
     public function onChange(callable $callback): void;
+
+    public function stop(): void;
 }
diff --git a/src/Filesystem/Factory.php b/src/Filesystem/Factory.php
new file mode 100644
index 0000000..8e43427
--- /dev/null
+++ b/src/Filesystem/Factory.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace seregazhuk\PhpWatcher\Filesystem;
+
+use React\EventLoop\LoopInterface;
+use seregazhuk\PhpWatcher\Config\WatchList;
+use seregazhuk\PhpWatcher\Filesystem\FsWatchBased\ChangesListener as FsWatchBased;
+use seregazhuk\PhpWatcher\Filesystem\ResourceWatcherBased\ChangesListener as ResourceBased;
+
+final class Factory
+{
+    public static function create(WatchList $watchList, LoopInterface $loop): ChangesListener
+    {
+        if (FsWatchBased::isAvailable()) {
+            return new FsWatchBased($watchList, $loop);
+        }
+
+        return new ResourceBased($watchList, $loop);
+    }
+}
diff --git a/src/Filesystem/FsWatchBased/ChangesListener.php b/src/Filesystem/FsWatchBased/ChangesListener.php
new file mode 100644
index 0000000..dab06f9
--- /dev/null
+++ b/src/Filesystem/FsWatchBased/ChangesListener.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+namespace seregazhuk\PhpWatcher\Filesystem\FsWatchBased;
+
+use Evenement\EventEmitter;
+use React\EventLoop\LoopInterface;
+use seregazhuk\PhpWatcher\Config\WatchList;
+use seregazhuk\PhpWatcher\Filesystem\ChangesListener as ChangesListenerInterface;
+use Seregazhuk\ReactFsWatch\FsWatch;
+
+final class ChangesListener extends EventEmitter implements ChangesListenerInterface
+{
+    private FsWatch $fsWatch;
+
+    public function __construct(WatchList $watchList, LoopInterface $loop)
+    {
+        $this->fsWatch = new FsWatch($this->makeOptions($watchList), $loop);
+    }
+
+    public static function isAvailable(): bool
+    {
+        return FsWatch::isAvailable();
+    }
+
+    public function start(): void
+    {
+        $this->fsWatch->run();
+        $this->fsWatch->on(
+            'change',
+            function () {
+                $this->emit('change');
+            }
+        );
+    }
+
+    public function onChange(callable $callback): void
+    {
+        $this->on('change', $callback);
+    }
+
+    public function stop(): void
+    {
+        $this->fsWatch->stop();
+    }
+
+    private function makeOptions(WatchList $watchList): string
+    {
+        $options = [];
+
+        // first come paths
+        if ($watchList->paths()) {
+            $options[] = implode(' ', $watchList->paths());
+        }
+
+        // then we ignore
+        if ($watchList->ignore()) {
+            $options[] = '-e ' . implode(' ', $watchList->ignore());
+        }
+
+        // then include
+        if ($watchList->fileExtensions()) {
+            $options = array_merge($options, $this->makeIncludeOptions($watchList));
+        }
+
+        $options[] = '-I'; // Case-insensitive
+
+        return implode(' ', $options);
+    }
+
+    private function makeIncludeOptions(WatchList $watchList): array
+    {
+        $options = [];
+        // Before including we need to ignore everything
+        if (empty($watchList->ignore())) {
+            $options[] = '-e ".*"';
+        }
+
+        $regexpWithExtensions = array_map(
+            static function ($extension) {
+                return str_replace('*.', '.', $extension) . '$';
+            },
+            $watchList->fileExtensions()
+        );
+        $options[] = '-i ' . implode(' ', $regexpWithExtensions);
+        return $options;
+    }
+}
diff --git a/src/Filesystem/ResourceWatcherBased/ChangesListener.php b/src/Filesystem/ResourceWatcherBased/ChangesListener.php
index 7fe5955..2cb80d2 100644
--- a/src/Filesystem/ResourceWatcherBased/ChangesListener.php
+++ b/src/Filesystem/ResourceWatcherBased/ChangesListener.php
@@ -1,31 +1,35 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace seregazhuk\PhpWatcher\Filesystem\ResourceWatcherBased;
 
 use Evenement\EventEmitter;
 use React\EventLoop\LoopInterface;
 use seregazhuk\PhpWatcher\Config\WatchList;
+use seregazhuk\PhpWatcher\Filesystem\ChangesListener as ChangesListenerInterface;
+use Yosymfony\ResourceWatcher\ResourceWatcher;
 
-final class ChangesListener extends EventEmitter implements
-    \seregazhuk\PhpWatcher\Filesystem\ChangesListener
+final class ChangesListener extends EventEmitter implements ChangesListenerInterface
 {
     private const INTERVAL = 0.15;
 
-    private $loop;
+    private LoopInterface $loop;
+
+    private ResourceWatcher $watcher;
 
-    public function __construct(LoopInterface $loop)
+    public function __construct(WatchList $watchList, LoopInterface $loop)
     {
         $this->loop = $loop;
+        $this->watcher = ResourceWatcherBuilder::create($watchList);
     }
 
-    public function start(WatchList $watchList): void
+    public function start(): void
     {
-        $watcher = ResourceWatcherBuilder::create($watchList);
-
         $this->loop->addPeriodicTimer(
             self::INTERVAL,
-            function () use ($watcher) {
-                if ($watcher->findChanges()->hasChanges()) {
+            function () {
+                if ($this->watcher->findChanges()->hasChanges()) {
                     $this->emit('change');
                 }
             }
@@ -36,4 +40,8 @@ public function onChange(callable $callback): void
     {
         $this->on('change', $callback);
     }
+
+    public function stop(): void
+    {
+    }
 }
diff --git a/src/Watcher.php b/src/Watcher.php
index 76c138f..b447a7a 100644
--- a/src/Watcher.php
+++ b/src/Watcher.php
@@ -5,14 +5,13 @@
 namespace seregazhuk\PhpWatcher;
 
 use React\EventLoop\LoopInterface;
-use seregazhuk\PhpWatcher\Config\WatchList;
-use seregazhuk\PhpWatcher\Filesystem\ResourceWatcherBased\ChangesListener;
+use seregazhuk\PhpWatcher\Filesystem\ChangesListener;
 
 final class Watcher
 {
-    private $loop;
+    private LoopInterface $loop;
 
-    private $filesystemListener;
+    private ChangesListener $filesystemListener;
 
     public function __construct(LoopInterface $loop, ChangesListener $filesystemListener)
     {
@@ -22,13 +21,12 @@ public function __construct(LoopInterface $loop, ChangesListener $filesystemList
 
     public function startWatching(
         ProcessRunner $processRunner,
-        WatchList $watchList,
         int $signal,
         float $delayToRestart
     ): void {
         $processRunner->start();
 
-        $this->filesystemListener->start($watchList);
+        $this->filesystemListener->start();
         $this->filesystemListener->onChange(
             static function () use ($processRunner, $signal, $delayToRestart) {
                 $processRunner->stop($signal);
diff --git a/src/WatcherCommand.php b/src/WatcherCommand.php
index bcb65a6..58ac603 100644
--- a/src/WatcherCommand.php
+++ b/src/WatcherCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace seregazhuk\PhpWatcher;
@@ -9,7 +10,8 @@
 use seregazhuk\PhpWatcher\Config\Builder;
 use seregazhuk\PhpWatcher\Config\Config;
 use seregazhuk\PhpWatcher\Config\InputExtractor;
-use seregazhuk\PhpWatcher\Filesystem\ResourceWatcherBased\ChangesListener;
+use seregazhuk\PhpWatcher\Filesystem\Factory as ChangesListenerFactory;
+use seregazhuk\PhpWatcher\Filesystem\ChangesListener;
 use seregazhuk\PhpWatcher\Screen\Screen;
 use seregazhuk\PhpWatcher\Screen\SpinnerFactory;
 use Symfony\Component\Console\Command\Command as BaseCommand;
@@ -60,18 +62,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $config = $this->buildConfig(new InputExtractor($input));
         $spinner = SpinnerFactory::create($output, $config->spinnerDisabled());
 
-        $this->addTerminationListeners($loop, $spinner);
-
         $screen = new Screen(new SymfonyStyle($input, $output), $spinner);
-        $filesystem = new ChangesListener($loop);
+        $filesystem = ChangesListenerFactory::create($config->watchList(), $loop);
 
         $screen->showOptions($config->watchList());
         $processRunner = new ProcessRunner($loop, $screen, $config->command());
+        $this->addTerminationListeners($loop, $spinner, $filesystem, $processRunner);
 
         $watcher = new Watcher($loop, $filesystem);
         $watcher->startWatching(
             $processRunner,
-            $config->watchList(),
             $config->signalToReload(),
             $config->delay()
         );
@@ -82,10 +82,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
     /**
      * When terminating the watcher we need to manually restore the cursor after the spinner.
      */
-    private function addTerminationListeners(LoopInterface $loop, SpinnerInterface $spinner): void
-    {
-        $func = static function (int $signal) use ($spinner): void {
+    private function addTerminationListeners(
+        LoopInterface $loop,
+        SpinnerInterface $spinner,
+        ChangesListener $changesListener
+    ): void {
+        $func = static function (int $signal) use ($spinner, $changesListener): void {
             $spinner->end();
+            $changesListener->stop();
             exit($signal);
         };
 
diff --git a/tests/Feature/ChangesListenerTest.php b/tests/Feature/ChangesListenerTest.php
index 0753eb4..30a30d4 100644
--- a/tests/Feature/ChangesListenerTest.php
+++ b/tests/Feature/ChangesListenerTest.php
@@ -19,8 +19,8 @@ final class ChangesListenerTest extends TestCase
     public function it_emits_change_event_on_changes(): void
     {
         $loop = Factory::create();
-        $listener = new ChangesListener($loop);
-        $listener->start(new WatchList([Filesystem::fixturesDir()]));
+        $listener = new ChangesListener(new WatchList([Filesystem::fixturesDir()]), $loop);
+        $listener->start();
 
         $loop->addTimer(1, [Filesystem::class, 'createHelloWorldPHPFile']);
         $eventWasEmitted = false;
diff --git a/tests/Feature/Helper/Filesystem.php b/tests/Feature/Helper/Filesystem.php
index ef2f974..e1af2f1 100644
--- a/tests/Feature/Helper/Filesystem.php
+++ b/tests/Feature/Helper/Filesystem.php
@@ -75,7 +75,7 @@ public static function changeFileContentsWith(string $file, string $contents): v
 
     public static function fixturesDir(): string
     {
-        return str_replace('tests/', '', self::FIXTURES_DIR);
+        return self::FIXTURES_DIR;
     }
 
     private static function buildFilePath(string $filename): string
diff --git a/tests/Feature/Helper/WatcherTestCase.php b/tests/Feature/Helper/WatcherTestCase.php
index a9cd715..0ee5b73 100644
--- a/tests/Feature/Helper/WatcherTestCase.php
+++ b/tests/Feature/Helper/WatcherTestCase.php
@@ -11,10 +11,7 @@ abstract class WatcherTestCase extends TestCase
 
     private const WAIT_TIMEOUT_MS = 5000000;
 
-    /**
-     * @var Process
-     */
-    private $watcherRunner;
+    private Process $watcherRunner;
 
     protected function wait(): void
     {
diff --git a/tests/Feature/IgnoreFilesTest.php b/tests/Feature/IgnoreFilesTest.php
index 2ccd526..9cc6df0 100644
--- a/tests/Feature/IgnoreFilesTest.php
+++ b/tests/Feature/IgnoreFilesTest.php
@@ -7,7 +7,6 @@
 
 final class IgnoreFilesTest extends WatcherTestCase
 {
-    /** @test */
     public function it_doesnt_reload_when_ignored_files_change(): void
     {
         $fileToWatch = Filesystem::createHelloWorldPHPFile();

From 97dc013af31b0d6a339cfb5f8d88107cace7def7 Mon Sep 17 00:00:00 2001
From: "seregazhuk88@gmail.com" <seregazhuk88@gmail.com>
Date: Sat, 13 Jun 2020 23:02:14 +0300
Subject: [PATCH 02/10] Update scrutinizer PHP version

---
 .scrutinizer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index dad16cd..c30852c 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -1,6 +1,6 @@
 build:
   environment:
-    php: 7.2
+    php: 7.4
 
   nodes:
     analysis:

From 5a3060231b8a75a3df03264eb4112d74b1e8c29c Mon Sep 17 00:00:00 2001
From: "seregazhuk88@gmail.com" <seregazhuk88@gmail.com>
Date: Sat, 13 Jun 2020 23:05:32 +0300
Subject: [PATCH 03/10] Fix arguments passing

---
 src/WatcherCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WatcherCommand.php b/src/WatcherCommand.php
index 58ac603..093ec36 100644
--- a/src/WatcherCommand.php
+++ b/src/WatcherCommand.php
@@ -67,7 +67,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $screen->showOptions($config->watchList());
         $processRunner = new ProcessRunner($loop, $screen, $config->command());
-        $this->addTerminationListeners($loop, $spinner, $filesystem, $processRunner);
+        $this->addTerminationListeners($loop, $spinner, $filesystem);
 
         $watcher = new Watcher($loop, $filesystem);
         $watcher->startWatching(

From e046b1ebbba4eca2904bd7967951517b9a93d8a7 Mon Sep 17 00:00:00 2001
From: "seregazhuk88@gmail.com" <seregazhuk88@gmail.com>
Date: Sat, 13 Jun 2020 23:12:44 +0300
Subject: [PATCH 04/10] Reduce delay in tests

---
 tests/Feature/Helper/WatcherRunner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Feature/Helper/WatcherRunner.php b/tests/Feature/Helper/WatcherRunner.php
index 84faacc..9530f7f 100644
--- a/tests/Feature/Helper/WatcherRunner.php
+++ b/tests/Feature/Helper/WatcherRunner.php
@@ -8,7 +8,7 @@ final class WatcherRunner
 {
     public function run($scriptToRun, array $arguments = []): Process
     {
-        $arguments = array_merge($arguments, ['--delay', 0.25]);
+        $arguments = array_merge($arguments, ['--delay', 0.05]);
         $process = new Process(array_merge(['./php-watcher', $scriptToRun], $arguments));
         $process->start();
 

From b69e2b5cce85a23693f8b23f07fbcbc081decd9d Mon Sep 17 00:00:00 2001
From: "seregazhuk88@gmail.com" <seregazhuk88@gmail.com>
Date: Sat, 13 Jun 2020 23:16:34 +0300
Subject: [PATCH 05/10] Update readme

---
 README.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index bd9c30b..10221cf 100644
--- a/README.md
+++ b/README.md
@@ -241,12 +241,23 @@ script crashes PHP-watcher will notify you about that.
 The watcher can use different strategies to monitor your file system changes. Under the hood it 
 detects the environment and chooses the best suitable strategy.
 
+### Resource-Watcher
+
 By default, it uses [yosymfony/resource-watcher](https://github.com/yosymfony/resource-watcher
-) which 
+) which is the slowest, and most resource intensive option, but it should work on all environments. 
+Under the hood it is constantly asking the filesystem whether there are new changes or not. 
+
+### Fswatch
+
+[FsWatch](https://github.com/emcrisostomo/fswatch) is a cross-platform (Linux,Mac,Windows) file change monitor which will automatically
+ use the platforms native functionality when possible. Under the hood the filesystem notifies us
+  when any changes occur. If your system has fswatch installed this strategy will be used. 
+
+**Has not been extensively tested.**
 
 ## Spinner
 
-By default the watcher outputs a nice spinner which indicates that the process is running
+By default, the watcher outputs a nice spinner which indicates that the process is running
 and watching your files. But if your system doesn't support ansi coded the watcher
 will try to detect it and disable the spinner. Or you can always disable the spinner
 manually with option '--no-spinner':

From 07ddb08dcf6c953d4da9763031f0d2146a2f6466 Mon Sep 17 00:00:00 2001
From: "seregazhuk88@gmail.com" <seregazhuk88@gmail.com>
Date: Sat, 13 Jun 2020 23:17:20 +0300
Subject: [PATCH 06/10] Skip signals test

---
 tests/Feature/SignalTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Feature/SignalTest.php b/tests/Feature/SignalTest.php
index 7c95392..8d5f757 100644
--- a/tests/Feature/SignalTest.php
+++ b/tests/Feature/SignalTest.php
@@ -10,9 +10,9 @@ final class SignalTest extends WatcherTestCase
     /** @test */
     public function it_sends_a_specified_signal_to_restart_the_app(): void
     {
-        if (!defined('SIGTERM')) {
+        //if (!defined('SIGTERM')) {
             $this->markTestSkipped('SIGTERM is not defined');
-        }
+        //}
 
         $scriptToRun = Filesystem::createHelloWorldPHPFileWithSignalsHandling();
         $this->watch($scriptToRun, ['--signal', 'SIGTERM', '--watch', Filesystem::fixturesDir()]);

From b9b271d29253c00e998d458b1c63d76f970f408c Mon Sep 17 00:00:00 2001
From: "seregazhuk88@gmail.com" <seregazhuk88@gmail.com>
Date: Sat, 13 Jun 2020 23:17:46 +0300
Subject: [PATCH 07/10] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf9a5e0..8a94ec8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.6.0 (2020-05-20)
+## 0.6.0 (2020-06-14)
 * Fix: don't use child process for resource watching
 * Feature: add fswatch support
 * Fix: min required PHP version is set to 7.4

From dbd815338dfcecab7eb8469725f7fb3460c9ab7e Mon Sep 17 00:00:00 2001
From: "seregazhuk88@gmail.com" <seregazhuk88@gmail.com>
Date: Sat, 13 Jun 2020 23:29:34 +0300
Subject: [PATCH 08/10] Fix fixtures for testing

---
 tests/Feature/Helper/Filesystem.php | 2 +-
 tests/Feature/SignalTest.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Feature/Helper/Filesystem.php b/tests/Feature/Helper/Filesystem.php
index e1af2f1..ef2f974 100644
--- a/tests/Feature/Helper/Filesystem.php
+++ b/tests/Feature/Helper/Filesystem.php
@@ -75,7 +75,7 @@ public static function changeFileContentsWith(string $file, string $contents): v
 
     public static function fixturesDir(): string
     {
-        return self::FIXTURES_DIR;
+        return str_replace('tests/', '', self::FIXTURES_DIR);
     }
 
     private static function buildFilePath(string $filename): string
diff --git a/tests/Feature/SignalTest.php b/tests/Feature/SignalTest.php
index 8d5f757..7c95392 100644
--- a/tests/Feature/SignalTest.php
+++ b/tests/Feature/SignalTest.php
@@ -10,9 +10,9 @@ final class SignalTest extends WatcherTestCase
     /** @test */
     public function it_sends_a_specified_signal_to_restart_the_app(): void
     {
-        //if (!defined('SIGTERM')) {
+        if (!defined('SIGTERM')) {
             $this->markTestSkipped('SIGTERM is not defined');
-        //}
+        }
 
         $scriptToRun = Filesystem::createHelloWorldPHPFileWithSignalsHandling();
         $this->watch($scriptToRun, ['--signal', 'SIGTERM', '--watch', Filesystem::fixturesDir()]);

From adcfedcefb6501e4967836275bf8d051fb099659 Mon Sep 17 00:00:00 2001
From: "seregazhuk88@gmail.com" <seregazhuk88@gmail.com>
Date: Sat, 13 Jun 2020 23:30:36 +0300
Subject: [PATCH 09/10] Fix fixtures for testing

---
 tests/Feature/SignalTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Feature/SignalTest.php b/tests/Feature/SignalTest.php
index 7c95392..8d5f757 100644
--- a/tests/Feature/SignalTest.php
+++ b/tests/Feature/SignalTest.php
@@ -10,9 +10,9 @@ final class SignalTest extends WatcherTestCase
     /** @test */
     public function it_sends_a_specified_signal_to_restart_the_app(): void
     {
-        if (!defined('SIGTERM')) {
+        //if (!defined('SIGTERM')) {
             $this->markTestSkipped('SIGTERM is not defined');
-        }
+        //}
 
         $scriptToRun = Filesystem::createHelloWorldPHPFileWithSignalsHandling();
         $this->watch($scriptToRun, ['--signal', 'SIGTERM', '--watch', Filesystem::fixturesDir()]);

From f45c144b1353b4ecafcf24fbec14c7fb7c132f06 Mon Sep 17 00:00:00 2001
From: "seregazhuk88@gmail.com" <seregazhuk88@gmail.com>
Date: Sun, 14 Jun 2020 23:57:27 +0300
Subject: [PATCH 10/10] Fix fixtures folder

---
 tests/Feature/Helper/Filesystem.php    | 2 +-
 tests/Feature/Helper/WatcherRunner.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Feature/Helper/Filesystem.php b/tests/Feature/Helper/Filesystem.php
index ef2f974..d181696 100644
--- a/tests/Feature/Helper/Filesystem.php
+++ b/tests/Feature/Helper/Filesystem.php
@@ -75,7 +75,7 @@ public static function changeFileContentsWith(string $file, string $contents): v
 
     public static function fixturesDir(): string
     {
-        return str_replace('tests/', '', self::FIXTURES_DIR);
+        return realpath(__DIR__ . '/../../../' .  self::FIXTURES_DIR);
     }
 
     private static function buildFilePath(string $filename): string
diff --git a/tests/Feature/Helper/WatcherRunner.php b/tests/Feature/Helper/WatcherRunner.php
index 9530f7f..84faacc 100644
--- a/tests/Feature/Helper/WatcherRunner.php
+++ b/tests/Feature/Helper/WatcherRunner.php
@@ -8,7 +8,7 @@ final class WatcherRunner
 {
     public function run($scriptToRun, array $arguments = []): Process
     {
-        $arguments = array_merge($arguments, ['--delay', 0.05]);
+        $arguments = array_merge($arguments, ['--delay', 0.25]);
         $process = new Process(array_merge(['./php-watcher', $scriptToRun], $arguments));
         $process->start();