Skip to content

Commit 38271f4

Browse files
committed
Merge branch '5.x' into 5.next
2 parents 643abc8 + 7a5e20d commit 38271f4

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

.vitepress/config.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import baseConfig from '@cakephp/docs-skeleton/config'
1+
import baseConfig, { substitutionsReplacer } from '@cakephp/docs-skeleton/config'
22

33
import { createRequire } from "module";
44
const require = createRequire(import.meta.url);
@@ -19,9 +19,21 @@ const versions = {
1919
],
2020
};
2121

22+
const substitutions = {
23+
'|phpversion|': { value: '8.5', format: 'bold' },
24+
'|minphpversion|': { value: '8.2', format: 'italic' },
25+
'|cakeversion|': '5.4.0',
26+
'|cakefullversion|': 'CakePHP 5.next',
27+
};
28+
2229
// This file contains overrides for .vitepress/config.js
2330
export default {
2431
extends: baseConfig,
32+
markdown: {
33+
config(md) {
34+
md.use(substitutionsReplacer, { substitutions });
35+
}
36+
},
2537
base: "/5.next/",
2638
rewrites: {
2739
"en/:slug*": ":slug*",
@@ -50,12 +62,6 @@ export default {
5062
linkText: 'Go to latest docs.'
5163
}
5264
},
53-
substitutions: {
54-
'|phpversion|': { value: '8.5', format: 'bold' },
55-
'|minphpversion|': { value: '8.2', format: 'italic' },
56-
'|cakeversion|': '5.4.0',
57-
'|cakefullversion|': 'CakePHP 5.next',
58-
},
5965
locales: {
6066
root: {
6167
label: "English",

docs/ja/development/dependency-injection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class BillingServiceProvider extends ServiceProvider
211211

212212
public function services(ContainerInterface $container): void
213213
{
214-
$container->add(StripService::class);
214+
$container->add(StripeService::class);
215215
$container->add('configKey', 'some value');
216216
}
217217
}

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)