From 54f00e3f52c8061da55a38e9bb3d16738efb5871 Mon Sep 17 00:00:00 2001 From: scil Date: Mon, 7 Oct 2019 19:28:44 +0800 Subject: [PATCH 1/4] new Shell to avoid \readline --- src/Shell/Shell.php | 38 ++++++++++++++++++++++++++++++++++++++ src/Tinker.php | 4 ++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 src/Shell/Shell.php diff --git a/src/Shell/Shell.php b/src/Shell/Shell.php new file mode 100644 index 0000000..f4f57c3 --- /dev/null +++ b/src/Shell/Shell.php @@ -0,0 +1,38 @@ +inputBuffer = []; + } + + public function addInput($input, $silent = false) + { + foreach ((array) $input as $line) { + $this->inputBuffer[] = $silent ? new SilentInput($line) : $line; + } + } + + protected function readline() + { + if (! empty($this->inputBuffer)) { + return \array_shift($this->inputBuffer); + } + + return false; + } +} diff --git a/src/Tinker.php b/src/Tinker.php index 53cb3c3..a902b45 100644 --- a/src/Tinker.php +++ b/src/Tinker.php @@ -2,7 +2,6 @@ namespace Spatie\WebTinker; -use Psy\Shell; use Psy\Configuration; use Psy\ExecutionLoopClosure; use Illuminate\Support\Collection; @@ -10,6 +9,7 @@ use Illuminate\Database\Eloquent\Model; use Laravel\Tinker\ClassAliasAutoloader; use Spatie\WebTinker\OutputModifiers\OutputModifier; +use Spatie\WebTinker\Shell\Shell; use Symfony\Component\Console\Output\BufferedOutput; class Tinker @@ -17,7 +17,7 @@ class Tinker /** @var \Symfony\Component\Console\Output\BufferedOutput */ protected $output; - /** @var \Psy\Shell */ + /** @var Shell */ protected $shell; /** @var \Spatie\WebTinker\OutputModifiers\OutputModifier */ From 811aa019c73d0cc2cec377889f4a9f6be85c5cd3 Mon Sep 17 00:00:00 2001 From: scil Date: Mon, 7 Oct 2019 19:36:52 +0800 Subject: [PATCH 2/4] Update Tinker.php --- src/Tinker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tinker.php b/src/Tinker.php index a902b45..de25116 100644 --- a/src/Tinker.php +++ b/src/Tinker.php @@ -4,12 +4,12 @@ use Psy\Configuration; use Psy\ExecutionLoopClosure; +use Spatie\WebTinker\Shell\Shell; use Illuminate\Support\Collection; use Illuminate\Foundation\Application; use Illuminate\Database\Eloquent\Model; use Laravel\Tinker\ClassAliasAutoloader; use Spatie\WebTinker\OutputModifiers\OutputModifier; -use Spatie\WebTinker\Shell\Shell; use Symfony\Component\Console\Output\BufferedOutput; class Tinker From 681e72d4658a281c55ef4fbbb472e5afe2337dca Mon Sep 17 00:00:00 2001 From: scil Date: Wed, 12 Feb 2020 15:56:29 +0800 Subject: [PATCH 3/4] Update Tinker.php --- src/Tinker.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tinker.php b/src/Tinker.php index 737efc9..84d36e6 100644 --- a/src/Tinker.php +++ b/src/Tinker.php @@ -2,15 +2,15 @@ namespace Spatie\WebTinker; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Collection; +use Illuminate\Foundation\Application; +use Laravel\Tinker\ClassAliasAutoloader; use Psy\Configuration; use Psy\ExecutionLoopClosure; use Psy\Shell; use Spatie\WebTinker\OutputModifiers\OutputModifier; use Symfony\Component\Console\Output\BufferedOutput; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Collection; -use Illuminate\Foundation\Application; -use Laravel\Tinker\ClassAliasAutoloader; class Tinker { From 29a8c2c3366b2a8d23c1f62086acb7707d85dd4f Mon Sep 17 00:00:00 2001 From: scil Date: Wed, 12 Feb 2020 17:30:59 +0800 Subject: [PATCH 4/4] Update Tinker.php --- src/Tinker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tinker.php b/src/Tinker.php index 84d36e6..1304943 100644 --- a/src/Tinker.php +++ b/src/Tinker.php @@ -3,8 +3,8 @@ namespace Spatie\WebTinker; use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Collection; use Illuminate\Foundation\Application; +use Illuminate\Support\Collection; use Laravel\Tinker\ClassAliasAutoloader; use Psy\Configuration; use Psy\ExecutionLoopClosure;