Change input string handler termination sequence to <<<

packages/publications/src/Commands/Helpers/InputStreamHandler.php

@@ -19,6 +19,8 @@
  */
 class InputStreamHandler
 {
+    public const TERMINATION_SEQUENCE = '<<<';
+
     private static ?array $mockedStreamBuffer = null;
 
     public static function call(): array
@@ -36,7 +38,7 @@ protected function getLinesFromInputStream(): array
         $lines = [];
         do {
             $line = Hyde::stripNewlines($this->readInputStream());
-            if ($line === '') {
+            if ($this->shouldTerminate($line)) {
                 break;
             }
             $lines[] = trim($line);
@@ -45,6 +47,11 @@ protected function getLinesFromInputStream(): array
         return $lines;
     }
 
+    protected function shouldTerminate(string $line): bool
+    {
+        return $line === self::TERMINATION_SEQUENCE;
+    }
+
     /** @codeCoverageIgnore Allows for mocking of the standard input stream */
     protected function readInputStream(): string
     {

packages/publications/src/Commands/MakePublicationCommand.php

@@ -128,7 +128,7 @@ protected function captureFieldInput(PublicationFieldDefinition $field): ?Public
 
     protected function captureTextFieldInput(PublicationFieldDefinition $field): PublicationFieldValue
     {
-        $this->infoComment("Enter lines for field [$field->name]");
+        $this->infoComment("Enter lines for field [$field->name] <fg=gray>(terminate with '<<<')</>");
 
         return new PublicationFieldValue(PublicationFieldTypes::Text, implode("\n", InputStreamHandler::call()));
     }

packages/publications/tests/Feature/InputStreamHandlerTest.php

@@ -17,28 +17,42 @@ class InputStreamHandlerTest extends TestCase
 {
     public function testCanCollectInput()
     {
-        InputStreamHandler::mockInput('foo');
+        InputStreamHandler::mockInput("foo\n<<<");
 
         $this->assertSame(0, $this->makeCommand(['foo'])->handle());
     }
 
+    public function testCanTerminateWithHereSequence()
+    {
+        InputStreamHandler::mockInput("foo\nbar\nbaz\n<<<");
+
+        $this->assertSame(0, $this->makeCommand(['foo', 'bar', 'baz'])->handle());
+    }
+
+    public function testCanTerminateWithHereSequenceAfterCarriageReturns()
+    {
+        InputStreamHandler::mockInput("foo\r\nbar\r\nbaz\r\n<<<");
+
+        $this->assertSame(0, $this->makeCommand(['foo', 'bar', 'baz'])->handle());
+    }
+
     public function testCanCollectMultipleInputLines()
     {
-        InputStreamHandler::mockInput("foo\nbar\nbaz\n");
+        InputStreamHandler::mockInput("foo\nbar\nbaz\n<<<");
 
         $this->assertSame(0, $this->makeCommand(['foo', 'bar', 'baz'])->handle());
     }
 
-    public function testCanTerminateWithCarriageReturns()
+    public function testCanEnterMultipleCarriageReturns()
     {
-        InputStreamHandler::mockInput("foo\r\nbar\r\nbaz\r\n");
+        InputStreamHandler::mockInput("foo\r\nbar\r\nbaz\r\n<<<");
 
         $this->assertSame(0, $this->makeCommand(['foo', 'bar', 'baz'])->handle());
     }
 
-    public function testCanTerminateWithUnixEndings()
+    public function testCanEnterMultipleUnixEndings()
     {
-        InputStreamHandler::mockInput("foo\nbar\nbaz\n");
+        InputStreamHandler::mockInput("foo\nbar\nbaz\n<<<");
 
         $this->assertSame(0, $this->makeCommand(['foo', 'bar', 'baz'])->handle());
     }

packages/publications/tests/Feature/MakePublicationCommandTest.php

@@ -217,7 +217,7 @@ public function test_command_does_not_ask_user_to_fill_in_meta_fields()
 
     public function test_command_with_text_input()
     {
-        InputStreamHandler::mockInput("Hello\nWorld");
+        InputStreamHandler::mockInput("Hello\nWorld\n<<<");
         $this->makeSchemaFile([
             'canonicalField' => '__createdAt',
             'fields'         =>  [[
@@ -256,7 +256,7 @@ public function test_command_with_boolean_input()
 
     public function test_command_with_array_input()
     {
-        InputStreamHandler::mockInput("First Tag\nSecond Tag\nThird Tag");
+        InputStreamHandler::mockInput("First Tag\nSecond Tag\nThird Tag\n<<<");
         $this->makeSchemaFile([
             'canonicalField' => '__createdAt',
             'fields'         =>  [[

packages/publications/tests/Feature/MakePublicationTagCommandTest.php

@@ -24,7 +24,7 @@ protected function tearDown(): void
 
     public function testCanCreateNewPublicationTag()
     {
-        InputStreamHandler::mockInput("foo\nbar\nbaz\n");
+        InputStreamHandler::mockInput("foo\nbar\nbaz\n<<<");
 
         $this->artisan('make:publicationTag')
             ->expectsQuestion('Tag name', 'foo')
@@ -49,7 +49,7 @@ public function testCanCreateNewPublicationTag()
 
     public function testCanCreateNewPublicationTagWithTagNameArgument()
     {
-        InputStreamHandler::mockInput("foo\nbar\nbaz\n");
+        InputStreamHandler::mockInput("foo\nbar\nbaz\n<<<");
 
         $this->artisan('make:publicationTag foo')
             ->expectsOutput('Using tag name [foo] from command line argument')
@@ -74,12 +74,12 @@ public function testCanCreateNewPublicationTagWithTagNameArgument()
 
     public function testCommandFailsIfTagNameIsAlreadySet()
     {
-        InputStreamHandler::mockInput("foo\nbar\nbaz\n");
+        InputStreamHandler::mockInput("foo\nbar\nbaz\n<<<");
 
         $this->artisan('make:publicationTag foo')
              ->assertExitCode(0);
 
-        InputStreamHandler::mockInput("foo\nbar\nbaz\n");
+        InputStreamHandler::mockInput("foo\nbar\nbaz\n<<<");
 
         $this->artisan('make:publicationTag foo')
             ->expectsOutput('Error: Tag [foo] already exists')

packages/publications/tests/Feature/MakePublicationTypeCommandTest.php

@@ -260,7 +260,7 @@ public function testWithTagFieldInputButNoTagsCanPromptToCreateTags()
     {
         $this->directory('test-publication');
         $this->cleanUpWhenDone('tags.yml');
-        InputStreamHandler::mockInput("foo\nbar\nbaz\n");
+        InputStreamHandler::mockInput("foo\nbar\nbaz\n<<<");
 
         $this->artisan('make:publicationType "Test Publication"')
             ->expectsQuestion('Enter name for field #1', 'MyTag')