From 14d802b8f36ed8dbf1621050bc704cfac821339f Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sun, 7 Oct 2018 18:12:38 +0200 Subject: [PATCH] Refactor method to throw exception instead of true/false Signed-off-by: Daniel Kesselberg --- core/Command/Base.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/core/Command/Base.php b/core/Command/Base.php index dbf6c71b8f..0695582ef5 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; + if ($this->php_pcntl_signal === false) { + return; + } + + pcntl_signal_dispatch(); + + if ($this->interrupted === true) { + throw new InterruptedException('Command interrupted by user'); } }