Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
marcospassos committed Mar 6, 2023
2 parents 8222962 + fad72c6 commit 33e397b
Show file tree
Hide file tree
Showing 12 changed files with 329 additions and 119 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/branch-validations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: symfonycorp/security-checker-action@v2
- uses: symfonycorp/security-checker-action@v3

composer:
runs-on: ubuntu-latest
Expand All @@ -27,16 +27,19 @@ jobs:
with:
php-version: '8.1'
tools: composer:v2

- name: Composer cache
uses: actions/cache@v2
with:
key: composer-${{ hashFiles('**/composer.lock') }}
path: ${{ github.workspace }}/.cache

- name: Vendor cache
uses: actions/cache@v2
with:
key: vendor-${{ hashFiles('**/composer.lock') }}
path: ${{ github.workspace }}/vendor

- name: Tools cache
uses: actions/cache@v2
with:
Expand Down Expand Up @@ -68,16 +71,19 @@ jobs:
with:
php-version: '8.1'
tools: composer:v2

- name: Composer cache
uses: actions/cache@v2
with:
key: composer-${{ hashFiles('**/composer.lock') }}
path: ${{ github.workspace }}/.cache

- name: Vendor cache
uses: actions/cache@v2
with:
key: vendor-${{ hashFiles('**/composer.lock') }}
path: ${{ github.workspace }}/vendor

- name: Tools cache
uses: actions/cache@v2
with:
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
],
"require": {
"php": "^8.0",
"ext-mbstring": "*"
"ext-mbstring": "^8.0",
"psr/log": "^2.0 || ^3.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.15",
Expand Down
Loading

0 comments on commit 33e397b

Please sign in to comment.