PHP warnings handling fixed

Author: evgeek

README.md

@@ -235,10 +235,10 @@ Methods for configure:
   disabled. If ```true``` - enabled, with PSR-3 logger messages will be sent to the ```ERROR``` level, without -
   to ```STDERR```. And you can pass custom log level (like ```$debugLog = Logger::WARNING```) to change the default
   PSR-3 channel.
-* ```$logUncaughtErrors``` (default ```false```) - registers shutdown function for log uncaught exceptions such as PHP
-  fatal errors or incorrect task settings.
-* ```$logPhpWarningsToError``` (default ```false```) - If true, PHP non-fatal warnings will be sent to the error
-  channel, otherwise to the debug channel.
+* ```$logUncaughtErrors``` (default ```false```) - registers shutdown function for log uncaught errors such as PHP
+  errors or incorrect task settings.
+* ```$logWarningsToError``` (default ```false```) - ff true, PHP non-fatal errors will be sent to the error channel,
+  otherwise - to the debug channel.
 * ```$logMessageFormat``` (default ```null```) - formatting template for task logger. Pass ```null``` for set default
   formatting (```"[{{task_id}}. {{TASK_TYPE}} '{{task_name}}']: {{message}}"```). Available variables:
     * ```{{task_id}}```

src/Config.php

@@ -24,15 +24,15 @@ class Config
      */
     private $errorLog;
     /**
-     * Registers shutdown function for logging PHP runtime fatal errors that the scheduler cannot catch
+     * Registers shutdown function for logging PHP errors
      * @var bool
      */
     private $logUncaughtErrors;
     /**
-     * If true, PHP warnings will be sent to the error channel, otherwise - to the debug channel
+     * If true, PHP non-fatal errors will be sent to the error channel, otherwise - to the debug channel
      * @var bool
      */
-    private $logPhpWarningsToError;
+    private $logWarningsToError;
     /**
      * Log message formatting string.
      * Available variables: {{task_id}}, {{task_type}}, {{TASK_TYPE}}, {{task_name}}, {{TASK_NAME}},
@@ -109,8 +109,8 @@ class Config
      * @param ?LoggerInterface $logger PSR-3 is a compatible logger. If null - the log will be sent to the STDOUT/STDERR.
      * @param mixed $debugLog False/null - debug log disabled. True - enabled (STDOUT/DEBUG). Or set custom PSR-3 level.
      * @param mixed $errorLog False/null - error log disabled. True - enabled (STDERR/ERROR). Or set custom PSR-3 level.
-     * @param bool $logUncaughtErrors Registers shutdown function for logging PHP runtime fatal errors.
-     * @param bool $logPhpWarningsToError If true, PHP warnings will be sent to the error channel, otherwise - to the debug channel.
+     * @param bool $logUncaughtErrors Registers shutdown function for logging PHP errors.
+     * @param bool $logWarningsToError If true, PHP non-fatal errors will be sent to the error channel, otherwise - to the debug channel
      * @param ?string $logMessageFormat Log message formatting string. Available {{task_id}}, {{task_type}}, {{task_name}},
      *      {{message}} and {{task_description}} variables. Lowercase for regular case, uppercase - for forced uppercase.
      *      Pass null for default formatting: "[{{task_id}}. {{TASK_TYPE}} '{{task_name}}']: {{message}}".
@@ -133,7 +133,7 @@ public function __construct(
                         $debugLog = false,
                         $errorLog = true,
         bool            $logUncaughtErrors = false,
-        bool            $logPhpWarningsToError = false,
+        bool            $logWarningsToError = false,
         ?string         $logMessageFormat = null,
         ?int            $maxLogMsgLength = null,
         ?array          $exceptionLogMatching = [],
@@ -151,7 +151,7 @@ public function __construct(
         $this->debugLog = $debugLog;
         $this->errorLog = $errorLog;
         $this->logUncaughtErrors = $logUncaughtErrors;
-        $this->logPhpWarningsToError = $logPhpWarningsToError;
+        $this->logWarningsToError = $logWarningsToError;
         $this->logMessageFormat = $logMessageFormat ?? "[{{task_id}}. {{TASK_TYPE}} '{{task_name}}']: {{message}}";
 
         if ($maxLogMsgLength !== null && $maxLogMsgLength <= 0) {
@@ -224,7 +224,7 @@ public function getErrorLog()
     }
 
     /**
-     * Registers shutdown function for logging PHP runtime fatal errors that the scheduler cannot catch
+     * Registers shutdown function for logging PHP errors
      * @return bool
      */
     public function getLogUncaughtErrors(): bool
@@ -233,12 +233,12 @@ public function getLogUncaughtErrors(): bool
     }
 
     /**
-     * If true, PHP warnings will be sent to the error channel, otherwise - to the debug channel
+     * If true, PHP non-fatal errors will be sent to the error channel, otherwise - to the debug channel
      * @return bool
      */
-    public function getLogPhpWarningsToError(): bool
+    public function getLogWarningsToError(): bool
     {
-        return $this->logPhpWarningsToError;
+        return $this->logWarningsToError;
     }
 
     /**

src/Wrapper/TaskWrapper.php

@@ -501,7 +501,7 @@ public function logDebug(string $message): void
 
     /**
      * Log message to error channel
-     * @param string $header
+     * @param string $message
      * @param Throwable|null $e
      */
     public function logError(string $message, ?Throwable $e = null): void
@@ -544,9 +544,9 @@ private function phpErrorHandler($code, $message, $file, $line): void
         if (array_key_exists($code, PhpErrors::FATAL)) {
             $errName = PhpErrors::FATAL[$code];
             throw new Exception("(ATTENTION: PHP $errName) - $message", $code);
-        } else {
+        } elseif ($this->config->getLogUncaughtErrors()) {
             $message = (PhpErrors::SOFT[$code] ?? 0) . " - $message (code $code, file $file, line $line)";
-            $this->config->getLogPhpWarningsToError() ?
+            $this->config->getLogWarningsToError() ?
                 $this->logError($message) :
                 $this->logDebug($message);