Merge branch 'VOL-4575_Message_content_query' of github.com:dvsa/olcs…

…-transfer into VOL-4575_Message_content_query
dvsa · Dec 11, 2023 · 7125efa · 7125efa
2 parents 14dfa1a + 585e11c
commit 7125efa
Show file tree

Hide file tree

Showing 1,406 changed files with 6,167 additions and 6,109 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,17 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.php]
+indent_size = 4
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -0,0 +1,24 @@
+name: CD
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release-please:
+    name: Release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    outputs:
+      tag_name: ${{ steps.release.outputs.tag_name }}
+      release_created: ${{ steps.release.outputs.release_created }}
+      sha: ${{ steps.release.outputs.sha }}
+    steps:
+      - uses: google-github-actions/release-please-action@v3
+        id: release
+        with:
+          release-type: php
+          package-name: olcs-transfer
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,25 @@
+name: CI
+
+on:
+  pull_request:
+  schedule:
+    - cron: '0 0 * * 1'
+
+jobs:
+  security:
+    uses: dvsa/.github/.github/workflows/php-library-security.yml@main
+    with:
+      php-versions: "[\"7.4\"]"
+    secrets:
+      SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+
+  static-analysis:
+    uses: dvsa/.github/.github/workflows/php-library-static.yml@main
+    with:
+      php-version: '7.4'
+
+  tests:
+    uses: dvsa/.github/.github/workflows/php-library-tests.yml@main
+    with:
+      php-versions: "[\"7.4\"]"
+      fail-fast: false
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,11 @@ test/review
 test/coverage/
 .scannerwork/
 composer.lock
