hipowered.dev/cake-addresses
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.x' into prod
All checks were successful
CI / testsuite (pgsql, 8.2, ) (push) Successful in 5m26s
Details
CI / testsuite (pgsql, 8.4, ) (push) Successful in 6m41s
Details
CI / testsuite (mysql, 8.2, ) (push) Successful in 14m31s
Details
CI / testsuite (sqlite, 8.2, ) (push) Successful in 4m39s
Details
CI / testsuite (mysql, 8.4, ) (push) Successful in 18m53s
Details
CI / testsuite (sqlite, 8.4, ) (push) Successful in 7m17s
Details
CI / testsuite (sqlite, 8.2, prefer-lowest) (push) Successful in 13m47s
Details
CI / Coding Standard & Static Analysis (push) Successful in 12m31s
Details

Browse Source
This commit is contained in:
Brandon Shipley
2026-02-11 21:12:59 -08:00
parent 6dbc50171c bd2d69ea53
commit 7bafc528b4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/release.yaml
View File

@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
- uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Release - name: Release
uses: softprops/action-gh-release@v2 uses: softprops/action-gh-release@v2

8
.gitea/workflows/status.yaml
View File

@@ -15,8 +15,8 @@ jobs:
- name: Webhook - name: Webhook
uses: zzzze/webhook-trigger@master uses: zzzze/webhook-trigger@master
with: with:
data: "{\"text\":\"cake-addresses build succeeded\"}" data: "{\"text\":\"${{ gitea.repository }} build succeeded 🎉\"}"
webhook_url: "https://chat.ops.hipowered.dev/hooks/697436db05042b4dd9cce240/hZCMq7jCPqHprKFcWp3v49wsf4MaN6caWdh7F8iXiSyr6Ts9" webhook_url: ${{ secrets.BUILD_STATUS_NOTIFY_WEBHOOK_URL }}
options: "-H \"Content-Type: application/json\"" options: "-H \"Content-Type: application/json\""
on-failure: on-failure:
@@ -26,6 +26,6 @@ jobs:
- name: Webhook - name: Webhook
uses: zzzze/webhook-trigger@master uses: zzzze/webhook-trigger@master
with: with:
data: "{\"text\":\"cake-addresses build failed\"}" data: "{\"text\":\"${{ gitea.repository }} build failed 🔎\"}"
webhook_url: "https://chat.ops.hipowered.dev/hooks/697436db05042b4dd9cce240/hZCMq7jCPqHprKFcWp3v49wsf4MaN6caWdh7F8iXiSyr6Ts9" webhook_url: ${{ secrets.BUILD_STATUS_NOTIFY_WEBHOOK_URL }}
options: "-H \"Content-Type: application/json\"" options: "-H \"Content-Type: application/json\""

4
src/Model/Table/AddressesTable.php
View File

@@ -175,11 +175,11 @@ class AddressesTable extends Table {
* @return void * @return void
*/ */
public function beforeMarshal(EventInterface $event, ArrayObject $data, ArrayObject $options): void { public function beforeMarshal(EventInterface $event, ArrayObject $data, ArrayObject $options): void {
if ($data['state_id'] && !isset($data['state'])) { if (($data['state_id'] ?? false) && !isset($data['state'])) {
$state = $this->States->find()->where(['id' => $data['state_id']])->first(); $state = $this->States->find()->where(['id' => $data['state_id']])->first();
$data['state'] = $state->name ?? null; $data['state'] = $state->name ?? null;
} }
if ($data['country_id'] && !isset($data['country'])) { if (($data['country_id'] ?? false) && !isset($data['country'])) {
$country = $this->Countries->find()->where(['id' => $data['country_id']])->first(); $country = $this->Countries->find()->where(['id' => $data['country_id']])->first();
$data['country'] = $country->name ?? null; $data['country'] = $country->name ?? null;
} }