Skip to content

Update dependencies #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ADmad wants to merge 4 commits into
base: 2.x
Choose a base branch
from
Open

Update dependencies #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cff3a1
Update dependencies
ADmad Oct 27, 2025
4180693
Bump up PHP to 8.5 and Alpine 3.24
ADmad Oct 31, 2026
8fee585
Fix duplicate macro argument in namespace.twig
Copilot Oct 31, 2026
f4116f2
bump deps
ADmad Oct 31, 2026
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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.5'
extensions: mbstring, intl
tools: cs2pr
coverage: none
Expand Down
40 changes: 20 additions & 20 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
# Build api docs with php 8.1 requirements
FROM alpine:3.19 AS builder
# Build api docs with php 8.5 requirements
FROM alpine:3.24 AS builder

RUN apk add --no-cache \
bash \
curl \
git \
make \
openssh-client \
php81 \
php82-bz2 \
php82-curl \
php82-dom \
php82-intl \
php82-json \
php82-mbstring \
php82-openssl \
php82-phar \
php82-simplexml \
php82-tokenizer \
php82-xml \
php82-xmlwriter \
php82-zip
php85 \
php85-bz2 \
php85-curl \
php85-dom \
php85-intl \
php85-iconv \
php85-mbstring \
php85-openssl \
php85-phar \
php85-simplexml \
php85-tokenizer \
php85-xml \
php85-xmlwriter \
php85-zip

RUN ln -sf /usr/bin/php82 /usr/bin/php
RUN ln -sf /usr/bin/php85 /usr/bin/php

RUN mkdir /root/.ssh \
&& ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
Expand All @@ -38,8 +38,8 @@ RUN git clone https://github.com/cakephp/cakephp.git /cakephp \
&& git clone https://github.com/cakephp/queue.git /queue

RUN ls -lah \
&& make build-cakephp3-all CAKEPHP_SOURCE_DIR=/cakephp \
&& make build-cakephp4-all CAKEPHP_SOURCE_DIR=/cakephp \
# && make build-cakephp3-all CAKEPHP_SOURCE_DIR=/cakephp \
# && make build-cakephp4-all CAKEPHP_SOURCE_DIR=/cakephp \

@ADmad ADmad Oct 31, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@LordSimal AI decided to comment this which means the changes are unlikely to work for older Cake versions

&& make build-cakephp5-all CAKEPHP_SOURCE_DIR=/cakephp \
&& make build-authentication-all AUTHENTICATION_SOURCE_DIR=/authentication \
&& make build-authorization-all AUTHORIZATION_SOURCE_DIR=/authorization \
Expand All @@ -48,7 +48,7 @@ RUN ls -lah \
&& make build-queue-all QUEUE_SOURCE_DIR=/queue

# nginx server
FROM alpine:3.19
FROM alpine:3.24

LABEL Description="CakePHP API Docs"

Expand Down
23 changes: 13 additions & 10 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@
"description": "API docs for CakePHP",
"type": "application",
"config": {
"platform": {
"php": "8.5.0"
},
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"require": {
"php": ">=8.1",
"cakephp/collection": "^5.0",
"cakephp/console": "^5.0",
"composer/composer": "^2.0",
"erusev/parsedown": "^1.7",
"nikic/php-parser": "^4.13",
"phpstan/phpdoc-parser": "^1.29.1",
"twig/markdown-extra": "^3.0",
"twig/twig": "^3.0"
"php": ">=8.5",
"cakephp/collection": "^5.4",
"cakephp/console": "^5.4",
"composer/composer": "^2.11",
"erusev/parsedown": "^1.8",
"nikic/php-parser": "^5.9",
"phpstan/phpdoc-parser": "^2.4",
"twig/markdown-extra": "^3.29",
"twig/twig": "^3.30"
},
"require-dev": {
"cakephp/cakephp-codesniffer": "^4.0"
"cakephp/cakephp-codesniffer": "^5.3"
},
"autoload": {
"psr-4": {
Expand Down
Loading
Loading
⌂ Proxy