Prefer classic if construct #20294

yiisoft · Dec 9, 2024 · 52ff9db · 52ff9db
1 parent b3c23da
commit 52ff9db
Show file tree

Hide file tree

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

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