From f2835a985045311da8eca035f88e052d5730b2b5 Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Fri, 7 Oct 2022 17:15:47 +1100
Subject: [PATCH] MDL-75484 lib: Set Moodle files after PHPSpreadSheet upgrade

---
 lib/phpspreadsheet/readme_moodle.txt                        | 2 +-
 .../phpspreadsheet/src/PhpSpreadsheet/Shared/File.php       | 6 ++++++
 lib/thirdpartylibs.xml                                      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/phpspreadsheet/readme_moodle.txt b/lib/phpspreadsheet/readme_moodle.txt
index 41a0120ca14..f11d6a959a5 100644
--- a/lib/phpspreadsheet/readme_moodle.txt
+++ b/lib/phpspreadsheet/readme_moodle.txt
@@ -71,7 +71,7 @@ STEPS:
  * Update lib/thirdpartylibs.xml
  * Apply the modifications described in the CHANGES section
  * Create another commit with the previous two steps of changes
- * Go to http://localhost/lib/tests/other/spreadsheettestpage.php and test the generated files
+ * Go to http://<your moodle root>/lib/tests/other/spreadsheettestpage.php and test the generated files
 
 
 CHANGES:
diff --git a/lib/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php b/lib/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
index f2fe8caa837..63ce0e036a6 100644
--- a/lib/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
+++ b/lib/phpspreadsheet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
@@ -114,6 +114,12 @@ class File
      */
     public static function sysGetTempDir(): string
     {
+        // Moodle hack!
+        if (function_exists('make_temp_directory')) {
+            $temp = make_temp_directory('phpspreadsheet');
+            return realpath(dirname($temp));
+        }
+
         $path = sys_get_temp_dir();
         if (self::$useUploadTempDirectory) {
             //  use upload-directory when defined to allow running on environments having very restricted
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index 2f87c6aa2ef..a2a0419e5e9 100644
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -54,7 +54,7 @@
     <location>phpspreadsheet</location>
     <name>PhpSpreadsheet</name>
     <description>Library to read, write and create spreadsheet documents in PHP.</description>
-    <version>1.21.0</version>
+    <version>1.25.2</version>
     <license>MIT</license>
     <repository>https://github.com/PHPOffice/PhpSpreadsheet</repository>
     <customised/>