Modify output and tests

Author: mpociot

src/Console/TinkerServerCommand.php

@@ -7,6 +7,7 @@
 use Illuminate\Console\Command;
 use Laravel\Tinker\ClassAliasAutoloader;
 use BeyondCode\LaravelTinkerServer\Server;
+use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 
 class TinkerServerCommand extends Command
@@ -15,20 +16,24 @@ class TinkerServerCommand extends Command
 
     public function handle()
     {
-        $this->createWarningFormatter();
+        $output = $this->createWarningFormatter();
 
-        $server = new Server(config('laravel-tinker-server.host'), $this->createPsyShell(), $this->output);
+        $server = new Server(config('laravel-tinker-server.host'), $this->createPsyShell(), $output);
 
         $server->start();
     }
 
-    protected function createWarningFormatter()
+    protected function createWarningFormatter(): BufferedOutput
     {
-        if (! $this->output->getFormatter()->hasStyle('warning')) {
+        $output = new BufferedOutput();
+
+        if (! $output->getFormatter()->hasStyle('warning')) {
             $style = new OutputFormatterStyle('yellow');
 
-            $this->output->getFormatter()->setStyle('warning', $style);
+            $output->getFormatter()->setStyle('warning', $style);
         }
+
+        return $output;
     }
 
     protected function createPsyShell()

src/Server.php

@@ -25,18 +25,20 @@ class Server
     /** @var Shell */
     protected $shell;
 
-    /** @var OutputInterface */
+    /** @var BufferedOutput */
     protected $output;
 
-    public function __construct($host, Shell $shell, OutputInterface $output, LoopInterface $loop = null)
-    {
-        $loop = $loop ?? Factory::create();
+    /** @var Stdio */
+    protected $stdio;
 
+    public function __construct($host, Shell $shell, BufferedOutput $output, LoopInterface $loop = null, Stdio $stdio = null)
+    {
         $this->host = $host;
-        $this->loop = $loop;
+        $this->loop = $loop ?? Factory::create();
         $this->shell = $shell;
         $this->output = $output;
         $this->shellOutput = new BufferedOutput();
+        $this->stdio = $stdio ?? $this->createStdio();
     }
 
     public function start()
@@ -45,8 +47,6 @@ public function start()
 
         $this->createSocketServer();
 
-        $this->createStdio();
-
         $this->loop->run();
     }
 
@@ -60,20 +60,22 @@ protected function createSocketServer()
 
                 $this->shell->setScopeVariables(array_merge($unserializedData, $this->shell->getScopeVariables()));
 
-                $this->output->write(PHP_EOL);
+                $this->stdio->write(PHP_EOL);
 
                 collect($unserializedData)->keys()->map(function ($variableName) {
                     $this->output->writeln('>> $'.$variableName);
 
                     $this->executeCode('$'.$variableName);
 
                     $this->output->write($this->shellOutput->fetch());
+
+                    $this->stdio->write($this->output->fetch());
                 });
             });
         });
     }
 
-    protected function createStdio()
+    protected function createStdio(): Stdio
     {
         $stdio = new Stdio($this->loop);
 
@@ -87,7 +89,11 @@ protected function createStdio()
             $this->executeCode($line);
 
             $this->output->write(PHP_EOL.$this->shellOutput->fetch());
+
+            $this->stdio->write($this->output->fetch());
         });
+
+        return $stdio;
     }
 
     protected function executeCode($code)

src/Shell/ExecutionClosure.php

@@ -5,6 +5,7 @@
 use Psy\Shell;
 use Psy\Exception\BreakException;
 use Psy\Exception\ErrorException;
+use Psy\CodeCleaner\NoReturnValue;
 use Psy\Exception\ThrowUpException;
 use Psy\Exception\TypeErrorException;
 use Psy\ExecutionClosure as BaseExecutionClosure;
@@ -19,6 +20,8 @@ public function __construct(Shell $__psysh__, $__line__)
                     // Restore execution scope variables
                     \extract($__psysh__->getScopeVariables(false), EXTR_SKIP);
 
+                    $_ = new NoReturnValue();
+
                     $__psysh__->addCode($__line__);
 
                     // Convert all errors to exceptions

tests/ConnectionTest.php

@@ -40,10 +40,9 @@ public function testDump()
             //
         }
 
-        $this->assertSame('
->> $i
-=> 10
-', $dumped);
+        $this->assertSame("\r\e[K
+\r\e[K>> \$i
+=> 10\n", $dumped);
     }
 
     /** @test */

tests/fixtures/EchoStream.php

@@ -0,0 +1,53 @@
+<?php
+
+class EchoStream implements \React\Stream\WritableStreamInterface
+{
+
+    public function on($event, callable $listener)
+    {
+        // TODO: Implement on() method.
+    }
+
+    public function once($event, callable $listener)
+    {
+        // TODO: Implement once() method.
+    }
+
+    public function removeListener($event, callable $listener)
+    {
+        // TODO: Implement removeListener() method.
+    }
+
+    public function removeAllListeners($event = null)
+    {
+        // TODO: Implement removeAllListeners() method.
+    }
+
+    public function listeners($event = null)
+    {
+        // TODO: Implement listeners() method.
+    }
+
+    public function emit($event, array $arguments = [])
+    {
+        // TODO: Implement emit() method.
+    }
+
+    public function isWritable()
+    {
+        return true;
+    }
+    public function write($data)
+    {
+        echo $data;
+    }
+
+    public function end($data = null)
+    {
+        // TODO: Implement end() method.
+    }
+    public function close()
+    {
+        // TODO: Implement close() method.
+    }
+}

tests/fixtures/server.php

@@ -2,23 +2,28 @@
 
 use Psy\Configuration;
 use BeyondCode\LaravelTinkerServer\Server;
-use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\BufferedOutput;
 
 $componentRoot = $_SERVER['COMPONENT_ROOT'] ?? __DIR__.'/../..';
 
 $file = $componentRoot.'/vendor/autoload.php';
 
 require $file;
+require $_SERVER['COMPONENT_ROOT'].'/tests/fixtures/EchoStream.php';
 
-$output = new ConsoleOutput();
+$loop = \React\EventLoop\Factory::create();
+
+$output = new BufferedOutput();
 
 $config = new Configuration([
     'updateCheck' => 'never',
 ]);
 
+$stdio = new \Clue\React\Stdio\Stdio($loop, null, new \EchoStream());
+
 $shell = new \Psy\Shell($config);
 
-$server = new Server(getenv('TINKER_SERVER_HOST'), $shell, $output);
+$server = new Server(getenv('TINKER_SERVER_HOST'), $shell, $output, $loop, $stdio);
 
 echo "READY\n";