nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2024-12-25 00:00:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

update mastercontainer to php8.3

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2024-03-04 10:46:38 +01:00
parent d8e3c83afc
commit b5469ad372
9 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/dependency-updates.yml vendored
View file

@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2 - uses: shivammathur/setup-php@v2
with: with:
php-version: 8.2 php-version: 8.3
extensions: apcu extensions: apcu
- name: Run dependency update script - name: Run dependency update script
run: | run: |

2
.github/workflows/lint-php.yml vendored
View file

@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
php-versions: [ "8.2" ] php-versions: [ "8.3" ]
name: php-lint name: php-lint

4
.github/workflows/php-deprecation-detector.yml vendored
View file

@ -17,10 +17,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up php8.2 - name: Set up php
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: 8.2 php-version: 8.3
extensions: apcu extensions: apcu
coverage: none coverage: none

4
.github/workflows/psalm-update-baseline.yml vendored
View file

@ -12,10 +12,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up php8.2 - name: Set up php
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: 8.2 php-version: 8.3
extensions: apcu extensions: apcu
coverage: none coverage: none

2
.github/workflows/psalm.yml vendored
View file

@ -31,7 +31,7 @@ jobs:
- name: Set up php - name: Set up php
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2 uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
with: with:
php-version: 8.2 php-version: 8.3
extensions: apcu extensions: apcu
coverage: none coverage: none
ini-file: development ini-file: development

2
.github/workflows/twig-lint.yml vendored
View file

@ -29,7 +29,7 @@ jobs:
- name: Set up php ${{ matrix.php-versions }} - name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: 8.2 php-version: 8.3
extensions: apcu extensions: apcu
coverage: none coverage: none

4
Containers/mastercontainer/Dockerfile
View file

@ -5,8 +5,8 @@ FROM docker:25.0.3-cli as docker
# Caddy is a requirement # Caddy is a requirement
FROM caddy:2.7.6-alpine as caddy FROM caddy:2.7.6-alpine as caddy
# From https://github.com/docker-library/php/blob/master/8.2/alpine3.19/fpm/Dockerfile # From https://github.com/docker-library/php/blob/master/8.3/alpine3.19/fpm/Dockerfile
FROM php:8.2.16-fpm-alpine3.19 FROM php:8.3.3-fpm-alpine3.19
EXPOSE 80 EXPOSE 80
EXPOSE 8080 EXPOSE 8080

4
php/composer.json
View file

@ -5,7 +5,7 @@
} }
}, },
"require": { "require": {
"php": "8.2.*", "php": "8.3.*",
"ext-json": "*", "ext-json": "*",
"ext-sodium": "*", "ext-sodium": "*",
"ext-curl": "*", "ext-curl": "*",
@ -22,6 +22,6 @@
"psalm": "psalm --threads=1", "psalm": "psalm --threads=1",
"psalm:update-baseline": "psalm --threads=1 --update-baseline", "psalm:update-baseline": "psalm --threads=1 --update-baseline",
"lint": "find . -name \\*.php -not -path './vendor/*' -exec php -l {} \\;", "lint": "find . -name \\*.php -not -path './vendor/*' -exec php -l {} \\;",
"php-deprecation-detector": "find . -name \\*.php -not -path './vendor/*' -exec phpdd scan {} -n -t 8.2 \\;" "php-deprecation-detector": "find . -name \\*.php -not -path './vendor/*' -exec phpdd scan {} -n -t 8.3 \\;"
} }
} }

28
php/composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b0074cfbf6b5cde6d6d2207286ad2e85", "content-hash": "4dcdd3b6df3f2041895d4db74bd45102",
"packages": [ "packages": [
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
@ -1148,16 +1148,16 @@
}, },
{ {
"name": "slim/slim", "name": "slim/slim",
"version": "4.12.0", "version": "4.13.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/slimphp/Slim.git", "url": "https://github.com/slimphp/Slim.git",
"reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18" "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18", "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
"reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18", "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1166,7 +1166,7 @@
"php": "^7.4 || ^8.0", "php": "^7.4 || ^8.0",
"psr/container": "^1.0 || ^2.0", "psr/container": "^1.0 || ^2.0",
"psr/http-factory": "^1.0", "psr/http-factory": "^1.0",
"psr/http-message": "^1.1", "psr/http-message": "^1.1 || ^2.0",
"psr/http-server-handler": "^1.0", "psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0", "psr/http-server-middleware": "^1.0",
"psr/log": "^1.1 || ^2.0 || ^3.0" "psr/log": "^1.1 || ^2.0 || ^3.0"
@ -1174,19 +1174,19 @@
"require-dev": { "require-dev": {
"adriansuter/php-autoload-override": "^1.4", "adriansuter/php-autoload-override": "^1.4",
"ext-simplexml": "*", "ext-simplexml": "*",
"guzzlehttp/psr7": "^2.5", "guzzlehttp/psr7": "^2.6",
"httpsoft/http-message": "^1.1", "httpsoft/http-message": "^1.1",
"httpsoft/http-server-request": "^1.1", "httpsoft/http-server-request": "^1.1",
"laminas/laminas-diactoros": "^2.17", "laminas/laminas-diactoros": "^2.17 || ^3",
"nyholm/psr7": "^1.8", "nyholm/psr7": "^1.8",
"nyholm/psr7-server": "^1.0", "nyholm/psr7-server": "^1.1",
"phpspec/prophecy": "^1.17", "phpspec/prophecy": "^1.19",
"phpspec/prophecy-phpunit": "^2.0", "phpspec/prophecy-phpunit": "^2.1",
"phpstan/phpstan": "^1.10", "phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^9.6", "phpunit/phpunit": "^9.6",
"slim/http": "^1.3", "slim/http": "^1.3",
"slim/psr7": "^1.6", "slim/psr7": "^1.6",
"squizlabs/php_codesniffer": "^3.7" "squizlabs/php_codesniffer": "^3.9"
}, },
"suggest": { "suggest": {
"ext-simplexml": "Needed to support XML format in BodyParsingMiddleware", "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
@ -1259,7 +1259,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-07-23T04:54:29+00:00" "time": "2024-03-03T21:25:30+00:00"
}, },
{ {
"name": "slim/twig-view", "name": "slim/twig-view",
@ -1788,7 +1788,7 @@
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": "8.2.*", "php": "8.3.*",
"ext-json": "*", "ext-json": "*",
"ext-sodium": "*", "ext-sodium": "*",
"ext-curl": "*", "ext-curl": "*",