+.phpunit.result.cache
+
+# Non-dist files for the static analysis.
+# This allows developers to set a different (more strict) static analysis locally.
+phpcs.xml
+phpstan.neon
+phpunit.xml
+psalm.xml
diff --git a/README.md b/README.md
@@ -0,0 +1 @@
+# This repository has been migrated to: https://github.com/dvsa/olcs-transfer.
diff --git a/composer.json b/composer.json
@@ -1,60 +1,63 @@
 {
     "name": "olcs/olcs-transfer",
     "description": "OLCS Transfer",
-    "repositories": [
-        {
-            "packagist": false
-        },
-        {
-            "url": "https://nexus.olcs.dev-dvsacloud.uk/repository/OLCS",
-            "type": "composer"
-        },
-        {
-            "url": "https://nexus.olcs.dev-dvsacloud.uk/repository/Packagist-Proxy",
-            "type": "composer"
-        }
-    ],
     "require": {
-        "php": ">=7.4",
+        "php": "^7.4",
         "ext-openssl": "*",
-        "olcs/olcs-laminas": "~2.5.0 || ~3.0.0"
+        "laminas/laminas-stdlib": "^3.0",
+        "laminas/laminas-filter": "^2.9.4",
+        "laminas/laminas-validator": "^2.11.1",
+        "laminas/laminas-servicemanager": "^3.0",
+        "laminas/laminas-inputfilter": "^2.10.1",
+        "laminas/laminas-form": "^3.1.1",
+        "laminas/laminas-crypt": "^3.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": {
-        "olcs/olcs-devtools": "~4.206.0",
-        "doctrine/annotations": "^1.14.2",
-        "phpunit/phpunit": "^9.6"
-    },
-    "config": {
-        "preferred-install": "dist",
-        "secure-http": false,
-        "allow-plugins": {
-            "phpstan/extension-installer": true,
-            "laminas/laminas-component-installer": true,
-            "laminas/laminas-dependency-plugin": true,
-            "elendev/composer-push": true
-        }
+        "phpunit/phpunit": "^9.6",
+        "mockery/mockery": "^1.6",
+        "johnkary/phpunit-speedtrap": "^4.0",
+        "bamarni/composer-bin-plugin": "^1.8",
+        "doctrine/annotations": "^1.14.2"
     },
     "autoload": {
         "psr-4": {
             "Dvsa\\Olcs\\Transfer\\": "src/"
         }
     },
+    "autoload-dev": {
+      "psr-4": {
+        "Dvsa\\OlcsTest\\Transfer\\": "test/"
+      }
+    },
     "scripts": {
-        "ut": "vendor/bin/phpunit -c test/phpunit.xml --stop-on-failure",
-        "review": "vendor/bin/review",
-        "cs": "vendor/bin/phpcs --severity=1 --standard=vendor/dvsa/coding-standards/src/Profiles/DVSA/CS/ruleset.xml",
-        "coverage": "vendor/bin/phpunit -c test/phpunit.xml --coverage-html ./test/coverage/html",
-        "sonar": "vendor/bin/phpunit -c test/phpunit.xml --coverage-clover ./test/coverage/coverage-report.clover --log-junit ./test/coverage/log.junit",
-        "update-syms": "vendor/bin/composer-update-syms"
+      "bin": "echo 'bin not installed'",
+      "test": "phpunit",
+      "phpcs": "phpcs",
+      "psalm": "psalm",
+      "phpstan": "phpstan",
+      "all": [
+        "@test",
+        "@phpcs",
+        "@psalm",
+        "@phpstan"
+      ]
     },
     "extra": {
-        "nexus-push": {
-            "url": "https://nexus.olcs.dev-dvsacloud.uk/repository/olcs-transfer",
-            "ignore": [
-                "test/",
-                "sonar-project.properties",
-                "build.xml"
-            ]
-        }
+      "bamarni-bin": {
+        "bin-links": true,
+        "forward-command": true
+      }
+    },
+    "config": {
+      "allow-plugins": {
+            "bamarni/composer-bin-plugin": true
+      },
+      "platform": {
+        "ext-redis": "4.3"
+      }
     }
 }
diff --git a/config/backend-routes.config.php b/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(

diff --git a/config/backend-routes/data-service.php b/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/',
         ],

diff --git a/config/backend-routes/public-holiday.php b/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' => [

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor-bin/phpcs/vendor/squizlabs/php_codesniffer/phpcs.xsd">
+  <file>./src</file>
+  <file>./test</file>
+
+  <exclude-pattern>*/vendor/*</exclude-pattern>
+
+  <rule ref="./vendor-bin/phpcs/vendor/dvsa/coding-standards/src/Profiles/DVSA/CS/ruleset.xml" />
+</ruleset>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -0,0 +1,5 @@
+parameters:
+  level: 1
+  paths:
+    - src
+    - test
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+  backupGlobals="true"
+  colors="true"
+  executionOrder="random"
+  failOnRisky="true"
+  failOnWarning="true"
+  convertDeprecationsToExceptions="true"
+>
+  <php>
+    <ini name="date.timezone" value="UTC"/>
+    <ini name="memory_limit" value="1500M" />
+  </php>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory>test</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+  <listeners>
+    <listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener"/>
+  </listeners>
+</phpunit>
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<psalm
+  errorLevel="8"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="https://getpsalm.org/schema/config"
+  xsi:schemaLocation="https://getpsalm.org/schema/config vendor-bin/psalm/vendor/vimeo/psalm/config.xsd"
+  findUnusedBaselineEntry="true"
+  findUnusedCode="false"
+>
+  <projectFiles>
+    <directory name="src"/>
+  </projectFiles>
+</psalm>
diff --git a/sonar-project.properties b/sonar-project.properties
diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php
@@ -2,13 +2,12 @@
 
 namespace Dvsa\Olcs\Transfer\Command;
 
-/**
- * Abstract Command
- *
- * @author Rob Caiger <rob@clocal.co.uk>
- */
 abstract class AbstractCommand implements CommandInterface
 {
+    final public function __construct()
+    {
+    }
+
     /**
      * Create instance of a command
      *

diff --git a/src/Command/AbstractPeople.php b/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;