Skip to content

Commit

Permalink
Merge branch 'pimcore:4.x' into use_php_cs_fixer
Browse files Browse the repository at this point in the history
  • Loading branch information
blankse authored Apr 26, 2024
2 parents 2a5784b + aa4e2cf commit d963961
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 3 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/cla-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: CLA check
on:
issue_comment:
types: [created]
pull_request_target:
types: [opened, closed, synchronize]
jobs:
cla-workflow:
uses: pimcore/workflows-collection-public/.github/workflows/reusable-cla-check.yaml@v1.3.0
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
secrets:
CLA_ACTION_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }}
22 changes: 22 additions & 0 deletions .github/workflows/poeditor-export.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: "Trigger POEditor Translations Export"

on:
workflow_dispatch:
push:
branches:
- "[0-9]+.x"
paths:
- 'src/Resources/translations/admin.en.yml'

permissions:
contents: read

jobs:
poeditor:
runs-on: ubuntu-latest
steps:
- name: Trigger workflow in pimcore/poeditor-export-action
env:
GH_TOKEN: ${{ secrets.POEDITOR_ACTION_TRIGGER_TOKEN }}
run: |
gh workflow run -R pimcore/poeditor-export-action poeditor-export.yaml
10 changes: 10 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Handle stale issues

on:
workflow_dispatch:
schedule:
- cron: '37 7 * * *'

jobs:
call-stale-workflow:
uses: pimcore/workflows-collection-public/.github/workflows/stale.yml@v1.1.0
2 changes: 1 addition & 1 deletion src/CustomerSaveManager/DefaultCustomerSaveManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ protected function rememberOriginalCustomer(CustomerInterface $customer)
$originalCustomer = null;
}

if ($originalCustomerNeeded) {
if ($originalCustomerNeeded && $customer->getId()) {
$originalCustomer = $this->customerProvider->getById($customer->getId(), true);
}

Expand Down
4 changes: 2 additions & 2 deletions src/View/Formatter/DefaultViewFormatter.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ public function formatDatetimeValue($value, $dateOnly = false)
$date = Carbon::parse($value);

if ($dateOnly) {
return $date->formatLocalized('%x');
return $date->isoFormat('LL');
}

return $date->formatLocalized('%x %X');
return $date->isoFormat('LLL');
}

/**
Expand Down

0 comments on commit d963961

Please sign in to comment.