fix: Psysh now stops waiting for input because of calling the exit command by throwing a BreakException

Closes #162

Author: Roboroads

CHANGELOG.md

@@ -7,14 +7,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased]
 ### Fixed
 - [[#46]](https://github.com/Roboroads/laravel-tinker/issues/46) Execution on docker
-  - ℹ️ This does not fix the "string conversion" error found when using `docker exec`. You still have to use `docker run` for now.
-- [[#162]](https://github.com/Roboroads/laravel-tinker/issues/162) ~~Fixes~~ Workarounds endless execution of the tinker process.
-- Compatibility issue with JB version 2022.2 regarding `ContentFactory.SERVICE`
+  - ℹ️This does not fix the "string conversion" error found when using `docker exec`. You still have to use `docker run` for now.
+- [[#162]](https://github.com/Roboroads/laravel-tinker/issues/162) Endless execution of the tinker process in several usecases (like JB 2022.2 EAP)
+- Compatibility issue with JB 2022.2 (EAP) regarding `ContentFactory.SERVICE`
 
 ## [2.3.3]
 ### Removed
 - [[#136]](https://github.com/Roboroads/laravel-tinker/issues/136) Upper version limit for JB products.
-  - ℹ️This will enable the plugin to be compatible for all JB products >= 211 until a compatibility issue shows up.
+  - ℹ This will enable the plugin to be compatible for all JB products >= 211 until a compatibility issue shows up. 
 
 ## [2.3.2]
 ### Changed

src/main/kotlin/nl/deschepers/laraveltinker/listener/PhpProcessListener.kt

@@ -19,7 +19,6 @@ class PhpProcessListener(private val project: Project, private val processHandle
     companion object {
         private const val OUTPUT_START_SEQUENCE = "%%START-OUTPUT%%"
         private const val OUTPUT_END_SEQUENCE = "%%END-OUTPUT%%"
-        private const val OUTPUT_EOT_PROMPT = "%%EOT%%"
         private const val SUPPORT_MESSAGE_EXECUTIONS = 10
     }
 
@@ -58,17 +57,14 @@ class PhpProcessListener(private val project: Project, private val processHandle
     }
 
     override fun onTextAvailable(event: ProcessEvent, outputType: Key<*>) {
+//        print(event.text) //DEBUG: Print full command output to console
         if (firstLine) {
             firstLine = false
             return
         }
 
         var capText = event.text
 
-        if (capText == OUTPUT_EOT_PROMPT) {
-            processHandler.destroyProcess()
-        }
-
         if (!capturing && capText.contains(OUTPUT_START_SEQUENCE)) {
             capText =
                 capText.substring(
@@ -77,8 +73,6 @@ class PhpProcessListener(private val project: Project, private val processHandle
             capturing = true
         }
         if (capturing && capText.contains(OUTPUT_END_SEQUENCE)) {
-            capText = capText.substring(0, capText.indexOf(OUTPUT_END_SEQUENCE))
-            processOutput.add(capText)
             capturing = false
         }
 

src/main/resources/scripts/tinker_run.php

@@ -13,7 +13,7 @@
     'updateCheck' => 'never',
     'usePcntl' => false,
     'useReadline' => false,
-    'prompt' => '%%EOT%%'
+    'prompt' => '%%END-OUTPUT%%'
 ]);
 
 $casters = [
@@ -59,7 +59,8 @@
     $sanitizedRunCode .= $token;
 }
 
-$shell->addInput($sanitizedRunCode . "; exit('%%END-OUTPUT%%');", true);
+$shell->addInput($sanitizedRunCode, true);
+$shell->addInput('throw new \Psy\Exception\BreakException("%%END-OUTPUT%%");', true);
 $closure = new \Psy\ExecutionLoopClosure($shell);
 $closure->execute();
 

src/main/resources/strings/strings.properties

@@ -3,7 +3,7 @@ lt.run=Run Tinker
 lt.running=Running Tinker console..
 lt.tinker.output=Tinker Output:
 lt.started.at=// Laravel Tinker started at {0}
-lt.execution.finished=*** Execution finished ***
+lt.execution.finished=\n*** Execution finished ***
 lt.consider.supporting=Does the Laravel Tinker plugin help you being productive?\nConsider <a href="https://www.patreon.com/roboroads">supporting it</a>.
 
 lt.settings.php_interpreter=PHP interpreter settings