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 docs/en/appendices/5-0-upgrade-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Once your application is running on latest CakePHP 4.x, enable deprecation warni
``` php
'Error' => [
'errorLevel' => E_ALL,
]
],
```

Now that you can see all the warnings, make sure these are fixed before proceeding with the upgrade.
Expand Down
2 changes: 1 addition & 1 deletion docs/en/contributing/backwards-compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ value:
// ...
'Error' => [
'errorLevel' => E_ALL ^ E_USER_DEPRECATED,
]
],
// ...
```

Expand Down
2 changes: 1 addition & 1 deletion docs/en/core-libraries/email.md
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ TransportFactory::setConfig('gmail', [
'port' => 465,
'username' => 'my@gmail.com',
'password' => 'secret',
'className' => 'Smtp'
'className' => 'Smtp',
]);
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ The default locale can be set in your **config/app.php** file by setting
...
'defaultLocale' => env('APP_DEFAULT_LOCALE', 'en_US'),
...
]
],
```

This will control several aspects of the application, including the default
Expand Down
2 changes: 1 addition & 1 deletion docs/en/core-libraries/xml.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Examples of invalid arrays:
// Multiple keys in top level
[
'key1' => 'first value',
'key2' => 'other value'
'key2' => 'other value',
];
```

Expand Down
2 changes: 1 addition & 1 deletion docs/en/development/debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ additional editor formats if required during application bootstrap:

``` php
// Generate links for vscode.
Debugger::setEditor('vscode')
Debugger::setEditor('vscode');

// Add a custom format
// Format strings will have the {file} and {line}
Expand Down
2 changes: 1 addition & 1 deletion docs/en/development/routing.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ syntax:

Some example string targets are:

``` php
``` text
// Application controller
'Articles::view'

Expand Down
4 changes: 2 additions & 2 deletions docs/en/development/sessions.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ If you need to use a database to store your session data, configure as follows:

``` php
'Session' => [
'defaults' => 'database'
'defaults' => 'database',
]
```

Expand Down Expand Up @@ -354,7 +354,7 @@ In **config/app.php** make the session block look like:
],
// Make sure to add a apc cache config
'Cache' => [
'apc' => ['engine' => 'Apc']
'apc' => ['engine' => 'Apc'],
]
```

Expand Down
60 changes: 30 additions & 30 deletions docs/en/development/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -475,36 +475,36 @@ An example table would be:

``` php
return [
'articles' => [
'columns' => [
'id' => [
'type' => 'integer',
],
'author_id' => [
'type' => 'integer',
'null' => true,
],
'title' => [
'type' => 'string',
'null' => true,
],
'body' => 'text',
'published' => [
'type' => 'string',
'length' => 1,
'default' => 'N',
],
],
'constraints' => [
'primary' => [
'type' => 'primary',
'columns' => [
'id',
],
],
],
],
// More tables
'articles' => [
'columns' => [
'id' => [
'type' => 'integer',
],
'author_id' => [
'type' => 'integer',
'null' => true,
],
'title' => [
'type' => 'string',
'null' => true,
],
'body' => 'text',
'published' => [
'type' => 'string',
'length' => 1,
'default' => 'N',
],
],
'constraints' => [
'primary' => [
'type' => 'primary',
'columns' => [
'id',
],
],
],
],
// More tables
];
```

Expand Down
4 changes: 2 additions & 2 deletions docs/en/orm/behaviors/counter-cache.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ First, you need to add the `through` and `cascadeCallbacks` options to the
`belongsToMany` association:

``` php
'through' => 'CommentsArticles',
'cascadeCallbacks' => true
'through' => 'CommentsArticles',
'cascadeCallbacks' => true,
```

Also see [Using The Through Option](../../orm/associations#using-the-through-option) how to configure a custom join table.
Expand Down
4 changes: 2 additions & 2 deletions docs/en/orm/database-basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ for both:
],
'write' => [
'host' => 'write-db.example.com',
]
],
];
```

Expand Down Expand Up @@ -1207,7 +1207,7 @@ datasource configuration:

// Use the 'orm_metadata' cache config for metadata.
'cacheMetadata' => 'orm_metadata',
]
],
],
```

Expand Down
2 changes: 1 addition & 1 deletion docs/en/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ because we don't have a Contact model defined yet.
If your application includes the default routing CakePHP provides you will be
able to access your plugin controllers using URLs like:

``` php
``` text
// Access the index route of a plugin controller.
/contact-manager/contacts

Expand Down