diff --git a/.github/workflows/create-psalm-container.yml b/.github/workflows/create-psalm-container.yml index 20d387df..2f217c25 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.1-alpine|' "psalm-github-actions/Dockerfile" + sed -i 's|FROM php:7.4-alpine|FROM php:8.2-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 9ce168d6..5f063651 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 extensions: apcu - name: Run dependency update script run: | diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index f3e56b92..fb57d046 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.1"] + php-versions: ["8.2"] name: php-lint diff --git a/.github/workflows/php-deprecation-detector.yml b/.github/workflows/php-deprecation-detector.yml index 073d349d..7e4c625f 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.1 + - name: Set up php8.2 uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 extensions: apcu coverage: none diff --git a/.github/workflows/psalm-analysis.yml b/.github/workflows/psalm-analysis.yml index 5994862c..6d367a52 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.1 + - name: Set up php8.2 uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 extensions: apcu coverage: none diff --git a/.github/workflows/psalm-update-baseline.yml b/.github/workflows/psalm-update-baseline.yml index e565bdd0..9413b19e 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.1 + - name: Set up php8.2 uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 extensions: apcu coverage: none diff --git a/.github/workflows/twig-lint.yml b/.github/workflows/twig-lint.yml index 0652df87..2bb89e70 100644 --- a/.github/workflows/twig-lint.yml +++ b/.github/workflows/twig-lint.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ["8.1"] + php-versions: ["8.2"] name: twig-lint diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile index 61392c84..018202f4 100644 --- a/Containers/mastercontainer/Dockerfile +++ b/Containers/mastercontainer/Dockerfile @@ -4,8 +4,8 @@ FROM docker:23.0.6-cli as docker # Caddy is a requirement FROM caddy:2.6.4-alpine as caddy -# From https://github.com/docker-library/php/blob/master/8.1/alpine3.17/fpm/Dockerfile -FROM php:8.1.18-fpm-alpine3.17 +# From https://github.com/docker-library/php/blob/master/8.2/alpine3.17/fpm/Dockerfile +FROM php:8.2.5-fpm-alpine3.17 RUN set -ex; \ apk add --no-cache shadow; \ diff --git a/php/composer.json b/php/composer.json index acdccfa7..32488056 100644 --- a/php/composer.json +++ b/php/composer.json @@ -5,7 +5,7 @@ } }, "require": { - "php": "8.1.*", + "php": "8.2.*", "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.1 \\;" + "php-deprecation-detector": "find . -name \\*.php -not -path './vendor/*' -exec phpdd scan {} -n -t 8.2 \\;" } } diff --git a/php/composer.lock b/php/composer.lock index ec4c564c..5099e9ca 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": "ca8e9b0dbbbd88c096dd8f2bda37a315", + "content-hash": "b0074cfbf6b5cde6d6d2207286ad2e85", "packages": [ { "name": "guzzlehttp/guzzle", @@ -1642,16 +1642,16 @@ }, { "name": "twig/twig", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a6e0510cc793912b451fd40ab983a1d28f611c15" + "reference": "106c170d08e8415d78be2d16c3d057d0d108262b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a6e0510cc793912b451fd40ab983a1d28f611c15", - "reference": "a6e0510cc793912b451fd40ab983a1d28f611c15", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/106c170d08e8415d78be2d16c3d057d0d108262b", + "reference": "106c170d08e8415d78be2d16c3d057d0d108262b", "shasum": "" }, "require": { @@ -1660,15 +1660,10 @@ "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { - "psr/container": "^1.0", + "psr/container": "^1.0|^2.0", "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } - }, "autoload": { "psr-4": { "Twig\\": "src/" @@ -1702,7 +1697,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.5.1" + "source": "https://github.com/twigphp/Twig/tree/v3.6.0" }, "funding": [ { @@ -1714,7 +1709,7 @@ "type": "tidelift" } ], - "time": "2023-02-08T07:49:20+00:00" + "time": "2023-05-03T19:06:57+00:00" } ], "packages-dev": [], @@ -1724,7 +1719,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "8.1.*", + "php": "8.2.*", "ext-json": "*", "ext-sodium": "*", "ext-curl": "*",