Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .devcontainer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ echo "127.0.0.1 auth.dev.local www.dev.local" | sudo tee -a /etc/hosts
docker compose up -d

# starting container (Joomla 5)
docker compose -f compose.yml -f compose.joomla5.yml up -d
JOOMLA_VERSION=5.4.3 PHP_VERSION=8.3 docker compose build && docker compose up -d

# starting container for debug
# > use VSCode to attach running joomla container for Xdebug
Expand Down
9 changes: 0 additions & 9 deletions .devcontainer/compose.joomla5.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .devcontainer/joomla/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG PHP_VERSION=8.4
ARG PHP_EXTRA_BUILD_DEPS=""
# https://hub.docker.com/_/joomla
ARG JOOMLA_VERSION=6.0.2
ARG JOOMLA_VERSION=6.0.3

FROM joomla:${JOOMLA_VERSION}-apache AS joomla

Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ jobs:
matrix:
joomla:
- version: "5"
compose-override: "compose.joomla5.yml"
php-version: "8.3"
joomla-version: "5.4.1"
joomla-version: "5.4.3"
- version: "6"
compose-override: ""
php-version: ""
joomla-version: ""
name: E2E (Joomla ${{ matrix.joomla.version }})
Expand Down Expand Up @@ -80,12 +78,7 @@ jobs:
# Start services and install applications
- name: Start Docker Compose services
working-directory: .devcontainer
run: |
if [ -n "${{ matrix.joomla.compose-override }}" ]; then
docker compose -f compose.yml -f ${{ matrix.joomla.compose-override }} up -d --no-build
else
docker compose up -d --no-build
fi
run: docker compose up -d --no-build

- name: Setup Joomla and install extension
run: .devcontainer/joomla/install.sh
Expand Down
4 changes: 2 additions & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
- `docker compose -f .devcontainer/compose.yml up -d`
- `docker compose -f .devcontainer/compose.yml down`
- Start / stop stack (Joomla 5)
- `docker compose -f .devcontainer/compose.yml -f .devcontainer/compose.joomla5.yml up -d`
- `docker compose -f .devcontainer/compose.yml -f .devcontainer/compose.joomla5.yml down`
- `JOOMLA_VERSION=5.4.3 PHP_VERSION=8.3 docker compose -f .devcontainer/compose.yml build && docker compose -f .devcontainer/compose.yml up -d`
- `docker compose -f .devcontainer/compose.yml down`
- Work inside the container
- Prefix project tasks with `docker compose -f .devcontainer/compose.yml exec -w /workspace joomla`
- Install / update dependencies: `composer install`, `composer update`
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
"type": "package",
"package": {
"name": "joomla/joomla-cms",
"version": "6.0.2",
"version": "6.0.3",
"dist": {
"url": "https://github.com/joomla/joomla-cms/releases/download/6.0.2/Joomla_6.0.2-Stable-Full_Package.zip",
"url": "https://github.com/joomla/joomla-cms/releases/download/6.0.3/Joomla_6.0.3-Stable-Full_Package.zip",
"type": "zip"
},
"source": {
"url": "https://github.com/joomla/joomla-cms.git",
"type": "git",
"reference": "tags/6.0.2"
"reference": "tags/6.0.3"
}
}
}
Expand All @@ -44,8 +44,8 @@
"php": ">=8.1"
},
"require-dev": {

Copilot AI Feb 19, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

composer.json still declares PHP >=8.1, but the updated dev dependency set (via php-cs-fixer 3.94 / sebastian-diff 8 / Symfony 8 pulled in by the lockfile) requires PHP >=8.4. As a result, composer install (with dev deps) will fail on PHP 8.1–8.3 even though the root constraint suggests it should work. Consider either (a) raising the root PHP requirement to match the tooling baseline, or (b) explicitly adding a php: >=8.4 constraint under require-dev and updating contributor docs so the runtime requirement and dev-tooling requirement are clearly separated.

Suggested change
"require-dev": {
"require-dev": {
"php": ">=8.4",

Copilot uses AI. Check for mistakes.
"friendsofphp/php-cs-fixer": "^3.92",
"joomla/joomla-cms": "6.0.2",
"friendsofphp/php-cs-fixer": "^3.94",
"joomla/joomla-cms": "6.0.3",
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan": "^2.1",
"phpstan/phpstan-deprecation-rules": "^2.0"
Expand Down
Loading
Loading