Skip to content

Commit ed7ddd8

Browse files
committed
Merge branch '5.x' into 6.x
# Conflicts: # .github/workflows/ci.yml # composer.json
2 parents ef93d07 + a6321e1 commit ed7ddd8

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
prefer-lowest: 'prefer-lowest'
2121

2222
steps:
23-
- uses: actions/checkout@v6
23+
- uses: actions/checkout@v7
2424

2525
- name: Setup PHP
2626
uses: shivammathur/setup-php@v2
@@ -38,7 +38,7 @@ jobs:
3838
run: echo "date=$(date +'%Y-%m')" >> $GITHUB_OUTPUT
3939

4040
- name: Cache composer dependencies
41-
uses: actions/cache@v5
41+
uses: actions/cache@v6
4242
with:
4343
path: ${{ steps.composer-cache.outputs.dir }}
4444
key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
@@ -73,7 +73,7 @@ jobs:
7373
runs-on: ubuntu-22.04
7474

7575
steps:
76-
- uses: actions/checkout@v6
76+
- uses: actions/checkout@v7
7777

7878
- name: Setup PHP
7979
uses: shivammathur/setup-php@v2
@@ -92,7 +92,7 @@ jobs:
9292
run: echo "date=$(date +'%Y-%m')" >> $GITHUB_OUTPUT
9393

9494
- name: Cache composer dependencies
95-
uses: actions/cache@v5
95+
uses: actions/cache@v6
9696
with:
9797
path: ${{ steps.composer-cache.outputs.dir }}
9898
key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"php": "^8.2",
99
"cakephp/console": "^5.1.5",
1010
"nette/utils": "^4.0",
11-
"rector/rector": "~2.4.0",
11+
"rector/rector": "~2.5.2",
1212
"symfony/process": "^6.0 || ^7.0",
1313
"symfony/string": "^6.0 || ^7.0"
1414
},

0 commit comments

Comments
 (0)