Compare commits

...

4 commits

Author SHA1 Message Date
Simon L.
a5010cca87
Merge pull request #6787 from nextcloud/aio-dependency-update
Some checks failed
Codespell / Check spelling (push) Waiting to run
Docker Lint / docker-lint (push) Has been cancelled
Lint php / php-lint (push) Has been cancelled
PHP Deprecation Detector / PHP Deprecation Detector (push) Has been cancelled
Static analysis / static-psalm-analysis (push) Has been cancelled
Lint php / php-lint-summary (push) Has been cancelled
PHP dependency updates
2025-08-25 14:28:23 +02:00
szaimen
913179c7a6 php dependency updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-08-25 12:13:50 +00:00
Simon L.
c5d236eed8
Merge pull request #6786 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-25.04.4.3.1
build(deps): bump collabora/code from 25.04.4.2.1 to 25.04.4.3.1 in /Containers/collabora
2025-08-25 09:20:19 +02:00
dependabot[bot]
0ddc2d4ea9
build(deps): bump collabora/code in /Containers/collabora
Bumps collabora/code from 25.04.4.2.1 to 25.04.4.3.1.

---
updated-dependencies:
- dependency-name: collabora/code
  dependency-version: 25.04.4.3.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-25 06:43:28 +00:00
2 changed files with 13 additions and 13 deletions

View file

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:latest
# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/blob/master/docker/from-packages/Dockerfile
FROM collabora/code:25.04.4.2.1
FROM collabora/code:25.04.4.3.1
USER root
ARG DEBIAN_FRONTEND=noninteractive

24
php/composer.lock generated
View file

@ -1150,22 +1150,22 @@
},
{
"name": "slim/slim",
"version": "4.14.0",
"version": "4.15.0",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim.git",
"reference": "5943393b88716eb9e82c4161caa956af63423913"
"reference": "17eba5182975878a0ab9b27982cd2e2cfcb67ea2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/5943393b88716eb9e82c4161caa956af63423913",
"reference": "5943393b88716eb9e82c4161caa956af63423913",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/17eba5182975878a0ab9b27982cd2e2cfcb67ea2",
"reference": "17eba5182975878a0ab9b27982cd2e2cfcb67ea2",
"shasum": ""
},
"require": {
"ext-json": "*",
"nikic/fast-route": "^1.3",
"php": "^7.4 || ^8.0",
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"psr/container": "^1.0 || ^2.0",
"psr/http-factory": "^1.1",
"psr/http-message": "^1.1 || ^2.0",
@ -1174,7 +1174,7 @@
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"require-dev": {
"adriansuter/php-autoload-override": "^1.4",
"adriansuter/php-autoload-override": "^1.4 || ^2",
"ext-simplexml": "*",
"guzzlehttp/psr7": "^2.6",
"httpsoft/http-message": "^1.1",
@ -1184,12 +1184,12 @@
"nyholm/psr7-server": "^1.1",
"phpspec/prophecy": "^1.19",
"phpspec/prophecy-phpunit": "^2.1",
"phpstan/phpstan": "^1.11",
"phpstan/phpstan": "^1 || ^2",
"phpunit/phpunit": "^9.6",
"slim/http": "^1.3",
"slim/psr7": "^1.6",
"squizlabs/php_codesniffer": "^3.10",
"vimeo/psalm": "^5.24"
"vimeo/psalm": "^5 || ^6"
},
"suggest": {
"ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
@ -1216,17 +1216,17 @@
{
"name": "Andrew Smith",
"email": "a.smith@silentworks.co.uk",
"homepage": "http://silentworks.co.uk"
"homepage": "https://silentworks.co.uk"
},
{
"name": "Rob Allen",
"email": "rob@akrabat.com",
"homepage": "http://akrabat.com"
"homepage": "https://akrabat.com"
},
{
"name": "Pierre Berube",
"email": "pierre@lgse.com",
"homepage": "http://www.lgse.com"
"homepage": "https://www.lgse.com"
},
{
"name": "Gabriel Manricks",
@ -1262,7 +1262,7 @@
"type": "tidelift"
}
],
"time": "2024-06-13T08:54:48+00:00"
"time": "2025-08-20T18:16:16+00:00"
},
{
"name": "slim/twig-view",