Skip to content

Commit 65cd5af

Browse files
Change from git apply to patch command
1 parent 7b5ca1b commit 65cd5af

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ RUN php /tmp/extensions-skins.php "extensions" "/tmp/extensions.yaml"
117117

118118
# Apply patch for UploadedFile.php
119119
RUN set -x; \
120-
cd $MW_HOME/includes/libs/ParamValidator/Util \
121-
&& git apply /tmp/uploadedFileChanges.patch -v --no-index
120+
patch $MW_HOME/includes/libs/ParamValidator/Util/UploadedFile.php /tmp/uploadedFileChanges.patch
122121

123122
# Patch composer
124123
RUN set -x; \

_sources/patches/uploadedFileChanges.patch

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
diff --git a/UploadedFile.php b/UploadedFile.php
2-
index dbd19b0..972d0e7 100644
3-
--- a/UploadedFile.php
4-
+++ b/UploadedFile.php
5-
@@ -19,121 +19,122 @@ use Wikimedia\AtEase\AtEase;
1+
--- UploadedFile.php 2025-07-17 10:56:07.215580011 +0000
2+
+++ UploadedFile.php 2025-07-17 10:56:36.432388011 +0000
3+
@@ -19,121 +19,122 @@
64
*/
75
class UploadedFile implements UploadedFileInterface {
86

97
- /** @var array File data */
108
- private $data;
11-
-
9+
+ /** @var array File data */
10+
+ private $data;
11+
1212
- /** @var bool */
1313
- private $fromUpload;
14-
-
14+
+ /** @var bool */
15+
+ private $fromUpload;
16+
1517
- /** @var UploadedFileStream|null */
1618
- private $stream = null;
17-
-
19+
+ /** @var UploadedFileStream|null */
20+
+ private $stream = null;
21+
1822
- /** @var bool Whether moveTo() was called */
1923
- private $moved = false;
2024
-
@@ -122,15 +126,6 @@ index dbd19b0..972d0e7 100644
122126
- $ret = $this->data['type'] ?? null;
123127
- return $ret === '' ? null : $ret;
124128
- }
125-
+ /** @var array File data */
126-
+ private $data;
127-
+
128-
+ /** @var bool */
129-
+ private $fromUpload;
130-
+
131-
+ /** @var UploadedFileStream|null */
132-
+ private $stream = null;
133-
+
134129
+ /** @var bool Whether moveTo() was called */
135130
+ private $moved = false;
136131
+

0 commit comments

Comments
 (0)