From 33af8b75e98ada9092791cccda09e21d742c5ee9 Mon Sep 17 00:00:00 2001 From: dianafa Date: Fri, 11 Dec 2015 12:02:00 +0100 Subject: [PATCH] rename getAdjustedImageSize to getImageSizesForThumbnailer --- .../Helpers/PortableInfoboxRenderServiceHelper.php | 4 ++-- tests/PortableInfoboxRenderServiceHelperTest.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/Helpers/PortableInfoboxRenderServiceHelper.php b/services/Helpers/PortableInfoboxRenderServiceHelper.php index a680943..3c04a52 100644 --- a/services/Helpers/PortableInfoboxRenderServiceHelper.php +++ b/services/Helpers/PortableInfoboxRenderServiceHelper.php @@ -203,7 +203,7 @@ class PortableInfoboxRenderServiceHelper { $file = \WikiaFileHelper::getFileFromTitle( $title ); if ( $file ) { - $size = $this->getAdjustedImageSize( $file ); + $size = $this->getImageSizesForThumbnailer( $file ); $thumb = $file->transform( $size ); if ( !is_null( $thumb ) && !$thumb->isError() ) { @@ -225,7 +225,7 @@ class PortableInfoboxRenderServiceHelper { * @param $image * @return array width and height */ - public function getAdjustedImageSize( $image ) { + public function getImageSizesForThumbnailer( $image ) { global $wgPortableInfoboxCustomImageWidth; if ( $this->isWikiaMobile() ) { diff --git a/tests/PortableInfoboxRenderServiceHelperTest.php b/tests/PortableInfoboxRenderServiceHelperTest.php index d5dc14d..a7db422 100644 --- a/tests/PortableInfoboxRenderServiceHelperTest.php +++ b/tests/PortableInfoboxRenderServiceHelperTest.php @@ -389,7 +389,7 @@ class PortableInfoboxRenderServiceHelperTest extends WikiaBaseTest { } /** - * @desc test getAdjustedImageSize function. It should return the sizes we pass to transform function, + * @desc test getImageSizesForThumbnailer function. It should return the sizes we pass to transform function, * not the sizes we want image to have. transform adjusts the correct sizes, * that is creates thumbnail with sizes not bigger than passed, keeping the original aspect ratio. * @@ -398,9 +398,9 @@ class PortableInfoboxRenderServiceHelperTest extends WikiaBaseTest { * @param $wgPortableInfoboxCustomImageWidth * @param $result * @param $description - * @dataProvider testGetAdjustedImageSizeDataProvider + * @dataProvider testGetImageSizesForThumbnailerDataProvider */ - public function testGetAdjustedImageSize( $mockParams, $isWikiaMobile, $wgPortableInfoboxCustomImageWidth, $result, $description ) { + public function testGetImageSizesForThumbnailer( $mockParams, $isWikiaMobile, $wgPortableInfoboxCustomImageWidth, $result, $description ) { $this->mockGlobalVariable('wgPortableInfoboxCustomImageWidth', $wgPortableInfoboxCustomImageWidth); $mock = $this->getMockBuilder( 'Wikia\PortableInfobox\Helpers\PortableInfoboxRenderServiceHelper' ) ->setMethods( [ 'isWikiaMobile' ] ) @@ -411,12 +411,12 @@ class PortableInfoboxRenderServiceHelperTest extends WikiaBaseTest { $this->assertEquals( $result, - $mock->getAdjustedImageSize( $file ), + $mock->getImageSizesForThumbnailer( $file ), $description ); } - public function testGetAdjustedImageSizeDataProvider() { + public function testGetImageSizesForThumbnailerDataProvider() { return [ [ 'mockParams' => [