MDL-70901 core: @ no longer masks errors in PHP 8.0

moodle · Feb 22, 2021 · b88f1a8 · b88f1a8
1 parent 2d059d1
commit b88f1a8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/backup/util/loggers/file_logger.class.php b/backup/util/loggers/file_logger.class.php
@@ -97,7 +97,7 @@ protected function action($message, $level, $options = null) {
         } else {
             $content = $prefix . str_repeat('&nbsp;&nbsp;', $depth) . htmlentities($message, ENT_QUOTES, 'UTF-8') . '<br/>' . PHP_EOL;
         }
-        if (false === fwrite($this->fhandle, $content)) {
+        if (!is_resource($this->fhandle) || (false === fwrite($this->fhandle, $content))) {
             throw new base_logger_exception('error_writing_file', $this->fullpath);
         }
         return true;

diff --git a/lib/classes/task/file_temp_cleanup_task.php b/lib/classes/task/file_temp_cleanup_task.php
@@ -90,7 +90,11 @@ protected function execute_on($tmpdir) {
             } else {
                 // Return the time modified to the original date only for real files.
                 if ($iter->isDir() && !$iter->isDot()) {
-                    touch($node, $modifieddateobject[$node]);
+                    try {
+                        @touch($node, $modifieddateobject[$node]);
+                    } catch (\Throwable $t) {
+                        null;
+                    }
                 }
             }
         }

diff --git a/lib/filestorage/file_system_filedir.php b/lib/filestorage/file_system_filedir.php
@@ -395,7 +395,10 @@ public function add_file_from_path($pathname, $contenthash = null) {
         }
         rename($hashfile.'.tmp', $hashfile);
         chmod($hashfile, $this->filepermissions); // Fix permissions if needed.
-        @unlink($hashfile.'.tmp'); // Just in case anything fails in a weird way.
+        if (file_exists($hashfile.'.tmp')) {
+            // Just in case anything fails in a weird way.
+            @unlink($hashfile.'.tmp');
+        }
         ignore_user_abort($prev);
 
         return array($contenthash, $filesize, $newfile);