From 16ec9d96708793cc6d7016743d6d8ba9182088bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Mon, 28 May 2018 11:06:33 +0200 Subject: [PATCH] Removed old route, fix tests and fix var type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/routes.php | 1 - lib/private/Avatar.php | 2 +- tests/lib/AvatarTest.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/routes.php b/core/routes.php index dd35638a7e..cc1bd34d89 100644 --- a/core/routes.php +++ b/core/routes.php @@ -42,7 +42,6 @@ $application->registerRoutes($this, [ ['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'], ['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'], ['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'], - ['name' => 'avatar#getAvatarPng', 'url' => '/avatar/{userId}/{size}/png', 'verb' => 'GET'], ['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'], ['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'], ['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'], diff --git a/lib/private/Avatar.php b/lib/private/Avatar.php index 270f69a96a..9dbeb4ac74 100644 --- a/lib/private/Avatar.php +++ b/lib/private/Avatar.php @@ -301,7 +301,7 @@ class Avatar implements IAvatar { * Generate png avatar from svg with Imagick * * @param int $size - * @return string + * @return string|boolean */ private function generateAvatarFromSvg(int $size) { if (!extension_loaded('imagick')) { diff --git a/tests/lib/AvatarTest.php b/tests/lib/AvatarTest.php index 67fde694b8..759dd38556 100644 --- a/tests/lib/AvatarTest.php +++ b/tests/lib/AvatarTest.php @@ -232,7 +232,7 @@ class AvatarTest extends \Test\TestCase { public function testGenerateSvgAvatar() { $avatar = $this->invokePrivate($this->avatar, 'getAvatarVector', [64]); - $svg = ' + $svg = ' A