eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #6351 from nextcloud/enh/5699/update-mastercontainer-to-php8.4

Browse source 
mastercontainer: update to php8.4
This commit is contained in:
Simon L. 2025-04-29 11:34:20 +02:00 • committed by GitHub
commit 3ace41913e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 1411 additions and 153 deletions
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@cf4cade2721270509d5b1c766ab3549210a39a2a # v2 - uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
with: with:
php-version: 8.3 php-version: 8.4
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.3" ] php-versions: [ "8.4" ]
name: php-lint name: php-lint

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

@ -20,7 +20,7 @@ jobs:
- name: Set up php - name: Set up php
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2 uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
with: with:
php-version: 8.3 php-version: 8.4
extensions: apcu extensions: apcu
coverage: none coverage: none

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

@ -15,7 +15,7 @@ jobs:
- name: Set up php - name: Set up php
uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2 uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
with: with:
php-version: 8.3 php-version: 8.4
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@cf4cade2721270509d5b1c766ab3549210a39a2a # v2 uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
with: with:
php-version: 8.3 php-version: 8.4
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@cf4cade2721270509d5b1c766ab3549210a39a2a # v2 uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
with: with:
php-version: 8.3 php-version: 8.4
extensions: apcu extensions: apcu
coverage: none coverage: none

4
Containers/mastercontainer/Dockerfile
View file

@ -5,8 +5,8 @@ FROM docker:28.1.1-cli AS docker
# Caddy is a requirement # Caddy is a requirement
FROM caddy:2.10.0-alpine AS caddy FROM caddy:2.10.0-alpine AS caddy
# From https://github.com/docker-library/php/blob/master/8.3/alpine3.21/fpm/Dockerfile # From https://github.com/docker-library/php/blob/master/8.4/alpine3.21/fpm/Dockerfile
FROM php:8.3.20-fpm-alpine3.21 FROM php:8.4.6-fpm-alpine3.21
EXPOSE 80 EXPOSE 80
EXPOSE 8080 EXPOSE 8080

6
php/composer.json
View file

@ -5,7 +5,7 @@
} }
}, },
"require": { "require": {
"php": "8.3.*", "php": "8.4.*",
"ext-json": "*", "ext-json": "*",
"ext-sodium": "*", "ext-sodium": "*",
"ext-curl": "*", "ext-curl": "*",
@ -20,7 +20,7 @@
}, },
"require-dev": { "require-dev": {
"sserbin/twig-linter": "@dev", "sserbin/twig-linter": "@dev",
"vimeo/psalm": "^5.25", "vimeo/psalm": "^6.0",
"wapmorgan/php-deprecation-detector": "dev-master" "wapmorgan/php-deprecation-detector": "dev-master"
}, },
"scripts": { "scripts": {
@ -33,6 +33,6 @@
"psalm:strict": "psalm --threads=1 --show-info=true", "psalm:strict": "psalm --threads=1 --show-info=true",
"lint": "php -l src/*.php src/**/*.php public/index.php", "lint": "php -l src/*.php src/**/*.php public/index.php",
"lint:twig": "twig-linter lint ./templates", "lint:twig": "twig-linter lint ./templates",
"php-deprecation-detector": "phpdd scan -n -t 8.3 src/*.php src/**/*.php public/index.php" "php-deprecation-detector": "phpdd scan -n -t 8.4 src/*.php src/**/*.php public/index.php"
} }
} }

1371
php/composer.lock generated
View file

File diff suppressed because it is too large Load diff

170
php/psalm-baseline.xml
View file

