Merge pull request #67 from seregazhuk/extract-interface-for-fs-watching

Extract interface for fs watching

Author: seregazhuk

src/Filesystem/ChangesListener.php

@@ -1,35 +1,13 @@
-<?php declare(strict_types=1);
+<?php
 
+declare(strict_types=1);
 namespace seregazhuk\PhpWatcher\Filesystem;
 
-use Evenement\EventEmitter;
-use React\ChildProcess\Process;
-use React\EventLoop\LoopInterface;
-use RuntimeException;
 use seregazhuk\PhpWatcher\Config\WatchList;
 
-final class ChangesListener extends EventEmitter
+interface ChangesListener
 {
-    private const INTERVAL = 0.15;
+    public function start(WatchList $watchList): void;
 
-    private $loop;
-
-    public function __construct(LoopInterface $loop)
-    {
-        $this->loop = $loop;
-    }
-
-    public function start(WatchList $watchList): void
-    {
-        $watcher = ResourceWatcherBuilder::create($watchList);
-
-        $this->loop->addPeriodicTimer(
-            self::INTERVAL,
-            function () use ($watcher) {
-                if ($watcher->findChanges()->hasChanges()) {
-                    $this->emit('change');
-                }
-            }
-        );
-    }
+    public function onChange(callable $callback): void;
 }

src/Filesystem/ResourceWatcherBased/ChangesListener.php

@@ -0,0 +1,39 @@
+<?php declare(strict_types=1);
+
+namespace seregazhuk\PhpWatcher\Filesystem\ResourceWatcherBased;
+
+use Evenement\EventEmitter;
+use React\EventLoop\LoopInterface;
+use seregazhuk\PhpWatcher\Config\WatchList;
+
+final class ChangesListener extends EventEmitter implements
+    \seregazhuk\PhpWatcher\Filesystem\ChangesListener
+{
+    private const INTERVAL = 0.15;
+
+    private $loop;
+
+    public function __construct(LoopInterface $loop)
+    {
+        $this->loop = $loop;
+    }
+
+    public function start(WatchList $watchList): void
+    {
+        $watcher = ResourceWatcherBuilder::create($watchList);
+
+        $this->loop->addPeriodicTimer(
+            self::INTERVAL,
+            function () use ($watcher) {
+                if ($watcher->findChanges()->hasChanges()) {
+                    $this->emit('change');
+                }
+            }
+        );
+    }
+
+    public function onChange(callable $callback): void
+    {
+        $this->on('change', $callback);
+    }
+}

src/Filesystem/ResourceWatcherBuilder.php renamed to src/Filesystem/ResourceWatcherBased/ResourceWatcherBuilder.php

@@ -1,8 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace seregazhuk\PhpWatcher\Filesystem;
+namespace seregazhuk\PhpWatcher\Filesystem\ResourceWatcherBased;
 
 use seregazhuk\PhpWatcher\Config\WatchList;
+use seregazhuk\PhpWatcher\Filesystem\WatchPath;
 use Symfony\Component\Finder\Finder;
 use Yosymfony\ResourceWatcher\Crc32ContentHash;
 use Yosymfony\ResourceWatcher\ResourceCacheMemory;

src/Watcher.php

@@ -1,11 +1,12 @@
 <?php
+
 declare(strict_types=1);
 
 namespace seregazhuk\PhpWatcher;
 
 use React\EventLoop\LoopInterface;
 use seregazhuk\PhpWatcher\Config\WatchList;
-use seregazhuk\PhpWatcher\Filesystem\ChangesListener;
+use seregazhuk\PhpWatcher\Filesystem\ResourceWatcherBased\ChangesListener;
 
 final class Watcher
 {
@@ -28,8 +29,7 @@ public function startWatching(
         $processRunner->start();
 
         $this->filesystemListener->start($watchList);
-        $this->filesystemListener->on(
-            'change',
+        $this->filesystemListener->onChange(
             static function () use ($processRunner, $signal, $delayToRestart) {
                 $processRunner->stop($signal);
                 $processRunner->restart($delayToRestart);

src/WatcherCommand.php

@@ -9,7 +9,7 @@
 use seregazhuk\PhpWatcher\Config\Builder;
 use seregazhuk\PhpWatcher\Config\Config;
 use seregazhuk\PhpWatcher\Config\InputExtractor;
-use seregazhuk\PhpWatcher\Filesystem\ChangesListener;
+use seregazhuk\PhpWatcher\Filesystem\ResourceWatcherBased\ChangesListener;
 use seregazhuk\PhpWatcher\Screen\Screen;
 use seregazhuk\PhpWatcher\Screen\SpinnerFactory;
 use Symfony\Component\Console\Command\Command as BaseCommand;

tests/Feature/ChangesListenerTest.php

@@ -5,10 +5,11 @@
 use PHPUnit\Framework\TestCase;
 use React\EventLoop\Factory;
 use seregazhuk\PhpWatcher\Config\WatchList;
-use seregazhuk\PhpWatcher\Filesystem\ChangesListener;
+use seregazhuk\PhpWatcher\Filesystem\ResourceWatcherBased\ChangesListener;
 use seregazhuk\PhpWatcher\Tests\Feature\Helper\Filesystem;
 use seregazhuk\PhpWatcher\Tests\Feature\Helper\WithFilesystem;
-use function \Clue\React\Block\sleep;
+
+use function Clue\React\Block\sleep;
 
 final class ChangesListenerTest extends TestCase
 {