diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 0598416ae7eb5..66278f4a9cf25 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1313,7 +1313,6 @@ 'OC\\Collaboration\\Resources\\Manager' => $baseDir . '/lib/private/Collaboration/Resources/Manager.php', 'OC\\Collaboration\\Resources\\ProviderManager' => $baseDir . '/lib/private/Collaboration/Resources/ProviderManager.php', 'OC\\Collaboration\\Resources\\Resource' => $baseDir . '/lib/private/Collaboration/Resources/Resource.php', - 'OC\\Color' => $baseDir . '/lib/private/Color.php', 'OC\\Command\\AsyncBus' => $baseDir . '/lib/private/Command/AsyncBus.php', 'OC\\Command\\CommandJob' => $baseDir . '/lib/private/Command/CommandJob.php', 'OC\\Command\\CronBus' => $baseDir . '/lib/private/Command/CronBus.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index e200f5cfc04b9..1d535046f0f4b 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1354,7 +1354,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Collaboration\\Resources\\Manager' => __DIR__ . '/../../..' . '/lib/private/Collaboration/Resources/Manager.php', 'OC\\Collaboration\\Resources\\ProviderManager' => __DIR__ . '/../../..' . '/lib/private/Collaboration/Resources/ProviderManager.php', 'OC\\Collaboration\\Resources\\Resource' => __DIR__ . '/../../..' . '/lib/private/Collaboration/Resources/Resource.php', - 'OC\\Color' => __DIR__ . '/../../..' . '/lib/private/Color.php', 'OC\\Command\\AsyncBus' => __DIR__ . '/../../..' . '/lib/private/Command/AsyncBus.php', 'OC\\Command\\CommandJob' => __DIR__ . '/../../..' . '/lib/private/Command/CommandJob.php', 'OC\\Command\\CronBus' => __DIR__ . '/../../..' . '/lib/private/Command/CronBus.php', diff --git a/lib/public/Color.php b/lib/public/Color.php index ed955b8f05618..30ea85c257700 100644 --- a/lib/public/Color.php +++ b/lib/public/Color.php @@ -61,7 +61,7 @@ public function greenF(): float { } /** - * Returns the green blue component of this color as an int from 0 to 255 + * Returns the blue component of this color as an int from 0 to 255 * * @since 25.0.0 */ @@ -75,7 +75,7 @@ public function blue(): int { * @since 25.0.0 */ public function blueF(): float { - return $this->g / 255; + return $this->b / 255; } /** diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/lib/Avatar/UserAvatarTest.php index 0bd4637fc4736..acbc9488e8c93 100644 --- a/tests/lib/Avatar/UserAvatarTest.php +++ b/tests/lib/Avatar/UserAvatarTest.php @@ -263,9 +263,9 @@ public function testMixPalette(): void { $palette = Color::mixPalette($steps, $colorFrom, $colorTo); foreach ($palette as $j => $color) { // calc increment - $incR = $colorTo->red() / $steps * $j; - $incG = $colorTo->green() / $steps * $j; - $incB = $colorTo->blue() / $steps * $j; + $incR = (int)($colorTo->red() / $steps * $j); + $incG = (int)($colorTo->green() / $steps * $j); + $incB = (int)($colorTo->blue() / $steps * $j); // ensure everything is equal $this->assertEquals($color, new Color($incR, $incG, $incB)); }