feat!: drop Laminas v2 support

composer.json

@@ -4,14 +4,17 @@
     "require": {
         "php": "^7.4",
         "ext-openssl": "*",
-        "laminas/laminas-stdlib": "^2.7.9|^3.0",
+        "laminas/laminas-stdlib": "^3.0",
         "laminas/laminas-filter": "^2.9.4",
         "laminas/laminas-validator": "^2.11.1",
-        "laminas/laminas-servicemanager": "^2.7.11|^3.0",
+        "laminas/laminas-servicemanager": "^3.0",
         "laminas/laminas-inputfilter": "^2.10.1",
-        "laminas/laminas-form": "^2.13.0|^3.0",
+        "laminas/laminas-form": "^3.1.1",
         "laminas/laminas-crypt": "^3.4.0",
-        "laminas/laminas-xml": "^1.4.0"
+        "laminas/laminas-xml": "^1.4.0",
+        "laminas/laminas-cache": "^3.6",
+        "laminas/laminas-cache-storage-adapter-redis": "^2.4",
+        "laminas/laminas-router": "^3.9"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6",
@@ -52,6 +55,9 @@
     "config": {
       "allow-plugins": {
             "bamarni/composer-bin-plugin": true
+      },
+      "platform": {
+        "ext-redis": "4.3"
       }
     }
 }

config/backend-routes.config.php

@@ -441,7 +441,6 @@
                             'schedule-41' => RouteConfig::getRouteConfig(
                                 'schedule-41',
                                 [
-                                    'GET' => QueryConfig::getConfig(Query\Application\Schedule41::class),
                                     'PUT' => CommandConfig::getPutConfig(Command\Application\Schedule41::class)
                                 ]
                             ),
@@ -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' => [
@@ -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(

config/backend-routes/data-service.php

@@ -6,7 +6,7 @@
 
 return [
     'data-service' => [
-        'type' => \Laminas\Mvc\Router\Http\Segment::class,
+        'type' => \Laminas\Router\Http\Segment::class,
         'options' => [
             'route' => 'data-service/',
         ],

config/backend-routes/public-holiday.php

@@ -5,7 +5,7 @@
 use Dvsa\Olcs\Transfer\Router\CommandConfig;
 use Dvsa\Olcs\Transfer\Router\QueryConfig;
 use Dvsa\Olcs\Transfer\Router\RouteConfig;
-use Laminas\Mvc\Router\Http\Segment;
+use Laminas\Router\Http\Segment;
 
 return [
     'public-holiday' => [

src/Command/AbstractCommand.php

@@ -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
      *

src/Command/AbstractPeople.php

@@ -15,45 +15,45 @@ class AbstractPeople extends AbstractCommand
 
     /**
      * @var string
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Title"})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Title")
      * @Transfer\Optional
      */
     protected $title;
 
     /**
      * @var string
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":35}})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":35})
      */
     protected $forename;
 
     /**
      * @var string
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":35}})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":35})
      */
     protected $familyName;
 
     /**
      * @var string
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":35}})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":35})
      * @Transfer\Optional
      */
     protected $otherName;
 
     /**
      * @var string
-     * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}})
+     * @Transfer\Validator("Date", options={"format": "Y-m-d"})
      * @Transfer\Optional
      */
     protected $birthDate;
 
     /**
      * @var string
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":45}})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":45})
      * @Transfer\Optional
      */
     protected $position;

src/Command/AbstractSaveBusinessDetails.php

@@ -12,33 +12,33 @@
 abstract class AbstractSaveBusinessDetails extends AbstractCommand
 {
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}})
+     * @Transfer\Filter("Laminas\Filter\Digits")
+     * @Transfer\Validator("Laminas\Validator\Digits")
+     * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0})
      */
     protected $id;
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}})
+     * @Transfer\Filter("Laminas\Filter\Digits")
+     * @Transfer\Validator("Laminas\Validator\Digits")
+     * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0})
      */
     protected $version;
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1})
      */
     protected $name;
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 255}})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 255})
      */
     protected $natureOfBusiness;
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
      * @Transfer\Optional
      */
     protected $companyOrLlpNo;
