From d8fd437a6d10c90f5913ba8b6632e5b55313ee28 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Sun, 25 Oct 2020 08:09:08 -0400
Subject: [PATCH] Begin fixing return types using Psalm. (#1765)
---
module/VuFind/src/VuFind/Auth/ILS.php | 2 +-
module/VuFind/src/VuFind/Cart.php | 2 +-
.../tests/unit-tests/src/VuFindTest/CssPreCompilerTest.php | 2 +-
.../tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php | 2 +-
.../src/VuFindTest/View/Helper/HeadThemeResourcesTest.php | 2 +-
.../src/VuFindTest/View/Helper/ParentTemplateTest.php | 3 +--
.../unit-tests/src/VuFindTest/View/Helper/TemplatePathTest.php | 3 +--
7 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/module/VuFind/src/VuFind/Auth/ILS.php b/module/VuFind/src/VuFind/Auth/ILS.php
index b20b21f78e9..f86c1c8ba4e 100644
--- a/module/VuFind/src/VuFind/Auth/ILS.php
+++ b/module/VuFind/src/VuFind/Auth/ILS.php
@@ -86,7 +86,7 @@ class ILS extends AbstractBase
* Get the ILS driver associated with this object (or load the default from
* the service manager.
*
- * @return \VuFind\ILS\Driver\DriverInterface
+ * @return \VuFind\ILS\Connection
*/
public function getCatalog()
{
diff --git a/module/VuFind/src/VuFind/Cart.php b/module/VuFind/src/VuFind/Cart.php
index a881d3cffb1..754eb072ca1 100644
--- a/module/VuFind/src/VuFind/Cart.php
+++ b/module/VuFind/src/VuFind/Cart.php
@@ -202,7 +202,7 @@ class Cart
/**
* Get cart size.
*
- * @return string The maximum cart size
+ * @return int The maximum cart size
*/
public function getMaxSize()
{
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/CssPreCompilerTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/CssPreCompilerTest.php
index 895aec147a8..d500cd0d0f5 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/CssPreCompilerTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/CssPreCompilerTest.php
@@ -58,7 +58,7 @@ class CssPreCompilerTest extends Unit\TestCase
/**
* Data Provider for extensions and classes
*
- * @return void
+ * @return array
*/
public static function extClassProvider()
{
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php
index 67a48c8f07c..faabc5051c1 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php
@@ -232,7 +232,7 @@ class ThemeCompilerTest extends Unit\TestCase
/**
* Get a test ThemeCompiler object
*
- * @return ThemeInfo
+ * @return ThemeCompiler
*/
protected function getThemeCompiler()
{
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/HeadThemeResourcesTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/HeadThemeResourcesTest.php
index b13e2aab33e..718364dd1c4 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/HeadThemeResourcesTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/HeadThemeResourcesTest.php
@@ -108,7 +108,7 @@ class HeadThemeResourcesTest extends \VuFindTest\Unit\TestCase
/**
* Get a fake HeadMeta helper.
*
- * @return \Laminas\View\Helper\HeadMeta
+ * @return \PHPUnit\Framework\MockObject\MockObject&\VuFindTheme\View\Helper\HeadMeta
*/
protected function getMockHeadMeta()
{
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/ParentTemplateTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/ParentTemplateTest.php
index f29858f5f05..585aa6e25df 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/ParentTemplateTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/ParentTemplateTest.php
@@ -27,7 +27,6 @@
*/
namespace VuFindTest\View\Helper;
-use VuFindTheme\ResourceContainer;
use VuFindTheme\View\Helper\ParentTemplate;
/**
@@ -61,7 +60,7 @@ class ParentTemplateTest extends \VuFindTest\Unit\TestCase
/**
* Get a populated resource container for testing.
*
- * @return ResourceContainer
+ * @return ParentTemplate
*/
protected function getHelper($stack)
{
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/TemplatePathTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/TemplatePathTest.php
index 3c42173fe4d..869c97395bb 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/TemplatePathTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/TemplatePathTest.php
@@ -27,7 +27,6 @@
*/
namespace VuFindTest\View\Helper;
-use VuFindTheme\ResourceContainer;
use VuFindTheme\View\Helper\TemplatePath;
/**
@@ -61,7 +60,7 @@ class TemplatePathTest extends \VuFindTest\Unit\TestCase
/**
* Get a populated resource container for testing.
*
- * @return ResourceContainer
+ * @return TemplatePath
*/
protected function getHelper()
{
--
GitLab