Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: drop Laminas v2 support #3

Merged
merged 22 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cc4c66f
Remove bus reg edit restrictions
fibble Apr 3, 2023
561d8c5
VOL-3668 Migrate annotations to `NamedArgumentConstructor`
JoshuaLicense May 18, 2023
e2a7a2e
VOL-4006 update namespace for Laminas/Router
ilindsay Sep 12, 2023
6cf9f8f
VOL-3752 modify deprecated/removed laminas 2 code to work with lamina…
ilindsay Sep 12, 2023
a575ee6
VOL-4002 VOL-4006 update form annotations and tests for Laminas 3
ilindsay Sep 13, 2023
ce7f2e6
VOL-4453 remove error suppression from deprecated methods (Laminas ve…
ilindsay Sep 13, 2023
bfddb28
VOL-3698 upgrade laminas cache to version 3
ilindsay Sep 13, 2023
97b5271
VOL-3668 fix GovUkAccount to new annotation style
ilindsay Oct 11, 2023
0f386f0
VOL-4002 fix missing close bracket on create workshop command
ilindsay Oct 23, 2023
c27d1ca
VOL-4002 fix options in $paymentMethod parameter
ilindsay Oct 25, 2023
376f66f
VOL-4002 fix annotation (missing curly brace)
ilindsay Oct 25, 2023
756f3b4
VOL-4002 fix remaining migrations to new annotation style
ilindsay Oct 26, 2023
9706492
VOL-3752 fix for correct Lamins route match - we don't use it but don…
ilindsay Oct 31, 2023
63b1756
VOL-4002 remove errant curly brace from DTO
ilindsay Nov 15, 2023
25c0935
Merge branch 'main' into project/3.0
JoshuaLicense Dec 5, 2023
a2431cb
fix: remove Laminas v2 support
JoshuaLicense Dec 5, 2023
8e1471f
ci: fix Snyk scanning
JoshuaLicense Dec 5, 2023
43b5151
fix: add missing Laminas packages
JoshuaLicense Dec 5, 2023
2fadabb
fix: fake the redis version (for now)
JoshuaLicense Dec 5, 2023
5f4e08f
fix: apply static analysis fixes
JoshuaLicense Dec 6, 2023
c137fb4
fix: restore visibility and missing const
JoshuaLicense Dec 6, 2023
10885b6
fix: remove superfluous `;`
JoshuaLicense Dec 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 0 additions & 21 deletions config/backend-routes.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,6 @@
'schedule-41' => RouteConfig::getRouteConfig(
'schedule-41',
[
'GET' => QueryConfig::getConfig(Query\Application\Schedule41::class),
'PUT' => CommandConfig::getPutConfig(Command\Application\Schedule41::class)
]
),
Expand Down Expand Up @@ -1442,20 +1441,6 @@
)
]
],
'person' => [
'type' => 'Segment',
'options' => [
'route' => 'person[/]',
],
'may_terminate' => false,
'child_routes' => [
'single' => RouteConfig::getSingleConfig(
[
'PUT' => CommandConfig::getPutConfig(Command\Person\Update::class),
]
),
]
],
'tm-employment' => [
'type' => 'Segment',
'options' => [
Expand Down Expand Up @@ -1487,12 +1472,6 @@
'GET' => QueryConfig::getConfig(
Query\Cases\ConditionUndertaking\ConditionUndertaking::class
),
'PUT' => CommandConfig::getPutConfig(
Command\Cases\ConditionUndertaking\UpdateConditionUndertaking::class
),
'DELETE' => CommandConfig::getDeleteConfig(
Command\Cases\ConditionUndertaking\DeleteConditionUndertaking::class
)
]
),
'POST' => CommandConfig::getPostConfig(
Expand Down
10 changes: 5 additions & 5 deletions src/Command/AbstractCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

namespace Dvsa\Olcs\Transfer\Command;

/**
* Abstract Command
*
* @author Rob Caiger <rob@clocal.co.uk>
*/
/** @phpstan-consistent-constructor */
abstract class AbstractCommand implements CommandInterface
{
final public function __construct()
{
}

/**
* Create instance of a command
*
Expand Down
4 changes: 2 additions & 2 deletions src/Command/AbstractUpdateInterim.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

abstract class AbstractUpdateInterim extends AbstractCommand
{
use Identity,
Version;
use Identity;
use Version;

/**
* @Transfer\Optional
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/CancelApplication.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Alex Peshkov <alex.peshkov@valtech.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
6 changes: 4 additions & 2 deletions src/Command/Application/CreateApplication.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
use Dvsa\Olcs\Transfer\Command\AbstractCommand;
use Dvsa\Olcs\Transfer\FieldType\Traits\LgvDeclarationConfirmation;
use Dvsa\Olcs\Transfer\FieldType\Traits\VehicleType;

/**
* @Transfer\RouteName("backend/application")
* @Transfer\Method("POST")
*/
final class CreateApplication extends AbstractCommand
{
use LgvDeclarationConfirmation, VehicleType;
use LgvDeclarationConfirmation;
use VehicleType;

/**
* @Transfer\Filter("Laminas\Filter\StringTrim")
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Application/CreateCompanySubsidiary.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/**
* @author Rob Caiger <rob@clocal.co.uk>
*
*
* @Transfer\RouteName("backend/application/named-single/company-subsidiary")
* @Transfer\Method("POST")
*/
Expand Down
7 changes: 4 additions & 3 deletions src/Command/Application/CreateGoodsVehicle.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Identity;
Expand All @@ -19,9 +20,9 @@
*/
final class CreateGoodsVehicle extends AbstractCommand
{
use Identity,
Vrm,
UnvalidatedVrm;
use Identity;
use Vrm;
use UnvalidatedVrm;

/**
* @Transfer\Filter("Laminas\Filter\Digits")
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/CreateOperatingCentre.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Command\ApplicationOperatingCentre\AbstractOperatingCentreCommand;
Expand Down
13 changes: 3 additions & 10 deletions src/Command/Application/CreatePsvVehicle.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Application;
Expand All @@ -18,8 +19,8 @@
*/
final class CreatePsvVehicle extends AbstractCommand
{
use Application,
Vrm;
use Application;
use Vrm;

/**
* @Transfer\Filter("Laminas\Filter\StringTrim")
Expand Down Expand Up @@ -49,12 +50,4 @@ public function getReceivedDate()
{
return $this->receivedDate;
}

/**
* @return mixed
*/
public function getRemovalDate()
{
return $this->removalDate;
}
}
7 changes: 1 addition & 6 deletions src/Command/Application/CreateSnapshot.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand All @@ -17,12 +18,6 @@
*/
final class CreateSnapshot extends AbstractCommand
{
const ON_SUBMIT = 0;
JoshuaLicense marked this conversation as resolved.
Show resolved Hide resolved
const ON_GRANT = 1;
const ON_REFUSE = 2;
const ON_WITHDRAW = 3;
const ON_NTU = 4;

use Identity;

/**
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/CreateTaxiPhv.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Mat Evans <mat.evans@valtech.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/CreateVehicleListDocument.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Identity;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/CreateWorkshop.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
5 changes: 3 additions & 2 deletions src/Command/Application/DeleteGoodsVehicle.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Application;
Expand All @@ -18,6 +19,6 @@
*/
final class DeleteGoodsVehicle extends AbstractCommand
{
use Application,
Ids;
use Application;
use Ids;
}
5 changes: 3 additions & 2 deletions src/Command/Application/DeleteOperatingCentres.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Application;
Expand All @@ -18,6 +19,6 @@
*/
final class DeleteOperatingCentres extends AbstractCommand
{
use Ids,
Application;
use Ids;
use Application;
}
1 change: 1 addition & 0 deletions src/Command/Application/DeletePeople.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Mat Evans <mat.evans@valtech.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
5 changes: 3 additions & 2 deletions src/Command/Application/DeletePsvVehicle.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Application;
Expand All @@ -18,6 +19,6 @@
*/
final class DeletePsvVehicle extends AbstractCommand
{
use Application,
Ids;
use Application;
use Ids;
}
1 change: 1 addition & 0 deletions src/Command/Application/DeleteTaxiPhv.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Mat Evans <mat.evans@valtech.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/DeleteWorkshop.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/Grant.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Identity;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/GrantInterim.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Identity;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/NotTakenUpApplication.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Josh Curtis <josh.curtis@valtech.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/Overview.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Dan Eggleston <dan@stolenegg.com>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/PrintInterimDocument.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Identity;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/Publish.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Mat Evans <mat.evans@valtech.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Identity;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/RefuseApplication.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Josh Curtis <josh.curtis@valtech.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/RefuseInterim.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Rob Caiger <rob@clocal.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Identity;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/RestorePeople.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Mat Evans <mat.evans@valtech.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
1 change: 1 addition & 0 deletions src/Command/Application/ReviveApplication.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Josh Curtis <josh.curtis@valtech.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
Expand Down
5 changes: 3 additions & 2 deletions src/Command/Application/Schedule41.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @author Joshua Curtis <josh.curtis@valtech.co.uk>
*/

namespace Dvsa\Olcs\Transfer\Command\Application;

use Dvsa\Olcs\Transfer\FieldType\Traits\Identity;
Expand All @@ -18,8 +19,8 @@
*/
final class Schedule41 extends AbstractCommand
{
use Identity,
Licence;
use Identity;
use Licence;

/**
* @Transfer\ArrayInput
Expand Down
Loading
Loading