Lint and psalm fix

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index ff30e27f7215bafbe9611f197ab6c28ffaa5a51a..94deb2e73768b1a57b332114a5e0daaa7106943b 100644 (file)
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -308,7 +308,7 @@ class ThemingController extends Controller {
         * @NoSameSiteCookieRequired
         * @NoTwoFactorRequired
         *
-        * @return FileDisplayResponse|NotFoundResponse
+        * @return DataDisplayResponse|NotFoundResponse
         */
        public function getThemeStylesheet(string $themeId, bool $plain = false, bool $withCustomCss = false) {
                $themes = $this->themesService->getThemes();

diff --git a/apps/theming/lib/Service/ThemesService.php b/apps/theming/lib/Service/ThemesService.php
index d8101c5b48a654a70d8bfb1df4cd414403252b89..c2e9e2b24bf21017277c7e311d800ee2240d17ac 100644 (file)
--- a/apps/theming/lib/Service/ThemesService.php
+++ b/apps/theming/lib/Service/ThemesService.php
@@ -94,9 +94,10 @@ class ThemesService {
                });
 
                // Retrieve IDs only
+               /** @var string[] */
                $filteredThemesIds = array_map(function(ITheme $t) {
                        return $t->getId();
-               }, $filteredThemes);
+               }, array_values($filteredThemes));
 
                $enabledThemes = [...array_diff($themesIds, $filteredThemesIds), $theme->getId()];
                $this->setEnabledThemes($enabledThemes);
@@ -136,6 +137,7 @@ class ThemesService {
                        $themes = $this->getEnabledThemes();
                        return in_array($theme->getId(), $themes);
                }
+               return false;
        }
 
        /**

diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php
index 7b0b123f19b14dabf3be1e6728e543209629fc2d..7efd8f133d71859063bd1d6a6dd2b63cc7c743d5 100644 (file)
--- a/apps/theming/lib/Themes/DefaultTheme.php
+++ b/apps/theming/lib/Themes/DefaultTheme.php
@@ -35,6 +35,7 @@ use OCP\IURLGenerator;
 class DefaultTheme implements ITheme {
        public Util $util;
        public ThemingDefaults $themingDefaults;
+       public IURLGenerator $urlGenerator;
        public ImageManager $imageManager;
        public IConfig $config;
        public IL10N $l;

diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index 35c7703bd45ecd2fc9c3d3a9d3ac30fe36e74afc..9a00bd1d5b1f02b892a4c6f3ee54b68f13725360 100644 (file)
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -111,13 +111,13 @@ class Util {
         *
         * Copied from cssphp, copyright Leaf Corcoran, licensed under MIT
         *
-        * @param integer $red
-        * @param integer $green
-        * @param integer $blue
+        * @param int $red
+        * @param int $green
+        * @param int $blue
         *
-        * @return array
+        * @return float[]
         */
-       public function toHSL(string $red, string $green, string $blue): array {
+       public function toHSL(int $red, int $green, int $blue): array {
                $color = new Color(Color::rgbToHex(['R' => $red, 'G' => $green, 'B' => $blue]));
                return array_values($color->getHsl());
        }

diff --git a/apps/theming/src/components/ItemPreview.vue b/apps/theming/src/components/ItemPreview.vue
index 0ed7dfc7858e37d8e5a6a34041096db01c09a30e..82d588059a2b2c1e2cb0bbfc4af6ceba860fae0f 100644 (file)
--- a/apps/theming/src/components/ItemPreview.vue
+++ b/apps/theming/src/components/ItemPreview.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { generateFilePath} from '@nextcloud/router'
+import { generateFilePath } from '@nextcloud/router'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
 
 export default {

diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 863226922d88b14e9444828c6844d0dfbeb2be45..d08312ad7896386b647479f021f067bf908a9ceb 100644 (file)
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -2355,11 +2355,6 @@
       <code>$this</code>
     </InvalidScope>
   </file>
-  <file src="core/templates/layout.guest.php">
-    <InvalidArgument occurrences="1">
-      <code>false</code>
-    </InvalidArgument>
-  </file>
   <file src="core/templates/layout.public.php">
     <UndefinedInterfaceMethod occurrences="1">
       <code>getIcon</code>

diff --git a/core/src/views/UnifiedSearch.vue b/core/src/views/UnifiedSearch.vue
index 1e11d6bfbde451def2c32369dd21816d3529f730..2d2d2d0a254e358b875d19d02f185e59ebc8e47e 100644 (file)
--- a/core/src/views/UnifiedSearch.vue
+++ b/core/src/views/UnifiedSearch.vue
@@ -86,12 +86,16 @@
                                <div v-else>
                                        {{ t('core', 'Press enter to start searching') }}
                                </div>
-                               <template #icon><Magnify /></template>
+                               <template #icon>
+                                       <Magnify />
+                               </template>
                        </EmptyContent>
 
                        <EmptyContent v-else-if="!isLoading || isShortQuery">
                                {{ t('core', 'Start typing to search') }}
-                               <template #icon><Magnify /></template>
+                               <template #icon>
+                                       <Magnify />
+                               </template>
                                <template v-if="isShortQuery" #desc>
                                        {{ n('core',
                                                'Please enter {minSearchLength} character or more to search',

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 00e16414535a1787b5dc54472f1df73a235a4d1e..4efe072a5bb3a8c98aa57967aeac2ce976d94b59 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -40,7 +40,9 @@ $getUserAvatar = static function (int $size) use ($_): string {
                <?php emit_script_loading_tags($_); ?>
                <?php print_unescaped($_['headers']); ?>
        </head>
-       <body id="<?php p($_['bodyid']);?>" <?php foreach ($_['enabledThemes'] as $themeId) { p("data-theme-$themeId "); }?>>
+       <body id="<?php p($_['bodyid']);?>" <?php foreach ($_['enabledThemes'] as $themeId) {
+                               p("data-theme-$themeId ");
+                       }?>>
        <?php include 'layout.noscript.warning.php'; ?>
 
                <?php foreach ($_['initialStates'] as $app => $initialState) { ?>