diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php index 373224b05..67eccfef2 100755 --- a/Blacklight/processing/post/ProcessAdditional.php +++ b/Blacklight/processing/post/ProcessAdditional.php @@ -529,7 +529,6 @@ class ProcessAdditional * @param string $groupID * @param string $guidChar * - * @throws \Blacklight\processing\post\ProcessAdditionalException * @throws \Exception */ public function start($groupID = '', $guidChar = ''): void @@ -563,7 +562,6 @@ class ProcessAdditional * @param string $groupID * @throws \RuntimeException * @throws \Exception - * @throws \Blacklight\processing\post\ProcessAdditionalException */ protected function _setMainTempPath(&$guidChar, &$groupID = ''): void { @@ -592,7 +590,7 @@ class ProcessAdditional } if (! is_dir($this->_mainTmpPath)) { - throw new ProcessAdditionalException('Could not create the tmpunrar folder ('.$this->_mainTmpPath.')'); + throw new \RuntimeException('Could not create the tmpunrar folder ('.$this->_mainTmpPath.')'); } $this->_clearMainTmpPath(); diff --git a/Blacklight/processing/post/ProcessAdditionalException.php b/Blacklight/processing/post/ProcessAdditionalException.php deleted file mode 100755 index de4eacb7f..000000000 --- a/Blacklight/processing/post/ProcessAdditionalException.php +++ /dev/null @@ -1,26 +0,0 @@ -. - * @author niel - * @copyright 2015 nZEDb - */ - -namespace Blacklight\processing\post; - -class ProcessAdditionalException extends \Exception -{ -} diff --git a/Changelog b/Changelog index c9344dd7d..c851e49d7 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-10-03 DariusIII + * Chg: Update exception handling in ProcessAdditional class and related scripts * Chg: Increase number of pages listed on each side of pagers current page * Chg: Update mockery/mockery to version 1.2.0 2018-10-02 DariusIII diff --git a/misc/update/multiprocessing/.do_not_run/switch.php b/misc/update/multiprocessing/.do_not_run/switch.php index c4d81387d..c86704465 100644 --- a/misc/update/multiprocessing/.do_not_run/switch.php +++ b/misc/update/multiprocessing/.do_not_run/switch.php @@ -315,9 +315,7 @@ switch ($options[1]) { // Post process the releases. try { (new ProcessAdditional(['Echo' => true, 'NNTP' => $nntp]))->start($options[2]); - } catch (\Blacklight\processing\post\ProcessAdditionalException $e) { - echo $e->getMessage(); - } catch (Exception $e) { + } catch (\Throwable $e) { echo $e->getMessage(); } try { @@ -350,9 +348,7 @@ switch ($options[1]) { } else { try { (new ProcessAdditional(['Echo' => true, 'NNTP' => $nntp]))->start('', $options[2]); - } catch (\Blacklight\processing\post\ProcessAdditionalException $e) { - echo $e->getMessage(); - } catch (Exception $e) { + } catch (\Throwable $e) { echo $e->getMessage(); } }