Skip to content
This repository has been archived by the owner on Aug 16, 2024. It is now read-only.

refactor!: VOL-4762 olcs-internal now PHP 8 compatible #156

Merged
merged 8 commits into from
May 2, 2024
Merged

refactor!: VOL-4762 olcs-internal now PHP 8 compatible #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c0a9552
refactor!: require php 8, bump dependencies to php8 compatible versions
ilindsay Apr 23, 2024
f6817e6
refactor: remove incorrect return types for Laminas ConsoleModel
ilindsay Apr 23, 2024
7beaaa5
refactor!: run rector PHP 8.0 ruleset
ilindsay Apr 23, 2024
fdde202
refactor: fix tests to work with extra type checking from updated dep…
ilindsay Apr 24, 2024
bd7a07a
chore: update CI to use PHP 8.0
ilindsay Apr 24, 2024
269657b
fix: skip ConversationTest for now, refactor ticket raised VOL-5357
ilindsay Apr 30, 2024
8dd41f0
refactor: fix phpcs
ilindsay Apr 30, 2024
04466a1
Merge branch 'main' into VOL-4762
ilindsay May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
static-analysis:
uses: dvsa/.github/.github/workflows/php-static.yml@main
with:
php-version: '7.4'
php-version: '8.0'

tests:
uses: dvsa/.github/.github/workflows/php-tests.yml@main
with:
php-versions: "[\"7.4\"]"
php-versions: "[\"8.0\"]"
fail-fast: false
9 changes: 4 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"url": "https://github.com/dvsa/laminas-form.git"
}],
"require": {
"php": "^7.4",
"php": "~8.0.0",
"ext-redis": "*",
"dvsa/laminas-config-cloud-parameters": "^0.2.0",
"laminas/laminas-authentication": "^2.5",
Expand All @@ -22,7 +22,6 @@
"laminas/laminas-inputfilter": "^2.5",
"laminas/laminas-json": "^3.0",
"laminas/laminas-mvc": "^3.0",
"laminas/laminas-mvc-console": "^1.3",
"laminas/laminas-mvc-i18n": "^1",
"laminas/laminas-mvc-plugin-flashmessenger": "^1",
"laminas/laminas-mvc-plugin-prg": "^1",
Expand All @@ -34,10 +33,10 @@
"laminas/laminas-view": "^2.5",
"lm-commons/lmc-rbac-mvc": "^3.0",
"firebase/php-jwt": "^6.0",
"olcs/olcs-auth": "^7.0",
"olcs/olcs-common": "^6.0.0",
"olcs/olcs-auth": "^8.0",
"olcs/olcs-common": "^7.0.0",
"olcs/olcs-logging": "^7.2",
"olcs/olcs-transfer": "^6.0.0",
"olcs/olcs-transfer": "^7.0.0",
"olcs/olcs-utils": "^6.0.0",
"saeven/zf3-purifier": "^1.1",
"doctrine/doctrine-module": "^5",
Expand Down
1,742 changes: 745 additions & 997 deletions composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions module/Admin/src/Controller/AbstractController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,8 @@ abstract class AbstractController extends LaminasAbstractActionController implem
{
use GenericRenderView;

protected Placeholder $placeholder;

public function __construct(
Placeholder $placeholder
) {
$this->placeholder = $placeholder;
public function __construct(protected Placeholder $placeholder)
{
}

/**
Expand Down
5 changes: 1 addition & 4 deletions module/Admin/src/Controller/CompaniesHouseAlertController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,13 @@ class CompaniesHouseAlertController extends AbstractInternalController implement
]
];

protected HelperPluginManager $viewHelperPluginManager;

public function __construct(
TranslationHelperService $translationHelperService,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessengerHelperService,
Navigation $navigation,
HelperPluginManager $viewHelperPluginManager
protected HelperPluginManager $viewHelperPluginManager
) {
$this->viewHelperPluginManager = $viewHelperPluginManager;
parent::__construct($translationHelperService, $formHelper, $flashMessengerHelperService, $navigation);
}
/**
Expand Down
21 changes: 5 additions & 16 deletions module/Admin/src/Controller/ContinuationChecklistReminderController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,19 @@ class ContinuationChecklistReminderController extends AbstractController
use CrudActionTrait;

public const TYPE_CONT_CHECKLIST_REMINDER_GENERATE_LETTER = 'que_typ_cont_check_rem_gen_let';

protected DateHelperService $dateHelper;
protected FlashMessengerHelperService $flashMessengerHelper;
protected ScriptFactory $scriptFactory;
protected FormHelperService $formHelper;
protected ResponseHelperService $responseHelper;
protected TableFactory $tableFactory;

public function __construct(
Placeholder $placeholder,
DateHelperService $dateHelper,
protected DateHelperService $dateHelper,
FlashMessengerHelperService $flashMessengerHelper,
ScriptFactory $scriptFactory,
FormHelperService $formHelper,
ResponseHelperService $responseHelper,
TableFactory $tableFactory
protected ScriptFactory $scriptFactory,
protected FormHelperService $formHelper,
protected ResponseHelperService $responseHelper,
protected TableFactory $tableFactory
) {
parent::__construct($placeholder);
$this->dateHelper = $dateHelper;
$this->flashMessengerHelper = $flashMessengerHelper;
$this->scriptFactory = $scriptFactory;
$this->formHelper = $formHelper;
$this->responseHelper = $responseHelper;
$this->tableFactory = $tableFactory;
}

/**
Expand Down
16 changes: 4 additions & 12 deletions module/Admin/src/Controller/ContinuationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,17 @@ class ContinuationController extends AbstractController
protected $detailRoute = 'admin-dashboard/admin-continuation/detail';

protected FlashMessengerHelperService $flashMessengerHelper;
protected ScriptFactory $scriptFactory;
protected TranslationHelperService $translationHelper;
protected TableFactory $tableFactory;
protected FormHelperService $formHelper;

public function __construct(
Placeholder $placeholder,
FlashMessengerHelperService $flashMessengerHelper,
ScriptFactory $scriptFactory,
TranslationHelperService $translationHelper,
TableFactory $tableFactory,
FormHelperService $formHelper
protected ScriptFactory $scriptFactory,
protected TranslationHelperService $translationHelper,
protected TableFactory $tableFactory,
protected FormHelperService $formHelper
) {
parent::__construct($placeholder);
$this->flashMessengerHelper = $flashMessengerHelper;
$this->scriptFactory = $scriptFactory;
$this->translationHelper = $translationHelper;
$this->tableFactory = $tableFactory;
$this->formHelper = $formHelper;
}

/**
Expand Down
8 changes: 2 additions & 6 deletions module/Admin/src/Controller/DataRetention/ExportController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,15 @@
class ExportController extends AbstractInternalController implements LeftViewProvider
{
protected $navigationId = 'admin-dashboard/admin-data-retention';
protected TableFactory $tableFactory;
protected ResponseHelperService $responseHelperService;

public function __construct(
TranslationHelperService $translationHelper,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessengerHelperService,
Navigation $navigation,
TableFactory $tableFactory,
ResponseHelperService $responseHelperService
protected TableFactory $tableFactory,
protected ResponseHelperService $responseHelperService
) {
$this->tableFactory = $tableFactory;
$this->responseHelperService = $responseHelperService;
parent::__construct($translationHelper, $formHelper, $flashMessengerHelperService, $navigation);
}
/**
Expand Down
5 changes: 1 addition & 4 deletions module/Admin/src/Controller/DiscPrintingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,16 @@ class DiscPrintingController extends LaminasAbstractActionController implements
protected ScriptFactory $scriptFactory;
protected TableFactory $tableFactory;
protected FormHelperService $formHelper;
protected FlashMessengerHelperService $flashMessengerHelper;

public function __construct(
ScriptFactory $scriptFactory,
TableFactory $tableFactory,
FlashMessengerHelperService $flashMessengerHelper,
protected FlashMessengerHelperService $flashMessengerHelper,
FormHelperService $formHelper
) {
$this->scriptFactory = $scriptFactory;
$this->tableFactory = $tableFactory;
$this->formHelper = $formHelper;
$this->flashMessengerHelper = $flashMessengerHelper;
}

/**
Expand Down Expand Up @@ -109,7 +107,6 @@ public function indexAction()
/**
* Process form
*
* @param array $data
*
* @return void
*/
Expand Down
10 changes: 2 additions & 8 deletions module/Admin/src/Controller/DocumentTemplateController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,14 @@ class DocumentTemplateController extends AbstractInternalController implements L
'editAction' => ['forms/document-template']
];

protected Scan $scannerAntiVirusService;
protected SubCategory $subCategoryDataService;

public function __construct(
TranslationHelperService $translationHelperService,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessengerHelperService,
Navigation $navigation,
Scan $scannerAntiVirusService,
SubCategory $subCategoryDataService
protected Scan $scannerAntiVirusService,
protected SubCategory $subCategoryDataService
) {
$this->scannerAntiVirusService = $scannerAntiVirusService;
$this->subCategoryDataService = $subCategoryDataService;

parent::__construct($translationHelperService, $formHelper, $flashMessengerHelperService, $navigation);
}
/**
Expand Down
5 changes: 1 addition & 4 deletions module/Admin/src/Controller/InterimRefundsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,14 @@ class InterimRefundsController extends AbstractInternalController implements Lef
protected $listDto = ListDto::class;
protected $filterForm = FilterForm::class;

protected DateHelperService $dateHelper;

public function __construct(
TranslationHelperService $translationHelper,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessenger,
Navigation $navigation,
DateHelperService $dateHelper
protected DateHelperService $dateHelper
) {
parent::__construct($translationHelper, $formHelper, $flashMessenger, $navigation);
$this->dateHelper = $dateHelper;
}

/**
Expand Down
8 changes: 2 additions & 6 deletions module/Admin/src/Controller/IrfoStockControlController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,15 @@ class IrfoStockControlController extends AbstractInternalController implements L
protected $createCommand = CreateDto::class;

protected $addContentTitle = 'Add IRFO Stock Control';
protected DateHelperService $dateHelperService;
protected IrfoCountry $irfoCountryDataService;

public function __construct(
TranslationHelperService $translationHelperService,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessengerHelperService,
Navigation $navigation,
DateHelperService $dateHelperService,
IrfoCountry $irfoCountryDataService
protected DateHelperService $dateHelperService,
protected IrfoCountry $irfoCountryDataService
) {
$this->dateHelperService = $dateHelperService;
$this->irfoCountryDataService = $irfoCountryDataService;
parent::__construct($translationHelperService, $formHelper, $flashMessengerHelperService, $navigation);
}
public function getLeftView()
Expand Down
5 changes: 1 addition & 4 deletions module/Admin/src/Controller/IrhpPermitJurisdictionController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,13 @@ class IrhpPermitJurisdictionController extends AbstractIrhpPermitAdminController

protected $defaultData = ['stockId' => 'route'];

protected ScriptFactory $scriptFactory;

public function __construct(
TranslationHelperService $translationHelperService,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessengerHelperService,
Navigation $navigation,
ScriptFactory $scriptFactory
protected ScriptFactory $scriptFactory
) {
$this->scriptFactory = $scriptFactory;
parent::__construct($translationHelperService, $formHelper, $flashMessengerHelperService, $navigation);
}
/**
Expand Down
2 changes: 1 addition & 1 deletion module/Admin/src/Controller/IrhpPermitScoringController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public function postScoringReportAction()

$commaSeparatedRows = [];
foreach ($result['rows'] as $row) {
$commaSeparatedRows[] = implode($row);
$commaSeparatedRows[] = implode('', $row);
}

$content = implode("\n", $commaSeparatedRows);
Expand Down
5 changes: 1 addition & 4 deletions module/Admin/src/Controller/IrhpPermitSectorController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,13 @@ class IrhpPermitSectorController extends AbstractIrhpPermitAdminController imple

protected $defaultData = ['stockId' => 'route'];

protected ScriptFactory $scriptFactory;

public function __construct(
TranslationHelperService $translationHelperService,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessengerHelperService,
Navigation $navigation,
ScriptFactory $scriptFactory
protected ScriptFactory $scriptFactory
) {
$this->scriptFactory = $scriptFactory;
parent::__construct($translationHelperService, $formHelper, $flashMessengerHelperService, $navigation);
}
/**
Expand Down
5 changes: 1 addition & 4 deletions module/Admin/src/Controller/IrhpPermitStockController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,13 @@ class IrhpPermitStockController extends AbstractInternalController implements Le

protected $tableViewTemplate = 'pages/irhp-permit-stock/index';

private ScriptFactory $scriptFactory;

public function __construct(
TranslationHelperService $translationHelperService,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessengerHelperService,
Navigation $navigation,
ScriptFactory $scriptFactory
private ScriptFactory $scriptFactory
) {
$this->scriptFactory = $scriptFactory;
parent::__construct($translationHelperService, $formHelper, $flashMessengerHelperService, $navigation);
}
/**
Expand Down
5 changes: 1 addition & 4 deletions module/Admin/src/Controller/PiReportController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,13 @@ class PiReportController extends AbstractInternalController implements LeftViewP
protected $listDto = ListDto::class;
protected $filterForm = FilterForm::class;

private DateHelperService $dateHelperService;

public function __construct(
TranslationHelperService $translationHelperService,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessengerHelperService,
Navigation $navigation,
DateHelperService $dateHelperService
private DateHelperService $dateHelperService
) {
$this->dateHelperService = $dateHelperService;
parent::__construct($translationHelperService, $formHelper, $flashMessengerHelperService, $navigation);
}
/**
Expand Down
6 changes: 1 addition & 5 deletions module/Admin/src/Controller/PublicationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,13 @@ class PublicationController extends AbstractInternalController implements LeftVi
'publish' => ['requireRows' => true],
];

protected WebDavJsonWebTokenGenerationService $webDavJsonWebTokenGenerationService;

public function __construct(
TranslationHelperService $translationHelperService,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessengerHelperService,
Navigation $navigation,
WebDavJsonWebTokenGenerationService $webDavJsonWebTokenGenerationService
protected WebDavJsonWebTokenGenerationService $webDavJsonWebTokenGenerationService
) {
$this->webDavJsonWebTokenGenerationService = $webDavJsonWebTokenGenerationService;

parent::__construct($translationHelperService, $formHelper, $flashMessengerHelperService, $navigation);
}
/**
Expand Down
4 changes: 1 addition & 3 deletions module/Admin/src/Controller/ReportController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,16 @@ class ReportController extends LaminasAbstractActionController implements LeftVi
protected ScriptFactory $scriptFactory;
protected TableFactory $tableFactory;
protected FormHelperService $formHelper;
protected Placeholder $placeholder;

public function __construct(
ScriptFactory $scriptFactory,
TableFactory $tableFactory,
FormHelperService $formHelper,
Placeholder $placeholder
protected Placeholder $placeholder
) {
$this->scriptFactory = $scriptFactory;
$this->tableFactory = $tableFactory;
$this->formHelper = $formHelper;
$this->placeholder = $placeholder;
}

/**
Expand Down
6 changes: 1 addition & 5 deletions module/Admin/src/Controller/ReportUploadController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,13 @@ class ReportUploadController extends AbstractInternalController implements LeftV
'indexAction' => ['forms/report-upload'],
];

protected Scan $scannerAntiVirusService;

public function __construct(
TranslationHelperService $translationHelperService,
FormHelperService $formHelper,
FlashMessengerHelperService $flashMessengerHelperService,
Navigation $navigation,
Scan $scannerAntiVirusService
protected Scan $scannerAntiVirusService
) {
$this->scannerAntiVirusService = $scannerAntiVirusService;

parent::__construct($translationHelperService, $formHelper, $flashMessengerHelperService, $navigation);
}
/**
Expand Down
Loading
Loading