wikimedia/mediawiki-extensions-PageImages
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/PageImages synced 2024-11-27 17:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use a return type hint for PageImages::getPageImageInternal()"

Browse source
This commit is contained in:
jenkins-bot 2023-11-30 10:36:46 +00:00 committed by Gerrit Code Review
parent e2986d0527 4b86859269
commit 04eca18ed1
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
includes/PageImages.php
View file

@ -75,7 +75,7 @@ class PageImages implements
/**
* @return PageImages
*/
private static function factory() {
private static function factory(): self {
$services = MediaWikiServices::getInstance();
return new self(
$services->getDBLoadBalancerFactory(),
@ -133,19 +133,20 @@ class PageImages implements
* Return page image for a given title
*
* @param Title $title Title to get page image for
* @return File|bool
* @return File|false
*/
public static function getPageImage( Title $title ) {
return self::factory()->getPageImageInternal( $title );
// Cast any cacheable null to false
return self::factory()->getPageImageInternal( $title ) ?? false;
}
/**
* Return page image for a given title
*
* @param Title $title Title to get page image for
* @return File|bool
* @return File|null
*/
public function getPageImageInternal( Title $title ) {
public function getPageImageInternal( Title $title ): ?File {
self::$cache ??= new MapCacheLRU( 100 );
$file = self::$cache->getWithSetCallback(
@ -153,13 +154,13 @@ class PageImages implements
fn() => $this->fetchPageImage( $title )
);
// Cast any cacheable null to false
return $file ?? false;
// Cast false to null
return $file ?: null;
}
/**
* @param Title $title Title to get page image for
* @return File|null|bool
* @return File|null|false
*/
private function fetchPageImage( Title $title ) {
if ( !$title->canExist() ) {
@ -189,7 +190,7 @@ class PageImages implements
[ 'ORDER BY' => 'pp_propname' ]
);
if ( !$fileName ) {
// Allow caching, cast null to false later
// Return not found without caching.
return false;
}

2
tests/phpunit/PageImagesTest.php
View file

@ -42,7 +42,7 @@ class PageImagesTest extends MediaWikiIntegrationTestCase {
public function testGivenNonExistingPageGetPageImageReturnsFalse() {
$title = $this->newTitle();
$this->assertFalse( $this->newPageImages()->getPageImageInternal( $title ) );
$this->assertNull( $this->newPageImages()->getPageImageInternal( $title ) );
$this->assertFalse( PageImages::getPageImage( $title ) );
}