@@ -51,23 +51,23 @@ abstract class AbstractSaveBusinessDetails extends AbstractCommand
 
     /**
      * @Transfer\ArrayInput
-     * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"})
-     * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"})
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}})
+     * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems")
+     * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems")
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1})
      * @Transfer\Optional
      */
     protected $tradingNames = [];
 
     /**
-     * @Transfer\Filter({"name": "Laminas\Filter\Boolean"})
+     * @Transfer\Filter("Laminas\Filter\Boolean")
      * @Transfer\Optional
      */
     protected $partial;
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo")
      * @Transfer\Optional
      */
     protected $allowEmail;

src/Command/AbstractUpdateInterim.php

@@ -9,99 +9,96 @@
 
 abstract class AbstractUpdateInterim extends AbstractCommand
 {
-    use Identity,
-        Version;
+    use Identity;
+    use Version;
 
     /**
      * @Transfer\Optional
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}})
      */
     protected $requested;
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 1000}})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 1000})
      * @Transfer\Optional
      */
     protected $reason;
 
     /**
-     * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Date", "options":{"format": "Y-m-d"}})
+     * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Date", options={"format": "Y-m-d"})
      * @Transfer\Optional
      */
     protected $startDate;
 
     /**
-     * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Date", "options":{"format": "Y-m-d"}})
+     * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Date", options={"format": "Y-m-d"})
      * @Transfer\Optional
      */
     protected $endDate;
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive": true}})
+     * @Transfer\Filter("Laminas\Filter\Digits")
+     * @Transfer\Validator("Laminas\Validator\Digits")
+     * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive": true})
      * @Transfer\Optional
      */
     protected $authHgvVehicles;
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive": true}})
+     * @Transfer\Filter("Laminas\Filter\Digits")
+     * @Transfer\Validator("Laminas\Validator\Digits")
+     * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive": true})
      * @Transfer\Optional
      */
     protected $authLgvVehicles;
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive": true}})
+     * @Transfer\Filter("Laminas\Filter\Digits")
+     * @Transfer\Validator("Laminas\Validator\Digits")
+     * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive": true})
      * @Transfer\Optional
      */
     protected $authTrailers;
 
     /**
      * @Transfer\ArrayInput
-     * @Transfer\Filter({"name":"Laminas\Filter\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}})
+     * @Transfer\Filter("Laminas\Filter\Digits")
+     * @Transfer\Validator("Laminas\Validator\Digits")
+     * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0})
      * @Transfer\Optional
      */
     protected $operatingCentres = [];
 
     /**
      * @Transfer\ArrayInput
-     * @Transfer\Filter({"name":"Laminas\Filter\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}})
+     * @Transfer\Filter("Laminas\Filter\Digits")
+     * @Transfer\Validator("Laminas\Validator\Digits")
+     * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0})
      * @Transfer\Optional
      */
     protected $vehicles = [];
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({
-     *     "name":"Laminas\Validator\InArray",
-     *     "options": {
-     *         "haystack": {
-     *             "int_sts_requested",
-     *             "int_sts_in_force",
-     *             "int_sts_refused",
-     *             "int_sts_revoked",
-     *             "int_sts_granted",
-     *             "int_sts_ended"
-     *         }
-     *     }
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\InArray", options={
+     *      "haystack": {
+     *          "int_sts_requested",
+     *          "int_sts_in_force",
+     *          "int_sts_refused",
+     *          "int_sts_revoked",
+     *          "int_sts_granted",
+     *          "int_sts_ended"
+     *      }
      * })
      * @Transfer\Optional
      */
     protected $status;
 
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"})
-     * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"grant", "refuse"}}})
+     * @Transfer\Filter("Laminas\Filter\StringTrim")
+     * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"grant", "refuse"}})
      * @Transfer\Optional
      */
     protected $action;

src/Command/Application/CancelApplication.php

@@ -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;
@@ -17,9 +18,9 @@
 final class CancelApplication extends AbstractCommand
 {
     /**
-     * @Transfer\Filter({"name":"Laminas\Filter\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\Digits"})
-     * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}})
+     * @Transfer\Filter("Laminas\Filter\Digits")
+     * @Transfer\Validator("Laminas\Validator\Digits")
+     * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0})
      */
     protected $id;