Skip to content

Commit f26008c

Browse files
authored
Merge branch 'main' into php-8-5
2 parents 6fcb6dc + a481c65 commit f26008c

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

.docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG USER_GID=${USER_UID}
1111
RUN groupadd --gid ${USER_GID} ${USERNAME} && \
1212
useradd -s /bin/bash --uid ${USER_UID} --gid ${USERNAME} -m ${USERNAME}
1313

14-
COPY --from=composer:2.9 /usr/bin/composer /usr/bin/composer
14+
COPY --from=composer:2.10 /usr/bin/composer /usr/bin/composer
1515

1616
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
1717
bash /tmp/library-scripts/dev.sh "${USERNAME}"

.github/workflows/documentation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
- name: Cache Composer packages
3131
id: composer-apigen-cache
32-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3333
with:
3434
path: tools/apigen/vendor
3535
key: ${{ runner.os }}-${{ hashFiles('tools/apigen/composer.lock') }}
@@ -47,7 +47,7 @@ jobs:
4747
run: ./tools/apigen/apigen
4848

4949
- name: Upload artifact
50-
uses: actions/upload-pages-artifact@v4
50+
uses: actions/upload-pages-artifact@v5
5151
with:
5252
path: 'docs'
5353

@@ -77,7 +77,7 @@ jobs:
7777
run: echo "$GITHUB_CONTEXT"; env
7878

7979
- name: Setup Pages
80-
uses: actions/configure-pages@v5
80+
uses: actions/configure-pages@v6
8181

8282
- name: Deploy to GitHub Pages
8383
id: deployment

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
- name: Cache Composer packages
3434
id: composer-cache
35-
uses: actions/cache@v4
35+
uses: actions/cache@v5
3636
with:
3737
path: vendor
3838
key: ${{ runner.os }}-php-${{ matrix.php-versions }}-${{ hashFiles('composer.json') }}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"texthtml/object-reaper": "^1.0"
2626
},
2727
"require-dev": {
28-
"phpunit/phpunit": "^10.0|^11.0|^12.0",
28+
"phpunit/phpunit": "^10.0|^11.0|^12.0|^13.0",
2929
"phpspec/prophecy-phpunit": "^2.0",
3030
"squizlabs/php_codesniffer": "^4.0",
3131
"slevomat/coding-standard": "^8.0",

0 commit comments

Comments
 (0)