Merge branch 'develop'

* develop: specify next release use innmind/operating-system 5 CS
Innmind · Mar 10, 2024 · 2616ae7 · 2616ae7
2 parents 878589b + 0bacb5c
commit 2616ae7
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.1.0 - 2024-03-10
+
+### Changed
+
+- Requires `innmind/operating-system:~5.0`
+
 ## 4.0.0 - 2023-11-12
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "php": "~8.2",
         "innmind/url": "~4.0",
         "innmind/cli": "~3.4",
-        "innmind/operating-system": "~4.1",
+        "innmind/operating-system": "~5.0",
         "innmind/json": "^1.1",
         "innmind/immutable": "~5.2",
         "innmind/mantle": "~2.0"

diff --git a/src/Agent/WatchFixtures.php b/src/Agent/WatchFixtures.php
@@ -10,7 +10,6 @@
 };
 use Innmind\OperatingSystem\OperatingSystem;
 use Innmind\Url\Path;
-use Innmind\Immutable\Either;
 
 final class WatchFixtures implements Agent
 {
@@ -28,7 +27,7 @@ public function __invoke(
 
         $filesystem->watch($fixtures)(
             $activities,
-            static fn(Activities $activities) => Either::right( // right in order to have an infinite loop
+            static fn(Activities $activities, $continuation) => $continuation->continue(
                 $activities->push(Activity::fixturesModified),
             ),
         );

diff --git a/src/Agent/WatchProofs.php b/src/Agent/WatchProofs.php
@@ -10,7 +10,6 @@
 };
 use Innmind\OperatingSystem\OperatingSystem;
 use Innmind\Url\Path;
-use Innmind\Immutable\Either;
 
 final class WatchProofs implements Agent
 {
@@ -28,7 +27,7 @@ public function __invoke(
 
         $filesystem->watch($proofs)(
             $activities,
-            static fn(Activities $activities) => Either::right( // right in order to have an infinite loop
+            static fn(Activities $activities, $continuation) => $continuation->continue(
                 $activities->push(Activity::proofsModified),
             ),
         );

diff --git a/src/Agent/WatchProperties.php b/src/Agent/WatchProperties.php
@@ -10,7 +10,6 @@
 };
 use Innmind\OperatingSystem\OperatingSystem;
 use Innmind\Url\Path;
-use Innmind\Immutable\Either;
 
 final class WatchProperties implements Agent
 {
@@ -28,7 +27,7 @@ public function __invoke(
 
         $filesystem->watch($properties)(
             $activities,
-            static fn(Activities $activities) => Either::right( // right in order to have an infinite loop
+            static fn(Activities $activities, $continuation) => $continuation->continue(
                 $activities->push(Activity::propertiesModified),
             ),
         );

diff --git a/src/Agent/WatchSources.php b/src/Agent/WatchSources.php
@@ -10,7 +10,6 @@
 };
 use Innmind\OperatingSystem\OperatingSystem;
 use Innmind\Url\Path;
-use Innmind\Immutable\Either;
 
 final class WatchSources implements Agent
 {
@@ -23,7 +22,7 @@ public function __invoke(
 
         $os->filesystem()->watch($src)(
             $activities,
-            static fn(Activities $activities) => Either::right( // right in order to have an infinite loop
+            static fn(Activities $activities, $continuation) => $continuation->continue(
                 $activities->push(Activity::sourcesModified),
             ),
         );

diff --git a/src/Agent/WatchTests.php b/src/Agent/WatchTests.php
@@ -10,10 +10,6 @@
 };
 use Innmind\OperatingSystem\OperatingSystem;
 use Innmind\Url\Path;
-use Innmind\Immutable\{
-    Sequence,
-    Either,
-};
 
 final class WatchTests implements Agent
 {
@@ -31,7 +27,7 @@ public function __invoke(
 
         $filesystem->watch($tests)(
             $activities,
-            static fn(Activities $activities) => Either::right( // right in order to have an infinite loop
+            static fn(Activities $activities, $continuation) => $continuation->continue(
                 $activities->push(Activity::testsModified),
             ),
         );

diff --git a/src/Monitor/Loop.php b/src/Monitor/Loop.php
@@ -16,7 +16,6 @@
 use Innmind\Url\Path;
 use Innmind\Immutable\{
     Sequence,
-    Set,
     Predicate\Instance,
 };
 

diff --git a/src/Trigger/ComposerUpdate.php b/src/Trigger/ComposerUpdate.php
@@ -13,10 +13,7 @@
     Question\Question,
 };
 use Innmind\OperatingSystem\OperatingSystem;
-use Innmind\Server\Control\Server\{
-    Command,
-    Process\Output,
-};
+use Innmind\Server\Control\Server\Command;
 use Innmind\Immutable\{
     Map,
     Str,

diff --git a/tests/Agent/WatchFixturesTest.php b/tests/Agent/WatchFixturesTest.php
@@ -16,10 +16,13 @@
     OperatingSystem,
     Filesystem,
 };
-use Innmind\FileWatch\Ping;
+use Innmind\FileWatch\{
+    Ping,
+    Continuation,
+};
 use Innmind\Url\Path;
 use Innmind\Immutable\{
-    Either,
+    Maybe,
     Set,
 };
 use PHPUnit\Framework\TestCase;
@@ -64,11 +67,11 @@ public function testSendMessageWhenFixturesAreModified()
             ->expects($this->once())
             ->method('__invoke')
             ->with($activities, $this->callback(static function($listen) use ($activities): bool {
-                $listen($activities); // simulate folder modification
+                $listen($activities, Continuation::of($activities)); // simulate folder modification
 
                 return true;
             }))
-            ->willReturn(Either::right($activities));
+            ->willReturn(Maybe::of($activities));
 
         $this->assertSame($agent, $agent($os, $project, $activities));
         $this->assertEquals(

diff --git a/tests/Agent/WatchProofsTest.php b/tests/Agent/WatchProofsTest.php
@@ -16,10 +16,13 @@
     OperatingSystem,
     Filesystem,
 };
-use Innmind\FileWatch\Ping;
+use Innmind\FileWatch\{
+    Ping,
+    Continuation,
+};
 use Innmind\Url\Path;
 use Innmind\Immutable\{
-    Either,
+    Maybe,
     Set,
 };
 use PHPUnit\Framework\TestCase;
@@ -64,11 +67,11 @@ public function testSendMessageWhenProofsAreModified()
             ->expects($this->once())
             ->method('__invoke')
             ->with($activities, $this->callback(static function($listen) use ($activities): bool {
-                $listen($activities); // simulate folder modification
+                $listen($activities, Continuation::of($activities)); // simulate folder modification
 
                 return true;
             }))
-            ->willReturn(Either::right($activities));
+            ->willReturn(Maybe::just($activities));
 
         $this->assertSame($agent, $agent($os, $project, $activities));
         $this->assertEquals(

diff --git a/tests/Agent/WatchPropertiesTest.php b/tests/Agent/WatchPropertiesTest.php
@@ -16,10 +16,13 @@
     OperatingSystem,
     Filesystem,
 };
-use Innmind\FileWatch\Ping;
+use Innmind\FileWatch\{
+    Ping,
+    Continuation,
+};
 use Innmind\Url\Path;
 use Innmind\Immutable\{
-    Either,
+    Maybe,
     Set,
 };
 use PHPUnit\Framework\TestCase;
@@ -64,11 +67,11 @@ public function testSendMessageWhenSourcesAreModified()
             ->expects($this->once())
             ->method('__invoke')
             ->with($activities, $this->callback(static function($listen) use ($activities): bool {
-                $listen($activities); // simulate folder modification
+                $listen($activities, Continuation::of($activities)); // simulate folder modification
 
                 return true;
             }))
-            ->willReturn(Either::right($activities));
+            ->willReturn(Maybe::just($activities));
 
         $this->assertSame($agent, $agent($os, $project, $activities));
         $this->assertEquals(

diff --git a/tests/Agent/WatchSourcesTest.php b/tests/Agent/WatchSourcesTest.php
@@ -16,10 +16,13 @@
     OperatingSystem,
     Filesystem,
 };
-use Innmind\FileWatch\Ping;
+use Innmind\FileWatch\{
+    Ping,
+    Continuation,
+};
 use Innmind\Url\Path;
 use Innmind\Immutable\{
-    Either,
+    Maybe,
     Set,
 };
 use PHPUnit\Framework\TestCase;
@@ -59,11 +62,11 @@ public function testSendMessageWhenSourcesAreModified()
             ->expects($this->once())
             ->method('__invoke')
             ->with($activities, $this->callback(static function($listen) use ($activities): bool {
-                $listen($activities); // simulate folder modification
+                $listen($activities, Continuation::of($activities)); // simulate folder modification
 
                 return true;
             }))
-            ->willReturn(Either::right($activities));
+            ->willReturn(Maybe::just($activities));
 
         $this->assertSame($agent, $agent($os, $project, $activities));
         $this->assertEquals(

diff --git a/tests/Agent/WatchTestsTest.php b/tests/Agent/WatchTestsTest.php
@@ -16,10 +16,13 @@
     OperatingSystem,
     Filesystem,
 };
-use Innmind\FileWatch\Ping;
+use Innmind\FileWatch\{
+    Ping,
+    Continuation,
+};
 use Innmind\Url\Path;
 use Innmind\Immutable\{
-    Either,
+    Maybe,
     Set,
 };
 use PHPUnit\Framework\TestCase;
@@ -64,11 +67,11 @@ public function testSendMessageWhenSourcesAreModified()
             ->expects($this->once())
             ->method('__invoke')
             ->with($activities, $this->callback(static function($listen) use ($activities): bool {
-                $listen($activities); // simulate folder modification
+                $listen($activities, Continuation::of($activities)); // simulate folder modification
 
                 return true;
             }))
-            ->willReturn(Either::right($activities));
+            ->willReturn(Maybe::just($activities));
 
         $this->assertSame($agent, $agent($os, $project, $activities));
         $this->assertEquals(

diff --git a/tests/Trigger/BlackBoxTest.php b/tests/Trigger/BlackBoxTest.php
@@ -8,7 +8,6 @@
     Trigger,
     Triggers,
     Activity,
-    Activity\Type,
     Iteration,
 };
 use Innmind\OperatingSystem\{

diff --git a/tests/Trigger/CodingStandardTest.php b/tests/Trigger/CodingStandardTest.php
@@ -30,7 +30,6 @@
 };
 use Innmind\Filesystem\{
     Adapter,
-    Name,
     File,
     File\Content,
 };

diff --git a/tests/Trigger/DockerComposeTest.php b/tests/Trigger/DockerComposeTest.php
@@ -26,7 +26,6 @@
 };
 use Innmind\Filesystem\{
     Adapter,
-    Name,
     File,
     File\Content,
 };

diff --git a/tests/Trigger/PsalmTest.php b/tests/Trigger/PsalmTest.php
@@ -8,7 +8,6 @@
     Trigger,
     Triggers,
     Activity,
-    Activity\Type,
     Iteration,
 };
 use Innmind\Server\Control\{
@@ -31,7 +30,6 @@
 };
 use Innmind\Filesystem\{
     Adapter,
-    Name,
     File,
     File\Content,
 };