diff options
author | Fomafix <fomafix@googlemail.com> | 2024-12-20 14:09:28 +0000 |
---|---|---|
committer | Fomafix <fomafix@googlemail.com> | 2025-01-30 12:21:36 +0000 |
commit | c74a9cfb13138113924ca53d6d44857050b016f1 (patch) | |
tree | 092e72ff0585b12430119b8a9bda1eff883dc7d6 /maintenance | |
parent | cd28604f30cc894f053c370d078ffa217fab5cd1 (diff) | |
download | mediawikicore-c74a9cfb13138113924ca53d6d44857050b016f1.tar.gz mediawikicore-c74a9cfb13138113924ca53d6d44857050b016f1.zip |
Use $string === '' instead of strlen( $string ) === 0
Add $string === false or $string === null where $string can have other
types than a string.
Also document null as possible return value in FileRepo.
Change-Id: Iaa29ba01c3fd6bea506debdc6f929edfe881c808
Diffstat (limited to 'maintenance')
-rw-r--r-- | maintenance/compareParserCache.php | 2 | ||||
-rw-r--r-- | maintenance/deleteArchivedFiles.php | 2 | ||||
-rw-r--r-- | maintenance/eraseArchivedFile.php | 2 | ||||
-rw-r--r-- | maintenance/findMissingFiles.php | 2 | ||||
-rw-r--r-- | maintenance/includes/TextPassDumper.php | 4 | ||||
-rw-r--r-- | maintenance/migrateFileRepoLayout.php | 8 | ||||
-rw-r--r-- | maintenance/refreshFileHeaders.php | 8 |
7 files changed, 14 insertions, 14 deletions
diff --git a/maintenance/compareParserCache.php b/maintenance/compareParserCache.php index 21cddaef3eea..246b07c63bd6 100644 --- a/maintenance/compareParserCache.php +++ b/maintenance/compareParserCache.php @@ -103,7 +103,7 @@ class CompareParserCache extends Maintenance { $formatter = new UnifiedDiffFormatter(); $unifiedDiff = $formatter->format( $diffs ); - if ( strlen( $unifiedDiff ) ) { + if ( $unifiedDiff !== '' ) { $this->output( "differences found:\n\n$unifiedDiff\n\n" ); ++$withdiff; } else { diff --git a/maintenance/deleteArchivedFiles.php b/maintenance/deleteArchivedFiles.php index 56cc3371024e..d9bb3f42e2e7 100644 --- a/maintenance/deleteArchivedFiles.php +++ b/maintenance/deleteArchivedFiles.php @@ -64,7 +64,7 @@ class DeleteArchivedFiles extends Maintenance { $count = 0; foreach ( $res as $row ) { $key = $row->fa_storage_key; - if ( !strlen( $key ) ) { + if ( $key === '' ) { $this->output( "Entry with ID {$row->fa_id} has empty key, skipping\n" ); continue; } diff --git a/maintenance/eraseArchivedFile.php b/maintenance/eraseArchivedFile.php index 4134f536af71..bd68bf746f6a 100644 --- a/maintenance/eraseArchivedFile.php +++ b/maintenance/eraseArchivedFile.php @@ -55,7 +55,7 @@ class EraseArchivedFile extends Maintenance { if ( $filekey === '*' ) { // all versions by name - if ( !strlen( $filename ) ) { + if ( $filename === null || $filename === '' ) { $this->fatalError( "Missing --filename parameter." ); } $afile = false; diff --git a/maintenance/findMissingFiles.php b/maintenance/findMissingFiles.php index a08b2d796f94..336ec4a5bc67 100644 --- a/maintenance/findMissingFiles.php +++ b/maintenance/findMissingFiles.php @@ -95,7 +95,7 @@ class FindMissingFiles extends Maintenance { $checkPaths = []; foreach ( $ores as $row ) { - if ( !strlen( $row->oi_archive_name ) ) { + if ( $row->oi_archive_name === '' ) { // broken row continue; } diff --git a/maintenance/includes/TextPassDumper.php b/maintenance/includes/TextPassDumper.php index 8483c423b1bc..bbe896ca31f5 100644 --- a/maintenance/includes/TextPassDumper.php +++ b/maintenance/includes/TextPassDumper.php @@ -929,12 +929,12 @@ TEXT unset( $attribs['id'] ); unset( $attribs['location'] ); - if ( strlen( $text ) > 0 ) { + if ( $text !== '' ) { $attribs['xml:space'] = 'preserve'; } $this->openElement = [ $name, $attribs ]; - if ( strlen( $text ) > 0 ) { + if ( $text !== '' ) { $this->characterData( $parser, $text ); } } else { diff --git a/maintenance/migrateFileRepoLayout.php b/maintenance/migrateFileRepoLayout.php index e67f791f4eec..ff37bc1417a3 100644 --- a/maintenance/migrateFileRepoLayout.php +++ b/maintenance/migrateFileRepoLayout.php @@ -93,9 +93,9 @@ class MigrateFileRepoLayout extends Maintenance { /** @var LocalFile $file */ $file = $repo->newFile( $row->img_name ); // Check in case SHA1 rows are not populated for some files - $sha1 = strlen( $row->img_sha1 ) ? $row->img_sha1 : $file->getSha1(); + $sha1 = $row->img_sha1 !== '' ? $row->img_sha1 : $file->getSha1(); - if ( !strlen( $sha1 ) ) { + if ( $sha1 === '' ) { $this->error( "Image SHA-1 not known for {$row->img_name}." ); } else { if ( $oldLayout === 'sha1' ) { @@ -122,7 +122,7 @@ class MigrateFileRepoLayout extends Maintenance { foreach ( $file->getHistory() as $ofile ) { $sha1 = $ofile->getSha1(); - if ( !strlen( $sha1 ) ) { + if ( $sha1 === '' ) { $this->error( "Image SHA-1 not set for {$ofile->getArchiveName()}." ); continue; } @@ -184,7 +184,7 @@ class MigrateFileRepoLayout extends Maintenance { foreach ( $res as $row ) { $lastId = $row->fa_id; $sha1Key = $row->fa_storage_key; - if ( !strlen( $sha1Key ) ) { + if ( $sha1Key === '' ) { $this->error( "Image SHA-1 not set for file #{$row->fa_id} (deleted)." ); continue; } diff --git a/maintenance/refreshFileHeaders.php b/maintenance/refreshFileHeaders.php index caa36fcf3b6f..d55986da1c18 100644 --- a/maintenance/refreshFileHeaders.php +++ b/maintenance/refreshFileHeaders.php @@ -73,19 +73,19 @@ class RefreshFileHeaders extends Maintenance { $queryBuilder = FileSelectQueryBuilder::newForFile( $dbr ); $queryBuilder->where( $dbr->expr( 'img_name', '>', $start ) ); - if ( strlen( $end ) ) { + if ( $end !== '' ) { $queryBuilder->andWhere( $dbr->expr( 'img_name', '<=', $end ) ); } - if ( strlen( $media_type ) ) { + if ( $media_type !== '' ) { $queryBuilder->andWhere( [ 'img_media_type' => $media_type ] ); } - if ( strlen( $major_mime ) ) { + if ( $major_mime !== '' ) { $queryBuilder->andWhere( [ 'img_major_mime' => $major_mime ] ); } - if ( strlen( $minor_mime ) ) { + if ( $minor_mime !== '' ) { $queryBuilder->andWhere( [ 'img_minor_mime' => $minor_mime ] ); } |