Skip to content

Commit 413d47a

Browse files
xcopyterabytesoftw
authored andcommitted
Prefer classic if construct yiisoft#20294
1 parent db6c1b0 commit 413d47a

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

framework/caching/FileCache.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,10 @@ protected function setValue($key, $value, $duration)
160160
}
161161

162162
$message = "Unable to write cache file '{$cacheFile}'";
163-
($error = error_get_last()) and $message .= ": {$error['message']}";
163+
164+
if ($error = error_get_last()) {
165+
$message .= ": {$error['message']}";
166+
}
164167

165168
Yii::warning($message, __METHOD__);
166169

@@ -275,13 +278,17 @@ protected function gcRecursive($path, $expiredOnly)
275278
if (!$expiredOnly) {
276279
if (!@rmdir($fullPath)) {
277280
$message = "Unable to remove directory '$fullPath'";
278-
($error = error_get_last()) and $message .= ": {$error['message']}";
281+
if ($error = error_get_last()) {
282+
$message .= ": {$error['message']}";
283+
}
279284
}
280285
}
281286
} elseif (!$expiredOnly || $expiredOnly && @filemtime($fullPath) < time()) {
282287
if (!@unlink($fullPath)) {
283288
$message = "Unable to remove file '$fullPath'";
284-
($error = error_get_last()) and $message .= ": {$error['message']}";
289+
if ($error = error_get_last()) {
290+
$message .= ": {$error['message']}";
291+
}
285292
}
286293
}
287294
$message and Yii::warning($message, __METHOD__);

framework/log/FileTarget.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ public function export()
114114
$writeResult = @fwrite($fp, $text);
115115
if ($writeResult === false) {
116116
$message = "Unable to export log through file ($this->logFile)!";
117-
($error = error_get_last()) and $message .= ": {$error['message']}";
117+
if ($error = error_get_last()) {
118+
$message .= ": {$error['message']}";
119+
}
118120
throw new LogRuntimeException($message);
119121
}
120122
$textSize = strlen($text);

0 commit comments

Comments
 (0)