Skip to content

Commit 405767f

Browse files
dereuromarkdependabot[bot]josbeir
authored
fix property types related to CakePHP 5.4 changes (#1067)
* Bump codecov/codecov-action from 5 to 6 (#1063) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5 to 6. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v5...v6) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix documentation issues (#1064) - Update migrations documentation link: 3 -> 5 - Use strict comparison (===) instead of loose (==) * Add pluginname navbar * Fix doc ci issues * docs(ci): fix remaining code fence issues * adjust Dockerfile to use NodeJS 24 and angie * fix property types related to CakePHP 5.4 changes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mark Scherer <dereuromark@users.noreply.github.com> Co-authored-by: Jasper Smet <josbeir@gmail.com>
2 parents b31ee2e + 22ddfff commit 405767f

16 files changed

Lines changed: 553 additions & 490 deletions

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
167167
- name: Code Coverage Report
168168
if: success() && matrix.php-version == '8.1' && matrix.db-type == 'mysql'
169-
uses: codecov/codecov-action@v5
169+
uses: codecov/codecov-action@v6
170170

171171
testsuite-windows:
172172
runs-on: windows-2022
@@ -240,7 +240,7 @@ jobs:
240240
vendor/bin/phpunit --coverage-clover=coverage.xml
241241
242242
- name: Submit code coverage
243-
uses: codecov/codecov-action@v5
243+
uses: codecov/codecov-action@v6
244244

245245
cs-stan:
246246
uses: cakephp/.github/.github/workflows/cs-stan.yml@5.x
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Documentation Validation
2+
3+
on:
4+
push:
5+
branches:
6+
- 5.x
7+
paths:
8+
- 'docs/**'
9+
- '.github/**'
10+
pull_request:
11+
paths:
12+
- 'docs/**'
13+
- '.github/**'
14+
15+
jobs:
16+
validate:
17+
uses: cakephp/.github/.github/workflows/docs-validation.yml@5.x
18+
with:
19+
docs-path: 'docs'
20+
vitepress-path: 'docs/.vitepress'
21+
enable-config-js-check: true
22+
enable-json-lint: true
23+
enable-toc-check: true
24+
enable-spell-check: true
25+
enable-markdown-lint: true
26+
enable-link-check: true
27+
tools-ref: '5.x'

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ----------------------
22
# 1. Build stage
33
# ----------------------
4-
FROM node:22-alpine AS builder
4+
FROM node:24-alpine AS builder
55

66
# Git is required because docs/package.json pulls a dependency from GitHub.
77
RUN apk add --no-cache git openssh-client
@@ -13,24 +13,24 @@ COPY docs/ ./
1313
RUN npm ci
1414

1515
# Increase max-old-space-size to avoid memory issues during build
16-
ENV NODE_OPTIONS="--max-old-space-size=8192"
16+
#ENV NODE_OPTIONS="--max-old-space-size=8192"
1717

1818
# Build the site.
1919
RUN npm run docs:build
2020

2121
# ----------------------
22-
# 2. Runtime stage (nginx)
22+
# 2. Runtime stage (angie)
2323
# ----------------------
24-
FROM nginx:1.27-alpine AS runner
24+
FROM docker.angie.software/angie:latest AS runner
2525

2626
# Copy built files
27-
COPY --from=builder /app/docs/.vitepress/dist /usr/share/nginx/html
27+
COPY --from=builder /app/docs/.vitepress/dist /usr/share/angie/html
2828

2929
# Expose port
3030
EXPOSE 80
3131

3232
# Health check (optional)
3333
HEALTHCHECK CMD wget --quiet --tries=1 --spider http://localhost:80/ || exit 1
3434

35-
# Start nginx
36-
CMD ["nginx", "-g", "daemon off;"]
35+
# Start angie
36+
CMD ["angie", "-g", "daemon off;"]

docs/.vitepress/config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ export default {
2828
hostname: "https://book.cakephp.org/migrations/5/",
2929
},
3030
themeConfig: {
31+
siteTitle: false,
32+
pluginName: "Migrations",
3133
socialLinks: [
3234
{ icon: "github", link: "https://github.com/cakephp/cakephp" },
3335
],

docs/en/executing-queries.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Queries can be executed with the `execute()` and `query()` methods. The
77
accept an optional second parameter `$params` which is an array of elements,
88
and if used will cause the underlying connection to use a prepared statement:
99

10-
``` php
10+
```php
1111
<?php
1212

1313
use Migrations\BaseMigration;
@@ -48,7 +48,7 @@ There are two methods available to fetch rows. The `fetchRow()` method will
4848
fetch a single row, whilst the `fetchAll()` method will return multiple rows.
4949
Both methods accept raw SQL as their only parameter:
5050

51-
``` php
51+
```php
5252
<?php
5353

5454
use Migrations\BaseMigration;
@@ -83,7 +83,7 @@ Migrations makes it easy to insert data into your tables. Whilst this feature is
8383
intended for the [seed feature](seeding), you are also free to use the
8484
insert methods in your migrations:
8585

86-
``` php
86+
```php
8787
<?php
8888

8989
use Migrations\BaseMigration;

0 commit comments

Comments
 (0)