Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: render-guides
type: php
docroot: Documentation-GENERATED-temp
php_version: "8.1"
php_version: "8.2"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
Expand All @@ -13,7 +13,7 @@ webimage_extra_packages: [build-essential]
use_dns_when_possible: true
composer_version: "2"
web_environment: []
nodejs_version: "18"
nodejs_version: "20"

# Key features of DDEV's config.yaml:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
name: "Test Dockerfile"

env:
DEFAULT_PHP_VERSION: "8.1"
DEFAULT_PHP_VERSION: "8.2"
RUN_ENVIRONMENT: "local"

jobs:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on: # yamllint disable-line rule:truthy
- "main"

env:
DEFAULT_PHP_VERSION: "8.1"
DEFAULT_PHP_VERSION: "8.2"
RUN_ENVIRONMENT: "local"

jobs:
Expand All @@ -18,7 +18,6 @@ jobs:
fail-fast: false
matrix:
php:
- '8.1'
- '8.2'
- '8.3'
- '8.4'
Expand Down
2 changes: 1 addition & 1 deletion .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
->setCacheFile('.cache/.php-cs-fixer.cache')
->setRules([
'@PER-CS1.0' => true,
'@PHP81Migration' => true,
'@PHP82Migration' => true,

// Already implemented PER-CS2 rules we opt-in explicitly
// @todo: Can be dropped once we enable @PER-CS2.0
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1-cli-alpine AS builder
FROM php:8.2-cli-alpine AS builder

COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
Expand All @@ -12,7 +12,7 @@ COPY . /opt/guides
RUN composer install --no-dev --no-interaction --no-progress \
--no-suggest --optimize-autoloader --classmap-authoritative

FROM php:8.1-cli-alpine
FROM php:8.2-cli-alpine

COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
RUN apk add --update $PHPIZE_DEPS
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"description": "phpDocumentor-based Documentation rendering for docs.typo3.org or custom extensions.",
"license": "OPL-1.0",
"require": {
"php": "^8.1",
"php": "^8.2",
"ext-curl": "*",
"ext-dom": "*",
"ext-libxml": "*",
"brotkrueml/twig-codehighlight": "^1.0",
"league/flysystem": "^1.1.10",
"league/flysystem": "^3.29",
"phpdocumentor/dev-server": "^1.9.4",
"phpdocumentor/filesystem": "^1.9",
"phpdocumentor/guides": "^1.9",
Expand Down Expand Up @@ -42,6 +42,7 @@
"replace": {
"symfony/polyfill-php80": "*",
"symfony/polyfill-php81": "*",
"symfony/polyfill-php82": "*",
"t3docs/typo3-api": "self.version",
"t3docs/typo3-docs-theme": "self.version",
"t3docs/typo3-guides-cli": "self.version",
Expand Down Expand Up @@ -69,7 +70,7 @@
"phpstan/extension-installer": true
},
"platform": {
"php": "8.1.27"
"php": "8.2.28"
},
"sort-packages": true
},
Expand Down
Loading