diff --git a/.github/workflows/create-psalm-container.yml b/.github/workflows/create-psalm-container.yml index d4b021a3..36407589 100644 --- a/.github/workflows/create-psalm-container.yml +++ b/.github/workflows/create-psalm-container.yml @@ -23,7 +23,7 @@ jobs: - name: Modify the Dockerfile run: | set -x - sed -i 's|FROM php:7.4-alpine|FROM php:8.0-alpine|' "psalm-github-actions/Dockerfile" + sed -i 's|FROM php:7.4-alpine|FROM php:8.1-alpine|' "psalm-github-actions/Dockerfile" cat << APCU >> "psalm-github-actions/Dockerfile" RUN mkdir -p /usr/src/php/ext/apcu && \ curl -fsSL https://pecl.php.net/get/apcu | tar xvz -C "/usr/src/php/ext/apcu" --strip 1 && \ diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index 9e0af73e..72a0a5e7 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - uses: nanasess/setup-php@master with: - php-version: 8.0 + php-version: 8.1 extensions: apcu - name: Run dependency update script run: | diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index 730d2aa4..28fae11b 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ["8.0"] + php-versions: ["8.1"] name: php-lint diff --git a/.github/workflows/php-deprecation-detector.yml b/.github/workflows/php-deprecation-detector.yml index bd25a68e..d45feade 100644 --- a/.github/workflows/php-deprecation-detector.yml +++ b/.github/workflows/php-deprecation-detector.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up php8.0 + - name: Set up php8.1 uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 extensions: apcu coverage: none diff --git a/.github/workflows/psalm-analysis.yml b/.github/workflows/psalm-analysis.yml index 0a5a42ad..5994862c 100644 --- a/.github/workflows/psalm-analysis.yml +++ b/.github/workflows/psalm-analysis.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up php8.0 + - name: Set up php8.1 uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 extensions: apcu coverage: none diff --git a/.github/workflows/psalm-update-baseline.yml b/.github/workflows/psalm-update-baseline.yml index 8492f071..53f2ec68 100644 --- a/.github/workflows/psalm-update-baseline.yml +++ b/.github/workflows/psalm-update-baseline.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up php8.0 + - name: Set up php8.1 uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 extensions: apcu coverage: none diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile index 816954b0..a83454e0 100644 --- a/Containers/mastercontainer/Dockerfile +++ b/Containers/mastercontainer/Dockerfile @@ -5,7 +5,7 @@ FROM docker:20.10.21-dind-alpine3.16 as dind FROM caddy:2.6.2-alpine as caddy # From https://github.com/docker-library/php/blob/master/8.0/bullseye/apache/Dockerfile -FROM php:8.0.26-apache-bullseye +FROM php:8.1.13-apache-bullseye EXPOSE 80 EXPOSE 8080 diff --git a/php/composer.json b/php/composer.json index 5a0d46ed..d20a4fb7 100644 --- a/php/composer.json +++ b/php/composer.json @@ -5,7 +5,7 @@ } }, "require": { - "php": "^8.0", + "php": "^8.1", "ext-json": "*", "ext-sodium": "*", "ext-curl": "*", @@ -22,6 +22,6 @@ "psalm": "psalm --threads=1", "psalm:update-baseline": "psalm --threads=1 --update-baseline", "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.0 \\;" + "php-deprecation-detector": "find . -name \\*.php -not -path './vendor/*' -exec phpdd scan {} -n -t 8.1 \\;" } } diff --git a/php/composer.lock b/php/composer.lock index 88c6cef9..39bcf78e 100644 --- a/php/composer.lock +++ b/php/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "46e4dcf2df4e1a85aba17d664cacd815", + "content-hash": "7a318338d9e074d6f02e1fba5b3dda24", "packages": [ { "name": "guzzlehttp/guzzle", @@ -1375,25 +1375,25 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.0.2", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c" + "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", - "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3", + "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3", "shasum": "" }, "require": { - "php": ">=8.0.2" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "3.3-dev" }, "thanks": { "name": "symfony/contracts", @@ -1422,7 +1422,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0" }, "funding": [ { @@ -1438,7 +1438,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-11-25T10:21:52+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1768,7 +1768,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^8.0", + "php": "^8.1", "ext-json": "*", "ext-sodium": "*", "ext-curl": "*",