dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Upgrade phan config to 0.7.1"
[lhc/web/wiklou.git]
/
includes
/
export
/
XmlDumpWriter.php
diff --git
a/includes/export/XmlDumpWriter.php
b/includes/export/XmlDumpWriter.php
index
f34b3bd
..
e697ef2
100644
(file)
--- a/
includes/export/XmlDumpWriter.php
+++ b/
includes/export/XmlDumpWriter.php
@@
-310,7
+310,8
@@
class XmlDumpWriter {
} catch ( SuppressedDataException $ex ) {
return null;
} catch ( Exception $ex ) {
} catch ( SuppressedDataException $ex ) {
return null;
} catch ( Exception $ex ) {
- if ( $ex instanceof MWException || $ex instanceof RuntimeException ) {
+ if ( $ex instanceof MWException || $ex instanceof RuntimeException ||
+ $ex instanceof InvalidArgumentException ) {
MWDebug::warning( $warning . ': ' . $ex->getMessage() );
return null;
} else {
MWDebug::warning( $warning . ': ' . $ex->getMessage() );
return null;
} else {
@@
-657,6
+658,8
@@
class XmlDumpWriter {
*/
function writeUpload( $file, $dumpContents = false ) {
if ( $file->isOld() ) {
*/
function writeUpload( $file, $dumpContents = false ) {
if ( $file->isOld() ) {
+ /** @var OldLocalFile $file */
+ '@phan-var OldLocalFile $file';
$archiveName = " " .
Xml::element( 'archivename', null, $file->getArchiveName() ) . "\n";
} else {
$archiveName = " " .
Xml::element( 'archivename', null, $file->getArchiveName() ) . "\n";
} else {