@ -1,2 +1,170 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0"/> <files psalm-version="6.10.1@f9fd6bc117e9ce1e854c2ed6777e7135aaa4966b">
<file src="src/Auth/AuthManager.php">
<ClassMustBeFinal>
<code><![CDATA[AuthManager]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Auth/PasswordGenerator.php">
<ClassMustBeFinal>
<code><![CDATA[PasswordGenerator]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/AioVariables.php">
<ClassMustBeFinal>
<code><![CDATA[AioVariables]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/Container.php">
<ClassMustBeFinal>
<code><![CDATA[Container]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/ContainerEnvironmentVariables.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerEnvironmentVariables]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/ContainerPort.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerPort]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/ContainerPorts.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerPorts]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/ContainerVolume.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerVolume]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/ContainerVolumes.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerVolumes]]></code>
</ClassMustBeFinal>
</file>
<file src="src/ContainerDefinitionFetcher.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerDefinitionFetcher]]></code>
</ClassMustBeFinal>
<PossiblyFalseArgument>
<code><![CDATA[file_get_contents($path)]]></code>
<code><![CDATA[file_get_contents(__DIR__ . '/../containers.json')]]></code>
</PossiblyFalseArgument>
</file>
<file src="src/Controller/ConfigurationController.php">
<ClassMustBeFinal>
<code><![CDATA[ConfigurationController]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Controller/DockerController.php">
<ClassMustBeFinal>
<code><![CDATA[DockerController]]></code>
</ClassMustBeFinal>
<InvalidOperand>
<code><![CDATA[$port]]></code>
</InvalidOperand>
</file>
<file src="src/Controller/LoginController.php">
<ClassMustBeFinal>
<code><![CDATA[LoginController]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Data/ConfigurationManager.php">
<ClassMustBeFinal>
<code><![CDATA[ConfigurationManager]]></code>
</ClassMustBeFinal>
<FalsableReturnStatement>
<code><![CDATA[$additionalBackupDirectories]]></code>
</FalsableReturnStatement>
<InvalidFalsableReturnType>
<code><![CDATA[string]]></code>
</InvalidFalsableReturnType>
<PossiblyFalseArgument>
<code><![CDATA[$ch]]></code>
<code><![CDATA[$ch]]></code>
<code><![CDATA[$ch]]></code>
<code><![CDATA[$ch]]></code>
<code><![CDATA[$ch]]></code>
<code><![CDATA[$ch]]></code>
<code><![CDATA[$configContent]]></code>
<code><![CDATA[$content]]></code>
<code><![CDATA[$content]]></code>
<code><![CDATA[$dailyBackupFile]]></code>
<code><![CDATA[$dailyBackupFile]]></code>
<code><![CDATA[file_get_contents(DataConst::GetBackupPublicKey())]]></code>
</PossiblyFalseArgument>
</file>
<file src="src/Data/DataConst.php">
<ClassMustBeFinal>
<code><![CDATA[DataConst]]></code>
</ClassMustBeFinal>
<FalsableReturnStatement>
<code><![CDATA[realpath(__DIR__ . '/../../../community-containers/')]]></code>
<code><![CDATA[realpath(__DIR__ . '/../../data/')]]></code>
<code><![CDATA[realpath(__DIR__ . '/../../session/')]]></code>
</FalsableReturnStatement>
<InvalidFalsableReturnType>
<code><![CDATA[string]]></code>
<code><![CDATA[string]]></code>
<code><![CDATA[string]]></code>
</InvalidFalsableReturnType>
</file>
<file src="src/Data/InvalidSettingConfigurationException.php">
<ClassMustBeFinal>
<code><![CDATA[InvalidSettingConfigurationException]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Data/Setup.php">
<ClassMustBeFinal>
<code><![CDATA[Setup]]></code>
</ClassMustBeFinal>
</file>
<file src="src/DependencyInjection.php">
<ClassMustBeFinal>
<code><![CDATA[DependencyInjection]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Docker/DockerActionManager.php">
<ClassMustBeFinal>
<code><![CDATA[DockerActionManager]]></code>
</ClassMustBeFinal>
<PossiblyFalseArgument>
<code><![CDATA[$line]]></code>
<code><![CDATA[$line]]></code>
</PossiblyFalseArgument>
</file>
<file src="src/Docker/DockerHubManager.php">
<ClassMustBeFinal>
<code><![CDATA[DockerHubManager]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Docker/GitHubContainerRegistryManager.php">
<ClassMustBeFinal>
<code><![CDATA[GitHubContainerRegistryManager]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Middleware/AuthMiddleware.php">
<ClassMustBeFinal>
<code><![CDATA[AuthMiddleware]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Twig/ClassExtension.php">
<ClassMustBeFinal>
<code><![CDATA[ClassExtension]]></code>
</ClassMustBeFinal>
<MissingOverrideAttribute>
<code><![CDATA[public function getFunctions() : array]]></code>
</MissingOverrideAttribute>
</file>
<file src="src/Twig/CsrfExtension.php">
<ClassMustBeFinal>
<code><![CDATA[CsrfExtension]]></code>
</ClassMustBeFinal>
<MissingOverrideAttribute>
<code><![CDATA[public function getGlobals() : array]]></code>
</MissingOverrideAttribute>
</file>
</files>

1
php/psalm.xml
View file

@ -5,6 +5,7 @@
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
errorBaseline="psalm-baseline.xml" errorBaseline="psalm-baseline.xml"
findUnusedBaselineEntry="true" findUnusedBaselineEntry="true"
findUnusedCode="false"
> >
<projectFiles> <projectFiles>
<directory name="templates"/> <directory name="templates"/>