Append additional (error) message only if error_get_last() returns …

…non-null value #20294
yiisoft · Dec 8, 2024 · b3c23da · b3c23da
1 parent 0b3370e
commit b3c23da
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/framework/caching/FileCache.php b/framework/caching/FileCache.php
@@ -159,10 +159,7 @@ protected function setValue($key, $value, $duration)
         }
 
         $message = "Unable to write cache file '{$cacheFile}'";
-
-        if ($error = error_get_last()) {
-            $message .= ": {$error['message']}";
-        }
+        ($error = error_get_last()) and $message .= ": {$error['message']}";
 
         Yii::warning($message, __METHOD__);
 
@@ -271,20 +268,22 @@ protected function gcRecursive($path, $expiredOnly)
                     continue;
                 }
                 $fullPath = $path . DIRECTORY_SEPARATOR . $file;
+                $message = null;
                 if (is_dir($fullPath)) {
                     $this->gcRecursive($fullPath, $expiredOnly);
                     if (!$expiredOnly) {
                         if (!@rmdir($fullPath)) {
-                            $error = error_get_last();
-                            Yii::warning("Unable to remove directory '{$fullPath}': {$error['message']}", __METHOD__);
+                            $message = "Unable to remove directory '$fullPath'";
+                            ($error = error_get_last()) and $message .= ": {$error['message']}";
                         }
                     }
                 } elseif (!$expiredOnly || $expiredOnly && @filemtime($fullPath) < time()) {
                     if (!@unlink($fullPath)) {
-                        $error = error_get_last();
-                        Yii::warning("Unable to remove file '{$fullPath}': {$error['message']}", __METHOD__);
+                        $message = "Unable to remove file '$fullPath'";
+                        ($error = error_get_last()) and $message .= ": {$error['message']}";
                     }
                 }
+                $message and Yii::warning($message, __METHOD__);
             }
             closedir($handle);
         }

diff --git a/framework/log/FileTarget.php b/framework/log/FileTarget.php
@@ -131,8 +131,9 @@ public function export()
         }
         $writeResult = @fwrite($fp, $text);
         if ($writeResult === false) {
-            $error = error_get_last();
-            throw new LogRuntimeException("Unable to export log through file ({$this->logFile})!: {$error['message']}");
+            $message = "Unable to export log through file ($this->logFile)!";
+            ($error = error_get_last()) and $message .= ": {$error['message']}";
+            throw new LogRuntimeException($message);
         }
         $textSize = strlen($text);
         if ($writeResult < $textSize) {