From eaa8fa8cfd0c0f8e68ab7460346e1eabd25395d9 Mon Sep 17 00:00:00 2001
From: wadedvsa <155439365+wadedvsa@users.noreply.github.com>
Date: Thu, 28 Mar 2024 12:53:07 +0000
Subject: [PATCH 1/2] fix: Not able to surrender a psv licence

---
 .../Licence/Surrender/StartController.php           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/Olcs/src/Controller/Licence/Surrender/StartController.php b/module/Olcs/src/Controller/Licence/Surrender/StartController.php
index e9001d1dc..5e637089c 100644
--- a/module/Olcs/src/Controller/Licence/Surrender/StartController.php
+++ b/module/Olcs/src/Controller/Licence/Surrender/StartController.php
@@ -13,6 +13,7 @@
 use Laminas\Http\Response;
 use Laminas\I18n\Translator\Translator;
 use Laminas\Mvc\MvcEvent;
+use Laminas\View\Model\ViewModel;
 use Olcs\Controller\AbstractSelfserveController;
 use Olcs\Controller\Config\DataSource\DataSourceConfig;
 use Permits\Controller\Config\FeatureToggle\FeatureToggleConfig;
@@ -68,7 +69,7 @@ public function onDispatch(MvcEvent $e)
     /**
      * IndexAction
      *
-     * @return array|\Laminas\View\Model\ViewModel
+     * @return array|ViewModel
      */
     public function indexAction()
     {
@@ -126,7 +127,7 @@ private function getGvData(): array
      *
      * @psalm-return array{pageTitle: 'licence.surrender.start.title.psv', cancelBus: list{mixed}}
      */
-    private function getPsvData(Translator $translateService): array
+    private function getPsvData(TranslationHelperService $translateService): array
     {
         return [
             'pageTitle' => 'licence.surrender.start.title.psv',
@@ -137,12 +138,12 @@ private function getPsvData(Translator $translateService): array
     /**
      * getView
      *
-     * @param array    $licence
-     * @param Translator $translateService
+     * @param array                    $licence
+     * @param TranslationHelperService $translateService
      *
-     * @return \Laminas\View\Model\ViewModel
+     * @return ViewModel
      */
-    private function getView($licence, $translateService): \Laminas\View\Model\ViewModel
+    private function getView(array $licence, TranslationHelperService $translateService): ViewModel
     {
         $view = $this->genericView();
 

From 5a9583ecc34a40477f0dfaf31ea5aa607e87c3c0 Mon Sep 17 00:00:00 2001
From: wadedvsa <155439365+wadedvsa@users.noreply.github.com>
Date: Thu, 28 Mar 2024 12:54:04 +0000
Subject: [PATCH 2/2] chore: Remove redundant comment

---
 .../src/Controller/Licence/Surrender/StartController.php  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/module/Olcs/src/Controller/Licence/Surrender/StartController.php b/module/Olcs/src/Controller/Licence/Surrender/StartController.php
index 5e637089c..cbd2083e8 100644
--- a/module/Olcs/src/Controller/Licence/Surrender/StartController.php
+++ b/module/Olcs/src/Controller/Licence/Surrender/StartController.php
@@ -135,14 +135,6 @@ private function getPsvData(TranslationHelperService $translateService): array
         ];
     }
 
-    /**
-     * getView
-     *
-     * @param array                    $licence
-     * @param TranslationHelperService $translateService
-     *
-     * @return ViewModel
-     */
     private function getView(array $licence, TranslationHelperService $translateService): ViewModel
     {
         $view = $this->genericView();