Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/theming/lib/Controller/IconController.php4
-rw-r--r--apps/theming/lib/Controller/ThemingController.php14
-rw-r--r--apps/theming/lib/IconBuilder.php9
-rw-r--r--apps/theming/lib/ImageManager.php87
-rw-r--r--apps/theming/lib/Settings/Admin.php2
-rw-r--r--apps/theming/lib/ThemingDefaults.php33
-rw-r--r--apps/theming/tests/Controller/IconControllerTest.php13
-rw-r--r--apps/theming/tests/Controller/ThemingControllerTest.php4
-rw-r--r--apps/theming/tests/IconBuilderTest.php23
-rw-r--r--apps/theming/tests/ImageManagerTest.php67
-rw-r--r--apps/theming/tests/ThemingDefaultsTest.php2
-rw-r--r--lib/private/Server.php2
12 files changed, 182 insertions, 78 deletions
diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php
index 0caf9a2bc37..a2727546e09 100644
--- a/apps/theming/lib/Controller/IconController.php
+++ b/apps/theming/lib/Controller/IconController.php
@@ -119,7 +119,7 @@ class IconController extends Controller {
$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
} catch (NotFoundException $e) {
}
- if ($iconFile === null && $this->themingDefaults->shouldReplaceIcons()) {
+ if ($iconFile === null && $this->imageManager->shouldReplaceIcons()) {
try {
$iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
} catch (NotFoundException $exception) {
@@ -155,7 +155,7 @@ class IconController extends Controller {
$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
} catch (NotFoundException $e) {
}
- if ($this->themingDefaults->shouldReplaceIcons()) {
+ if ($this->imageManager->shouldReplaceIcons()) {
try {
$iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
} catch (NotFoundException $exception) {
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index 99b98ab7da3..96f8dfde9fd 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -262,6 +262,8 @@ class ThemingController extends Controller {
$folder = $this->appData->newFolder('images');
}
+ $this->imageManager->delete($key);
+
$target = $folder->newFile($key);
$supportedFormats = ['image/jpeg', 'image/png', 'image/gif', 'image/svg+xml', 'image/svg'];
$detectedMimeType = mime_content_type($image['tmp_name']);
@@ -351,12 +353,13 @@ class ThemingController extends Controller {
* @NoCSRFRequired
*
* @param string $key
+ * @param bool $useSvg
* @return FileDisplayResponse|NotFoundResponse
- * @throws \Exception
+ * @throws NotPermittedException
*/
- public function getImage(string $key) {
+ public function getImage(string $key, bool $useSvg = true) {
try {
- $file = $this->imageManager->getImage($key);
+ $file = $this->imageManager->getImage($key, $useSvg);
} catch (NotFoundException $e) {
return new NotFoundResponse();
}
@@ -365,6 +368,11 @@ class ThemingController extends Controller {
$response->cacheFor(3600);
$response->addHeader('Content-Type', $this->config->getAppValue($this->appName, $key . 'Mime', ''));
$response->addHeader('Content-Disposition', 'attachment; filename="' . $key . '"');
+ if (!$useSvg) {
+ $response->addHeader('Content-Type', 'image/png');
+ } else {
+ $response->addHeader('Content-Type', $this->config->getAppValue($this->appName, $key . 'Mime', ''));
+ }
return $response;
}
diff --git a/apps/theming/lib/IconBuilder.php b/apps/theming/lib/IconBuilder.php
index ad44dd7ed6c..f85e2f9bff8 100644
--- a/apps/theming/lib/IconBuilder.php
+++ b/apps/theming/lib/IconBuilder.php
@@ -35,19 +35,24 @@ class IconBuilder {
private $themingDefaults;
/** @var Util */
private $util;
+ /** @var ImageManager */
+ private $imageManager;
/**
* IconBuilder constructor.
*
* @param ThemingDefaults $themingDefaults
* @param Util $util
+ * @param ImageManager $imageManager
*/
public function __construct(
ThemingDefaults $themingDefaults,
- Util $util
+ Util $util,
+ ImageManager $imageManager
) {
$this->themingDefaults = $themingDefaults;
$this->util = $util;
+ $this->imageManager = $imageManager;
}
/**
@@ -55,7 +60,7 @@ class IconBuilder {
* @return string|false image blob
*/
public function getFavicon($app) {
- if (!$this->themingDefaults->shouldReplaceIcons()) {
+ if (!$this->imageManager->shouldReplaceIcons()) {
return false;
}
try {
diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php
index 830ed7f34a9..dfbdb582da6 100644
--- a/apps/theming/lib/ImageManager.php
+++ b/apps/theming/lib/ImageManager.php
@@ -26,24 +26,28 @@ namespace OCA\Theming;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder;
+use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
+use OCP\ILogger;
use OCP\IURLGenerator;
-/**
- * @property IURLGenerator urlGenerator
- */
class ImageManager {
/** @var IConfig */
private $config;
/** @var IAppData */
private $appData;
-
+ /** @var IURLGenerator */
+ private $urlGenerator;
/** @var array */
private $supportedImageKeys = ['background', 'logo', 'logoheader', 'favicon'];
+ /** @var ICacheFactory */
+ private $cacheFactory;
+ /** @var ILogger */
+ private $logger;
/**
* ImageManager constructor.
@@ -51,20 +55,26 @@ class ImageManager {
* @param IConfig $config
* @param IAppData $appData
* @param IURLGenerator $urlGenerator
+ * @param ICacheFactory $cacheFactory
+ * @param ILogger $logger
*/
public function __construct(IConfig $config,
IAppData $appData,
- IURLGenerator $urlGenerator
+ IURLGenerator $urlGenerator,
+ ICacheFactory $cacheFactory,
+ ILogger $logger
) {
$this->config = $config;
$this->appData = $appData;
$this->urlGenerator = $urlGenerator;
+ $this->cacheFactory = $cacheFactory;
+ $this->logger = $logger;
}
- public function getImageUrl(string $key): string {
+ public function getImageUrl(string $key, bool $useSvg = true): string {
$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
try {
- $this->getImage($key);
+ $image = $this->getImage($key, $useSvg);
return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => $key ]) . '?v=' . $cacheBusterCounter;
} catch (NotFoundException $e) {
}
@@ -79,21 +89,44 @@ class ImageManager {
}
}
- public function getImageUrlAbsolute(string $key): string {
- return $this->urlGenerator->getAbsoluteURL($this->getImageUrl($key));
+ public function getImageUrlAbsolute(string $key, bool $useSvg = true): string {
+ return $this->urlGenerator->getAbsoluteURL($this->getImageUrl($key, $useSvg));
}
/**
- * @param $key
+ * @param string $key
+ * @param bool $useSvg
* @return ISimpleFile
* @throws NotFoundException
+ * @throws NotPermittedException
*/
- public function getImage(string $key): ISimpleFile {
+ public function getImage(string $key, bool $useSvg = true): ISimpleFile {
+ $pngFile = null;
$logo = $this->config->getAppValue('theming', $key . 'Mime', false);
- if ($logo === false) {
+ $folder = $this->appData->getFolder('images');
+ if ($logo === false || !$folder->fileExists($key)) {
throw new NotFoundException();
}
- $folder = $this->appData->getFolder('images');
+ if (!$useSvg && $this->shouldReplaceIcons()) {
+ if (!$folder->fileExists($key . '.png')) {
+ try {
+ $finalIconFile = new \Imagick();
+ $finalIconFile->setBackgroundColor('none');
+ $finalIconFile->readImageBlob($folder->getFile($key)->getContent());
+ $finalIconFile->setImageFormat('png32');
+ $pngFile = $folder->newFile($key . '.png');
+ $pngFile->putContent($finalIconFile->getImageBlob());
+ } catch (\ImagickException $e) {
+ $this->logger->info('The image was requested to be no SVG file, but converting it to PNG failed.', $e->getMessage());
+ $pngFile = null;
+ }
+ } else {
+ $pngFile = $folder->getFile($key . '.png');
+ }
+ }
+ if ($pngFile !== null) {
+ return $pngFile;
+ }
return $folder->getFile($key);
}
@@ -159,12 +192,19 @@ class ImageManager {
}
public function delete(string $key) {
+ /* ignore exceptions, since we don't want to fail hard if something goes wrong during cleanup */
try {
$file = $this->appData->getFolder('images')->getFile($key);
$file->delete();
} catch (NotFoundException $e) {
} catch (NotPermittedException $e) {
}
+ try {
+ $file = $this->appData->getFolder('images')->getFile($key . '.png');
+ $file->delete();
+ } catch (NotFoundException $e) {
+ } catch (NotPermittedException $e) {
+ }
}
/**
@@ -182,4 +222,25 @@ class ImageManager {
}
}
}
+
+ /**
+ * Check if Imagemagick is enabled and if SVG is supported
+ * otherwise we can't render custom icons
+ *
+ * @return bool
+ */
+ public function shouldReplaceIcons() {
+ $cache = $this->cacheFactory->createDistributed('theming-' . $this->urlGenerator->getBaseUrl());
+ if($value = $cache->get('shouldReplaceIcons')) {
+ return (bool)$value;
+ }
+ $value = false;
+ if(extension_loaded('imagick')) {
+ if (count(\Imagick::queryFormats('SVG')) >= 1) {
+ $value = true;
+ }
+ }
+ $cache->set('shouldReplaceIcons', $value);
+ return $value;
+ }
}
diff --git a/apps/theming/lib/Settings/Admin.php b/apps/theming/lib/Settings/Admin.php
index 6a95dd39d43..c8d2d561513 100644
--- a/apps/theming/lib/Settings/Admin.php
+++ b/apps/theming/lib/Settings/Admin.php
@@ -81,7 +81,7 @@ class Admin implements ISettings {
'slogan' => $this->themingDefaults->getSlogan(),
'color' => $this->themingDefaults->getColorPrimary(),
'uploadLogoRoute' => $this->urlGenerator->linkToRoute('theming.Theming.uploadImage'),
- 'canThemeIcons' => $this->themingDefaults->shouldReplaceIcons(),
+ 'canThemeIcons' => $this->imageManager->shouldReplaceIcons(),
'iconDocs' => $this->urlGenerator->linkToDocs('admin-theming-icons'),
'images' => $this->imageManager->getCustomImages(),
'imprintUrl' => $this->themingDefaults->getImprintUrl(),
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index 00c47676bc8..d29eb69873f 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -205,7 +205,7 @@ class ThemingDefaults extends \OC_Defaults {
$logoExists = true;
try {
- $this->imageManager->getImage('logo');
+ $this->imageManager->getImage('logo', $useSvg);
} catch (\Exception $e) {
$logoExists = false;
}
@@ -221,7 +221,7 @@ class ThemingDefaults extends \OC_Defaults {
return $logo . '?v=' . $cacheBusterCounter;
}
- return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => 'logo' ]) . '?v=' . $cacheBusterCounter;
+ return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => 'logo', 'useSvg' => $useSvg, 'v' => $cacheBusterCounter ]);
}
/**
@@ -317,10 +317,10 @@ class ThemingDefaults extends \OC_Defaults {
$customFavicon = null;
}
- if ($image === 'favicon.ico' && ($customFavicon !== null || $this->shouldReplaceIcons())) {
+ if ($image === 'favicon.ico' && ($customFavicon !== null || $this->imageManager->shouldReplaceIcons())) {
return $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', ['app' => $app]) . '?v=' . $cacheBusterValue;
}
- if ($image === 'favicon-touch.png' && ($customFavicon !== null || $this->shouldReplaceIcons())) {
+ if ($image === 'favicon-touch.png' && ($customFavicon !== null || $this->imageManager->shouldReplaceIcons())) {
return $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]) . '?v=' . $cacheBusterValue;
}
if ($image === 'manifest.json') {
@@ -334,30 +334,7 @@ class ThemingDefaults extends \OC_Defaults {
}
return false;
}
-
- /**
- * Check if Imagemagick is enabled and if SVG is supported
- * otherwise we can't render custom icons
- *
- * @return bool
- */
- public function shouldReplaceIcons() {
- $cache = $this->cacheFactory->createDistributed('theming-' . $this->urlGenerator->getBaseUrl());
- if($value = $cache->get('shouldReplaceIcons')) {
- return (bool)$value;
- }
- $value = false;
- if(extension_loaded('imagick')) {
- $checkImagick = new \Imagick();
- if (count($checkImagick->queryFormats('SVG')) >= 1) {
- $value = true;
- }
- $checkImagick->clear();
- }
- $cache->set('shouldReplaceIcons', $value);
- return $value;
- }
-
+
/**
* Increases the cache buster key
*/
diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php
index 6d8ede159b3..b4b45a065b0 100644
--- a/apps/theming/tests/Controller/IconControllerTest.php
+++ b/apps/theming/tests/Controller/IconControllerTest.php
@@ -120,7 +120,7 @@ class IconControllerTest extends TestCase {
->method('getImage')
->with('favicon')
->will($this->throwException(new NotFoundException()));
- $this->themingDefaults->expects($this->any())
+ $this->imageManager->expects($this->any())
->method('shouldReplaceIcons')
->willReturn(true);
$this->imageManager->expects($this->once())
@@ -144,7 +144,7 @@ class IconControllerTest extends TestCase {
->method('getImage')
->with('favicon')
->will($this->throwException(new NotFoundException()));
- $this->themingDefaults->expects($this->any())
+ $this->imageManager->expects($this->any())
->method('shouldReplaceIcons')
->willReturn(false);
$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
@@ -165,10 +165,13 @@ class IconControllerTest extends TestCase {
if (count($checkImagick->queryFormats('SVG')) < 1) {
$this->markTestSkipped('No SVG provider present.');
}
- $this->themingDefaults->expects($this->any())
+
+ $this->imageManager->expects($this->once())
+ ->method('getImage')
+ ->will($this->throwException(new NotFoundException()));
+ $this->imageManager->expects($this->any())
->method('shouldReplaceIcons')
->willReturn(true);
-
$this->iconBuilder->expects($this->once())
->method('getTouchIcon')
->with('core')
@@ -191,7 +194,7 @@ class IconControllerTest extends TestCase {
->method('getImage')
->with('favicon')
->will($this->throwException(new NotFoundException()));
- $this->themingDefaults->expects($this->any())
+ $this->imageManager->expects($this->any())
->method('shouldReplaceIcons')
->willReturn(false);
$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index 60ec2c1dc63..360eb7083a4 100644
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -690,7 +690,7 @@ class ThemingControllerTest extends TestCase {
->method('getImage')
->willReturn($file);
$this->config
- ->expects($this->once())
+ ->expects($this->any())
->method('getAppValue')
->with('theming', 'logoMime', '')
->willReturn('text/svg');
@@ -718,7 +718,7 @@ class ThemingControllerTest extends TestCase {
->willReturn($file);
$this->config
- ->expects($this->once())
+ ->expects($this->any())
->method('getAppValue')
->with('theming', 'backgroundMime', '')
->willReturn('image/png');
diff --git a/apps/theming/tests/IconBuilderTest.php b/apps/theming/tests/IconBuilderTest.php
index 1b9f204cd9e..994e0e4a045 100644
--- a/apps/theming/tests/IconBuilderTest.php
+++ b/apps/theming/tests/IconBuilderTest.php
@@ -27,6 +27,7 @@ namespace OCA\Theming\Tests;
use OC\Files\AppData\AppData;
use OCA\Theming\IconBuilder;
+use OCA\Theming\ImageManager;
use OCA\Theming\ThemingDefaults;
use OCA\Theming\Util;
use OCP\App\IAppManager;
@@ -45,6 +46,8 @@ class IconBuilderTest extends TestCase {
protected $themingDefaults;
/** @var Util */
protected $util;
+ /** @var ImageManager */
+ protected $imageManager;
/** @var IconBuilder */
protected $iconBuilder;
/** @var IAppManager */
@@ -53,13 +56,13 @@ class IconBuilderTest extends TestCase {
protected function setUp() {
parent::setUp();
- $this->config = $this->getMockBuilder(IConfig::class)->getMock();
+ $this->config = $this->createMock(IConfig::class);
$this->appData = $this->createMock(AppData::class);
- $this->themingDefaults = $this->getMockBuilder('OCA\Theming\ThemingDefaults')
- ->disableOriginalConstructor()->getMock();
- $this->appManager = $this->getMockBuilder('OCP\App\IAppManager')->getMock();
+ $this->themingDefaults = $this->createMock(ThemingDefaults::class);
+ $this->appManager = $this->createMock(IAppManager::class);
+ $this->imageManager = $this->createMock(ImageManager::class);
$this->util = new Util($this->config, $this->appManager, $this->appData);
- $this->iconBuilder = new IconBuilder($this->themingDefaults, $this->util);
+ $this->iconBuilder = new IconBuilder($this->themingDefaults, $this->util, $this->imageManager);
}
private function checkImagick() {
@@ -152,7 +155,7 @@ class IconBuilderTest extends TestCase {
*/
public function testGetFavicon($app, $color, $file) {
$this->checkImagick();
- $this->themingDefaults->expects($this->once())
+ $this->imageManager->expects($this->once())
->method('shouldReplaceIcons')
->willReturn(true);
$this->themingDefaults->expects($this->once())
@@ -183,8 +186,8 @@ class IconBuilderTest extends TestCase {
$this->checkImagick();
$this->expectException(Warning::class);
$util = $this->getMockBuilder(Util::class)->disableOriginalConstructor()->getMock();
- $iconBuilder = new IconBuilder($this->themingDefaults, $util);
- $this->themingDefaults->expects($this->once())
+ $iconBuilder = new IconBuilder($this->themingDefaults, $util, $this->imageManager);
+ $this->imageManager->expects($this->once())
->method('shouldReplaceIcons')
->willReturn(true);
$util->expects($this->once())
@@ -197,7 +200,7 @@ class IconBuilderTest extends TestCase {
$this->checkImagick();
$this->expectException(Warning::class);
$util = $this->getMockBuilder(Util::class)->disableOriginalConstructor()->getMock();
- $iconBuilder = new IconBuilder($this->themingDefaults, $util);
+ $iconBuilder = new IconBuilder($this->themingDefaults, $util, $this->imageManager);
$util->expects($this->once())
->method('getAppIcon')
->willReturn('notexistingfile');
@@ -208,7 +211,7 @@ class IconBuilderTest extends TestCase {
$this->checkImagick();
$this->expectException(Warning::class);
$util = $this->getMockBuilder(Util::class)->disableOriginalConstructor()->getMock();
- $iconBuilder = new IconBuilder($this->themingDefaults, $util);
+ $iconBuilder = new IconBuilder($this->themingDefaults, $util, $this->imageManager);
$util->expects($this->once())
->method('getAppImage')
->willReturn('notexistingfile');
diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php
index 4e258ce7162..38f5fb04969 100644
--- a/apps/theming/tests/ImageManagerTest.php
+++ b/apps/theming/tests/ImageManagerTest.php
@@ -24,8 +24,11 @@
namespace OCA\Theming\Tests;
use OCA\Theming\ImageManager;
+use OCA\Theming\ThemingDefaults;
use OCP\Files\SimpleFS\ISimpleFile;
+use OCP\ICacheFactory;
use OCP\IConfig;
+use OCP\ILogger;
use OCP\IURLGenerator;
use Test\TestCase;
use OCP\Files\SimpleFS\ISimpleFolder;
@@ -42,19 +45,40 @@ class ImageManagerTest extends TestCase {
protected $imageManager;
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
private $urlGenerator;
+ /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */
+ private $cacheFactory;
+ /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
+ private $logger;
protected function setUp() {
parent::setUp();
$this->config = $this->createMock(IConfig::class);
$this->appData = $this->createMock(IAppData::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
+ $this->cacheFactory = $this->createMock(ICacheFactory::class);
+ $this->logger = $this->createMock(ILogger::class);
$this->imageManager = new ImageManager(
$this->config,
$this->appData,
- $this->urlGenerator
+ $this->urlGenerator,
+ $this->cacheFactory,
+ $this->logger
);
}
+ private function checkImagick() {
+ if(!extension_loaded('imagick')) {
+ $this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
+ }
+ $checkImagick = new \Imagick();
+ if (empty($checkImagick->queryFormats('SVG'))) {
+ $this->markTestSkipped('No SVG provider present.');
+ }
+ if (empty($checkImagick->queryFormats('PNG'))) {
+ $this->markTestSkipped('No PNG provider present.');
+ }
+ }
+
public function mockGetImage($key, $file) {
/** @var \PHPUnit_Framework_MockObject_MockObject $folder */
$folder = $this->createMock(ISimpleFolder::class);
@@ -64,10 +88,28 @@ class ImageManagerTest extends TestCase {
->with('logo')
->willThrowException(new NotFoundException());
} else {
- $folder->expects($this->once())
+ $file->expects($this->once())
+ ->method('getContent')
+ ->willReturn(file_get_contents(__DIR__ . '/../../../tests/data/testimage.png'));
+ $folder->expects($this->at(0))
+ ->method('fileExists')
+ ->with('logo')
+ ->willReturn(true);
+ $folder->expects($this->at(1))
+ ->method('fileExists')
+ ->with('logo.png')
+ ->willReturn(false);
+ $folder->expects($this->at(2))
->method('getFile')
->with('logo')
->willReturn($file);
+ $newFile = $this->createMock(ISimpleFile::class);
+ $folder->expects($this->at(3))
+ ->method('newFile')
+ ->with('logo.png')
+ ->willReturn($newFile);
+ $newFile->expects($this->once())
+ ->method('putContent');
$this->appData->expects($this->once())
->method('getFolder')
->with('images')
@@ -76,19 +118,20 @@ class ImageManagerTest extends TestCase {
}
public function testGetImageUrl() {
+ $this->checkImagick();
$file = $this->createMock(ISimpleFile::class);
$this->config->expects($this->exactly(2))
->method('getAppValue')
->withConsecutive(
['theming', 'cachebuster', '0'],
- ['theming', 'logoMime', false]
+ ['theming', 'logoMime', '']
)
->willReturn(0);
$this->mockGetImage('logo', $file);
$this->urlGenerator->expects($this->once())
->method('linkToRoute')
->willReturn('url-to-image');
- $this->assertEquals('url-to-image?v=0', $this->imageManager->getImageUrl('logo'));
+ $this->assertEquals('url-to-image?v=0', $this->imageManager->getImageUrl('logo', false));
}
public function testGetImageUrlDefault() {
@@ -107,33 +150,37 @@ class ImageManagerTest extends TestCase {
}
public function testGetImageUrlAbsolute() {
+ $this->checkImagick();
$file = $this->createMock(ISimpleFile::class);
$this->config->expects($this->exactly(2))
->method('getAppValue')
->withConsecutive(
['theming', 'cachebuster', '0'],
- ['theming', 'logoMime', false]
+ ['theming', 'logoMime', '']
)
->willReturn(0);
$this->mockGetImage('logo', $file);
$this->urlGenerator->expects($this->at(0))
- ->method('linkToRoute')
- ->willReturn('url-to-image');
+ ->method('getBaseUrl')
+ ->willReturn('baseurl');
$this->urlGenerator->expects($this->at(1))
->method('getAbsoluteUrl')
- ->with('url-to-image?v=0')
->willReturn('url-to-image-absolute?v=0');
- $this->assertEquals('url-to-image-absolute?v=0', $this->imageManager->getImageUrlAbsolute('logo'));
+ $this->urlGenerator->expects($this->at(2))
+ ->method('getAbsoluteUrl')
+ ->willReturn('url-to-image-absolute?v=0');
+ $this->assertEquals('url-to-image-absolute?v=0', $this->imageManager->getImageUrlAbsolute('logo', false));
}
public function testGetImage() {
+ $this->checkImagick();
$this->config->expects($this->once())
->method('getAppValue')->with('theming', 'logoMime', false)
->willReturn('png');
$file = $this->createMock(ISimpleFile::class);
$this->mockGetImage('logo', $file);
- $this->assertEquals($file, $this->imageManager->getImage('logo'));
+ $this->assertEquals($file, $this->imageManager->getImage('logo', false));
}
/**
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index 6894b002eb9..ceaf2cc19d5 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -604,7 +604,7 @@ class ThemingDefaultsTest extends TestCase {
$this->urlGenerator->expects($this->once())
->method('linkToRoute')
->with('theming.Theming.getImage')
- ->willReturn('custom-logo');
+ ->willReturn('custom-logo?v=0');
$this->assertEquals('custom-logo' . '?v=0', $this->template->getLogo());
}
diff --git a/lib/private/Server.php b/lib/private/Server.php
index f230ce5b884..d1818c287e1 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -954,7 +954,7 @@ class Server extends ServerContainer implements IServerContainer {
$c->getURLGenerator(),
$c->getMemCacheFactory(),
new Util($c->getConfig(), $this->getAppManager(), $c->getAppDataDir('theming')),
- new ImageManager($c->getConfig(), $c->getAppDataDir('theming'), $c->getURLGenerator()),
+ new ImageManager($c->getConfig(), $c->getAppDataDir('theming'), $c->getURLGenerator(), $this->getMemCacheFactory(), $this->getLogger()),
$c->getAppManager()
);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 10:56:25 +0300