From e93bf713690047da6e48f882848c7f1ba832db4e Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 19 Aug 2020 16:48:06 +0200
Subject: [PATCH] Fix the return type of OC_Template->fetchPage() to be string
only
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
build/psalm-baseline.xml | 13 -------------
lib/private/legacy/OC_Template.php | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index cf9f21d0918..efbe3480788 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -6069,11 +6069,6 @@
<code>OC_User::getUser()</code>
</InvalidScalarArgument>
</file>
- <file src="lib/private/legacy/OC_Template.php">
- <ImplementedReturnTypeMismatch occurrences="1">
- <code>boolean|string</code>
- </ImplementedReturnTypeMismatch>
- </file>
<file src="lib/private/legacy/OC_User.php">
<UndefinedClass occurrences="1">
<code>\Test\Util\User\Dummy</code>
@@ -6155,14 +6150,6 @@
<file src="lib/public/AppFramework/Http/Template/PublicTemplateResponse.php">
<InvalidScalarArgument occurrences="1"/>
</file>
- <file src="lib/public/AppFramework/Http/TemplateResponse.php">
- <InvalidReturnStatement occurrences="1">
- <code>$template->fetchPage($this->params)</code>
- </InvalidReturnStatement>
- <InvalidReturnType occurrences="1">
- <code>string</code>
- </InvalidReturnType>
- </file>
<file src="lib/public/AppFramework/Http/ZipResponse.php">
<InvalidArrayAccess occurrences="5">
<code>$resource['size']</code>
diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php
index 18a15ad1d43..54c203a3ab6 100644
--- a/lib/private/legacy/OC_Template.php
+++ b/lib/private/legacy/OC_Template.php
@@ -171,7 +171,7 @@ class OC_Template extends \OC\Template\Base {
/**
* Process the template
- * @return boolean|string
+ * @return string
*
* This function process the template. If $this->renderAs is set, it
* will produce a full page.
--
GitLab