Merge branch 'main' into UML-3600-get-attorney

ministryofjustice · Sep 30, 2024 · db0a812 · db0a812
2 parents 6fe7a0e + 59d20b9
commit db0a812
Show file tree

Hide file tree

Showing 164 changed files with 1,849 additions and 1,990 deletions.
diff --git a/.github/workflows/_build-and-push.yml b/.github/workflows/_build-and-push.yml
@@ -208,7 +208,7 @@ jobs:
           (inputs.specific_path == 'all' || inputs.specific_path == matrix.svc_prefix)
 
       - name: archive test results
-        uses: actions/upload-artifact@b18b1d32f3f31abcdc29dee3f2484801fe7822f4
+        uses: actions/upload-artifact@3eadd8b791cabf7cd572f194da82158c24125bd8
         with:
           name: service-${{ matrix.svc_prefix }}
           path: build/service-${{ matrix.svc_prefix }}

diff --git a/.github/workflows/_lint-terraform.yml b/.github/workflows/_lint-terraform.yml
@@ -30,7 +30,7 @@ jobs:
           TF_VERSION=$(cat .terraform-version)
           echo "TF_VERSION=$TF_VERSION" >> $GITHUB_OUTPUT
 
-      - uses: hashicorp/setup-terraform@c23d9fb1b7ead2e283cd20aab7c4974b032f61f6 # [email protected]
+      - uses: hashicorp/setup-terraform@c4396e588c9df127748dc67459fd162eca7f7220 # [email protected]
         with:
           terraform_version: ${{ steps.set-terraform-version.outputs.TF_VERSION }}
 

diff --git a/.github/workflows/_node-build.yml b/.github/workflows/_node-build.yml
@@ -33,7 +33,7 @@ jobs:
           cd service-front/web/
           npm run build
       - name: archive dist
-        uses: actions/upload-artifact@b18b1d32f3f31abcdc29dee3f2484801fe7822f4 # [email protected]
+        uses: actions/upload-artifact@3eadd8b791cabf7cd572f194da82158c24125bd8 # [email protected]
         with:
           name: dist-web
           path: service-front/web/dist/
diff --git a/.github/workflows/_run-behat-tests.yml b/.github/workflows/_run-behat-tests.yml
@@ -94,7 +94,7 @@ jobs:
             vendor/bin/behat
 
       - name: archive failed test screenshots
-        uses: actions/upload-artifact@b18b1d32f3f31abcdc29dee3f2484801fe7822f4 # [email protected]
+        uses: actions/upload-artifact@3eadd8b791cabf7cd572f194da82158c24125bd8 # [email protected]
         with:
           name: behat-screenshots
           path: tests/smoke/failed_step_screenshots

diff --git a/.github/workflows/_run-terraform.yml b/.github/workflows/_run-terraform.yml
@@ -71,7 +71,7 @@ jobs:
 
       - uses: unfor19/install-aws-cli-action@27d6061dae5d39e89be4d2246824f15e111a7e06 # [email protected]
 
-      - uses: hashicorp/setup-terraform@c23d9fb1b7ead2e283cd20aab7c4974b032f61f6 # [email protected]
+      - uses: hashicorp/setup-terraform@c4396e588c9df127748dc67459fd162eca7f7220 # [email protected]
         with:
           terraform_version: ${{ steps.set-terraform-version.outputs.TF_VERSION }}
 
@@ -152,7 +152,7 @@ jobs:
 
       - name: upload environment cluster config file
         if: inputs.terraform_path == 'environment'
-        uses: actions/upload-artifact@b18b1d32f3f31abcdc29dee3f2484801fe7822f4 # [email protected]
+        uses: actions/upload-artifact@3eadd8b791cabf7cd572f194da82158c24125bd8 # [email protected]
         with:
           name: environment_config_file_${{ inputs.workspace }}
           path: terraform/environment/cluster_config.json
diff --git a/.github/workflows/scheduled-workspace-cleanup.yml b/.github/workflows/scheduled-workspace-cleanup.yml
@@ -31,7 +31,7 @@ jobs:
           TF_VERSION=$(cat .terraform-version)
           echo "TF_VERSION=$TF_VERSION" >> $GITHUB_OUTPUT
 
-      - uses: hashicorp/setup-terraform@c23d9fb1b7ead2e283cd20aab7c4974b032f61f6 # pin@v2
+      - uses: hashicorp/setup-terraform@c4396e588c9df127748dc67459fd162eca7f7220 # pin@v2
         with:
           terraform_version: ${{ steps.set-terraform-version.outputs.TF_VERSION }}
           terraform_wrapper: false

diff --git a/.idea/opg-use-an-lpa.iml b/.idea/opg-use-an-lpa.iml
diff --git a/service-api/app/src/App/src/Service/Lpa/SiriusPerson.php b/service-api/app/src/App/src/Service/Lpa/SiriusPerson.php
@@ -33,7 +33,7 @@ public function getSurname(): string
 
     public function getSystemStatus(): bool
     {
-        return $this->person['systemStatus'];
+        return (bool)$this->person['systemStatus'];
     }
 
     public function getUid(): string
@@ -43,7 +43,7 @@ public function getUid(): string
 
     public function getCompanyName(): string
     {
-        return $this->person['companyName'];
+        return (string)$this->person['companyName'];
     }
 
     public function offsetExists(mixed $offset): bool

diff --git a/service-api/app/test/AppTest/Service/Lpa/SiriusPersonTest.php b/service-api/app/test/AppTest/Service/Lpa/SiriusPersonTest.php
@@ -85,4 +85,20 @@ public function it_becomes_the_expected_json(): void
             json_encode($sut),
         );
     }
+
+    #[Test]
+    public function it_typecasts_on_getters(): void
+    {
+        $sut = new SiriusPerson(
+            [
+                'uId' => 700000000000,
+                'systemStatus' => 1,
+                'companyName' => null,
+            ]
+        );
+
+        $this->assertSame('700000000000', $sut->getUid());
+        $this->assertSame(true, $sut->getSystemStatus());
+        $this->assertSame('', $sut->getCompanyName());
+    }
 }
diff --git a/service-front/app/composer.json b/service-front/app/composer.json
@@ -78,8 +78,9 @@
         "mikey179/vfsstream": "^1.6",
         "phpspec/prophecy": "^1.15",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.0",
         "psalm/plugin-phpunit": "^0.19.0",
+        "rector/rector": "^1.2",
         "roave/security-advisories": "dev-master",
         "slevomat/coding-standard": "^8.9",
         "squizlabs/php_codesniffer": "^3.0",