Merge pull request #11664 from nextcloud/feature/noid/has-been-interrupted-throw-exception

Syntactic sugar for hasBeenInterrupted

1 files changed, 12 insertions, 8 deletions

diff --git a/core/Command/Base.php b/core/Command/Base.php
index dbf6c71b8f4..4eca5bcaab7 100644
--- a/core/Command/Base.php
+++ b/core/Command/Base.php
@@ -129,15 +129,19 @@ class Base extends Command implements CompletionAwareInterface {
 	}
 
 	/**
-	 * @return bool
+	 * Throw InterruptedException when interrupted by user
+	 *
+	 * @throws InterruptedException
 	 */
-	protected function hasBeenInterrupted() {
-		// return always false if pcntl_signal functions are not accessible
-		if ($this->php_pcntl_signal) {
-			pcntl_signal_dispatch();
-			return $this->interrupted;
-		} else {
-			return false;
+	protected function abortIfInterrupted() {
+		if ($this->php_pcntl_signal === false) {
+			return;
+		}
+
+		pcntl_signal_dispatch();
+
+		if ($this->interrupted === true) {
+			throw new InterruptedException('Command interrupted by user');
 		}
 	}