Merge pull request #24 from phprtc/misc

Improvements & Fixed failing test

Author: phprtc

src/Watcher.php

@@ -136,7 +136,7 @@ protected function inotifyWatchPath(string $path): void
     protected function inotifyRemovePathWatch(EventInfo $eventInfo): void
     {
         $descriptor = $eventInfo->getWatchDescriptor();
-        if ($eventInfo->getWatchedItem()->getFullPath() != $this->watchedItems[$descriptor]){
+        if ($eventInfo->getWatchedItem()->getFullPath() != $this->watchedItems[$descriptor]) {
             return;
         }
 
@@ -234,7 +234,7 @@ public function watch(): void
 
             // INDIVIDUAL LISTENERS
             foreach ($inotifyEvents as $inotifyEvent) {
-               // var_export($inotifyEvent);
+                // var_export($inotifyEvent);
                 // Make sure that we support this event
                 if (in_array($inotifyEvent['mask'], $this->watchedMasks)) {
                     $this->fireEvent($inotifyEvent);
@@ -257,23 +257,33 @@ public function watch(): void
     /**
      * Add file extension filter
      *
-     * @param string $extension
+     * @param string|array $extension
      * @return $this
      */
-    public function addExtension(string $extension): Watcher
+    public function addExtension(string|array $extension): Watcher
     {
+        if (is_array($extension)) {
+            $this->extensions = array_merge($this->extensions, $extension);
+            return $this;
+        }
+
         $this->extensions[] = $extension;
         return $this;
     }
 
     /**
      * Add path to watch
      *
-     * @param string $path
+     * @param string|array $path
      * @return $this
      */
-    public function addPath(string $path): Watcher
+    public function addPath(string|array $path): Watcher
     {
+        if (is_array($path)) {
+            $this->paths = array_merge($this->paths, $path);
+            return $this;
+        }
+
         $this->paths[] = $path;
         return $this;
     }

tests/WatcherTest.php

@@ -4,10 +4,20 @@
 
 use PHPUnit\Framework\TestCase;
 use RTC\Watcher\Watching\EventInfo;
+use Swoole\Timer;
 use function Co\run;
 
 class WatcherTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (!file_exists(__DIR__ . '/bait')) {
+            mkdir(__DIR__ . '/bait');
+        }
+    }
+
     public function testFileAndDirectoryCreation(): void
     {
         run(function () {
@@ -152,7 +162,6 @@ public function testCreateChangeDeleteOnTheFly(): void
             touch($baitFile);
             file_put_contents($baitFile, uniqid());
             unlink($baitFile);
-            rmdir($baitDir);
         });
     }
 }