Skip to content

Commit e519c1e

Browse files
MDL-86470 lib: Set Moodle files after PHPSpreadSheet upgrade
1 parent 2519191 commit e519c1e

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

public/lib/phpspreadsheet/moodle.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/lib/phpspreadsheet/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php b/lib/phpspreadsheet/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
1+
diff --git a/public/lib/phpspreadsheet/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php b/public/lib/phpspreadsheet/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
22
index 022c1bb0d1..a17cb419a9 100644
3-
--- a/lib/phpspreadsheet/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
4-
+++ b/lib/phpspreadsheet/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
3+
--- a/public/lib/phpspreadsheet/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
4+
+++ b/public/lib/phpspreadsheet/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
55
@@ -112,6 +112,12 @@ class File
66
*/
77
public static function sysGetTempDir(): string

public/lib/phpspreadsheet/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@ public static function realpath(string $filename): string
112112
*/
113113
public static function sysGetTempDir(): string
114114
{
115+
// Moodle hack!
116+
if (function_exists('make_temp_directory')) {
117+
$temp = make_temp_directory('phpspreadsheet');
118+
return realpath(dirname($temp));
119+
}
120+
115121
$path = sys_get_temp_dir();
116122
if (self::$useUploadTempDirectory) {
117123
// use upload-directory when defined to allow running on environments having very restricted

public/lib/phpspreadsheet/readme_moodle.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mv lib/phpspreadsheet/moodle.diff ./
66
rm -rf lib/phpspreadsheet/*
77
tempdir=`mktemp -d`
88
cd "${tempdir}"
9-
composer init --require phpoffice/phpspreadsheet:^4 -n
9+
composer init --require phpoffice/phpspreadsheet:^5 -n
1010
cat composer.json | jq '.replace."composer/pcre"="*"' --indent 4 > composer.json.tmp; mv composer.json.tmp composer.json
1111
cat composer.json | jq '.replace."maennchen/zipstream-php"="*"' --indent 4 > composer.json.tmp; mv composer.json.tmp composer.json
1212
cat composer.json | jq '.replace."psr/http-client"="*"' --indent 4 > composer.json.tmp; mv composer.json.tmp composer.json

0 commit comments

Comments
 (0)