Skip to content
Closed
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-migration-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ CakePHP 5 leverages the expanded type system feature available in PHP 8.1+.
CakePHP also uses `assert()` to provide improved error messages and additional
type soundness. In production mode, you can configure PHP to not generate
code for `assert()` yielding improved application performance. See the
[Symlink Assets](../deployment#symlink-assets) for how to do this.
[Symlink Assets](../deployment#moving-files) for how to do this.

### Collection

Expand Down
2 changes: 1 addition & 1 deletion docs/en/appendices/5-1-migration-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ bin/cake upgrade rector --rules cakephp51 <path/to/app/src>
a typesafe way to cast request data or other input and return `null` when conversion fails.
- `pathCombine()` was added to help build paths without worrying about duplicate and trailing slashes.
- A new `events` hook was added to the `BaseApplication` as well as the `BasePlugin` class. This hook
is the recommended way to register global event listeners for you application. See [Registering Listeners](../core-libraries/events#registering-event-listeners)
is the recommended way to register global event listeners for you application. See [Registering Listeners](../core-libraries/events#registering-listeners)

### Database

Expand Down
2 changes: 1 addition & 1 deletion docs/en/appendices/5-2-migration-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ bin/cake upgrade rector --rules cakephp52 <path/to/app/src>

- The `errorClass` option of `FormHelper` has been deprecated in favour of
using a template string. To upgrade move your `errorClass` definition to
a template set. See [Customizing Templates](../views/helpers/form#customizing-templates).
a template set. See [Customizing Templates](../views/helpers/form#customizing-the-templates-formhelper-uses).

## New Features

Expand Down
4 changes: 2 additions & 2 deletions docs/en/appendices/5-3-migration-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ If you are not running on **PHP 8.2 or higher**, you will need to upgrade PHP be
### Core

- Added `Configure` attribute to support injecting `Configure` values into
constructor arguments. See [Configure Dependency Injection](../development/dependency-injection#configure-dependency-injection).
constructor arguments. See [Configure Dependency Injection](../development/dependency-injection#using-configuration-data).

### Database

Expand Down Expand Up @@ -174,7 +174,7 @@ If you are not running on **PHP 8.2 or higher**, you will need to upgrade PHP be
- Added `SelectQuery::projectAs()` for projecting query results into Data
Transfer Objects (DTOs) instead of Entity objects. DTOs provide a
memory-efficient alternative (approximately 3x less memory than entities) for
read-only data access. See [Dto Projection](../orm/query-builder#dto-projection).
read-only data access. See [Dto Projection](../orm/query-builder#projecting-results-into-dtos).
- Added the `#[CollectionOf]` attribute for declaring the element type of
array properties in DTOs. This enables proper hydration of nested
associations into DTOs.
Expand Down
2 changes: 1 addition & 1 deletion docs/en/console-commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class Application extends BaseApplication
```

In the above example, the only commands available would be `help`, `version`
and `user`. See the [Plugin Commands](plugins#plugin-commands) section for how to add commands in
and `user`. See the [Plugin Commands](plugins#commands) section for how to add commands in
your plugins.

> [!NOTE]
Expand Down
2 changes: 1 addition & 1 deletion docs/en/contributing/code.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ to date with CakePHP:
git remote add upstream git://github.com/cakephp/cakephp.git

Now that you have CakePHP setup you should be able to define a `$test`
[database connection](../orm/database-basics#database-configuration), and
[database connection](../orm/database-basics#configuration), and
[run all the tests](../development/testing#running-tests).

## Working on a Patch
Expand Down
10 changes: 5 additions & 5 deletions docs/en/controllers.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ class AppController extends Controller

When a request is made to a CakePHP application, CakePHP's
`Cake\Routing\Router` and `Cake\Routing\Dispatcher`
classes use [Routes Configuration](development/routing#routes-configuration) to find and create the correct
classes use [Routes Configuration](development/routing#connecting-routes) to find and create the correct
controller instance. The request data is encapsulated in a request object.
CakePHP puts all the important request information into the `$this->request`
property. See the section on [Cake Request](controllers/request-response#cake-request) for more information on the
property. See the section on [Cake Request](controllers/request-response#request) for more information on the
CakePHP request object.

## Controller Actions
Expand Down Expand Up @@ -319,7 +319,7 @@ This would render **plugins/Users/templates/UserDetails/custom_file.php**

Controllers can define a list of view classes they support. After the
controller's action is complete CakePHP will use the view list to perform
content-type negotiation with either [File Extensions](development/routing#file-extensions) or `Accept`
content-type negotiation with either [File Extensions](development/routing#routing-file-extensions) or `Accept`
headers. This enables your application to re-use the same controller action to
render an HTML view or render a JSON or XML response. To define the list of
supported view classes for a controller is done with the `addViewClasses()`
Expand Down Expand Up @@ -359,7 +359,7 @@ public function export(): void

If within your controller actions you need to process the request or load data
differently based on the content type you can use
[Check The Request](controllers/request-response#check-the-request):
[Check The Request](controllers/request-response#checking-request-conditions):

``` php
// In a controller action
Expand Down Expand Up @@ -482,7 +482,7 @@ return $this->redirect('/order/confirm', 301);
return $this->redirect('/order/confirm', 303);
```

See the [Redirect Component Events](controllers/components#redirect-component-events) section for how to redirect out of
See the [Redirect Component Events](controllers/components#using-redirects-in-component-events) section for how to redirect out of
a life-cycle handler.

## Loading Additional Tables/Models
Expand Down
4 changes: 2 additions & 2 deletions docs/en/controllers/pagination.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ArticlesController extends AppController
> [!TIP]
> Default `order` options must be defined as an array.

You can also use [Custom Find Methods](../orm/retrieving-data-and-resultsets#custom-find-methods) in pagination by using the `finder` option:
You can also use [Custom Find Methods](../orm/retrieving-data-and-resultsets#custom-finder-methods) in pagination by using the `finder` option:

``` php
class ArticlesController extends AppController
Expand Down Expand Up @@ -166,7 +166,7 @@ paginate both tags and articles at the same time:

/dashboard?article[page]=1&tag[page]=3

See the [Paginator Helper Multiple](../views/helpers/paginator#paginator-helper-multiple) section for how to generate scoped HTML
See the [Paginator Helper Multiple](../views/helpers/paginator#paginating-multiple-results) section for how to generate scoped HTML
elements and URLs for pagination.

### Paginating the Same Model multiple Times
Expand Down
2 changes: 1 addition & 1 deletion docs/en/controllers/request-response.md
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ $this->response = $this->response->withType('vcf');

Usually, you'll want to map additional content types in your controller's
`~Controller::beforeFilter()` callback, so you can benefit from
automatic view switching provided by [Controller Viewclasses](../controllers#controller-viewclasses).
automatic view switching provided by [Controller Viewclasses](../controllers#content-type-negotiation).

<a id="cake-response-file"></a>

Expand Down
4 changes: 2 additions & 2 deletions docs/en/core-libraries/caching.md
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ of trips made to the database to fetch posts.
> [!NOTE]
> If you plan to cache the result of queries made with the CakePHP ORM,
> it is better to use the built-in cache capabilities of the Query object
> as described in the [Caching Query Results](../orm/query-builder#caching-query-results) section
> as described in the [Caching Query Results](../orm/query-builder#caching-loaded-results) section

### Cache::writeMany()

Expand Down Expand Up @@ -541,7 +541,7 @@ You can greatly improve the performance of your application by putting results
that infrequently change, or that are subject to heavy reads into the cache.
A perfect example of this are the results from
`Cake\ORM\Table::find()`. The Query object allows you to cache
results using the `cache()` method. See the [Caching Query Results](../orm/query-builder#caching-query-results) section
results using the `cache()` method. See the [Caching Query Results](../orm/query-builder#caching-loaded-results) section
for more information.

<a id="cache-groups"></a>
Expand Down
6 changes: 3 additions & 3 deletions docs/en/core-libraries/email.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ following configuration keys are used:
variables to be used in the view. See `Mailer::setViewVars()`.
- `'attachments'`: List of files to attach. See `Mailer::setAttachments()`.
- `'emailFormat'`: Format of email (html, text or both). See `Mailer::setEmailFormat()`.
- `'transport'`: Transport configuration name. See [Email Transport](#email-transport).
- `'transport'`: Transport configuration name. See [Email Transport](#configuring-transports).
- `'log'`: Log level to log the email headers and message. `true` will use
LOG_DEBUG. See [Logging Levels](../core-libraries/logging#logging-levels). Note that logs will be emitted under the scope named `email`.
LOG_DEBUG. See [Logging Levels](../core-libraries/logging#using-levels). Note that logs will be emitted under the scope named `email`.
See also [Logging Scopes](../core-libraries/logging#logging-scopes).
- `'helpers'`: Array of helpers used in the email template.
`ViewBuilder::setHelpers()`/`ViewBuilder::addHelpers()`.
Expand Down Expand Up @@ -441,7 +441,7 @@ $this->Users->getEventManager()->on($this->getMailer('User'));

> [!NOTE]
> For information on how to register event listener objects,
> please refer to the [Registering Event Listeners](../core-libraries/events#registering-event-listeners) documentation.
> please refer to the [Registering Event Listeners](../core-libraries/events#registering-listeners) documentation.

<a id="email-transport"></a>

Expand Down
4 changes: 2 additions & 2 deletions docs/en/core-libraries/events.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ There are a number of core events within the framework which your application
can listen to. Each layer of CakePHP emits events that you can use in your
application.

- [ORM/Model events](../orm/table-objects#table-callbacks)
- [Controller events](../controllers#controller-life-cycle)
- [ORM/Model events](../orm/table-objects#lifecycle-callbacks)
- [Controller events](../controllers#request-life-cycle-callbacks)
- [View events](../views#view-events)

### `Server.terminate`
Expand Down
4 changes: 2 additions & 2 deletions docs/en/core-libraries/httpclient.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ addition request information. The following keys can be used in `$options`:

The options parameter is always the 3rd parameter in each of the HTTP methods.
They can also be used when constructing `Client` to create
[scoped clients](#http_client_scoped_client).
[scoped clients](#creating-scoped-clients).

## Authentication

Expand Down Expand Up @@ -330,7 +330,7 @@ $response = $http->get('http://foo.com/test.php');

The above will replace the domain, scheme, and port. However, this request will
continue using all the other options defined when the scoped client was created.
See [Http Client Request Options](#http_client_request_options) for more information on the options
See [Http Client Request Options](#request-method-options) for more information on the options
supported.

## Setting and Managing Cookies
Expand Down
4 changes: 2 additions & 2 deletions docs/en/core-libraries/logging.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Log::setConfig('error', [
The above creates three loggers, named `info`, `debug` and `error`.
Each is configured to handle different levels of messages. They also store their
log messages in separate files, so we can separate debug/notice/info logs
from more serious errors. See the section on [Logging Levels](#logging-levels) for more
from more serious errors. See the section on [Logging Levels](#using-levels) for more
information on the different levels and what they mean.

Once a configuration is created you cannot change it. Instead you should drop
Expand Down Expand Up @@ -454,7 +454,7 @@ param array `$config`
Array of configuration information and
constructor arguments for the logger.

Get or set the configuration for a Logger. See [Log Configuration](#log-configuration) for
Get or set the configuration for a Logger. See [Log Configuration](#logging-configuration) for
more information.

### Log::configured()
Expand Down
2 changes: 1 addition & 1 deletion docs/en/core-libraries/time.md
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ It wraps the `Cake\Chronos\ChronosTime` class.
## Accepting Localized Request Data

When creating text inputs that manipulate dates, you'll probably want to accept
and parse localized datetime strings. See the [Parsing Localized Dates](../core-libraries/internationalization-and-localization#parsing-localized-dates).
and parse localized datetime strings. See the [Parsing Localized Dates](../core-libraries/internationalization-and-localization#parsing-localized-datetime-data).

## Supported Timezones

Expand Down
6 changes: 3 additions & 3 deletions docs/en/core-libraries/validation.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ containing data related to the validation process:

Closures should return boolean true if the validation passes. If it fails,
return boolean false or for a custom error message return a string, see the
[Conditional/Dynamic Error Messages](#dynamic_validation_error_messages)
[Conditional/Dynamic Error Messages](#conditionaldynamic-error-messages)
section for further details.

::: info Changed in version 5.3.0
Expand All @@ -212,7 +212,7 @@ The `entity` key was added to validation context.

### Conditional/Dynamic Error Messages

Validation rule methods, being it [custom callables](#custom-validation-rules),
Validation rule methods, being it [custom callables](#using-custom-validation-rules),
or [methods supplied by providers](#adding-validation-providers), can either
return a boolean, indicating whether the validation succeeded, or they can return
a string, which means that the validation failed, and that the returned string
Expand Down Expand Up @@ -639,7 +639,7 @@ $valid = $this->Articles->newEntity($article, [
Apart from validating user provided data maintaining integrity of data regardless
where it came from is important. To solve this problem CakePHP offers a second
level of validation which is called "application rules". You can read more about
them in the [Applying Application Rules](../orm/validation#application-rules) section.
them in the [Applying Application Rules](../orm/validation#applying-application-rules) section.

## Core Validation Rules

Expand Down
2 changes: 1 addition & 1 deletion docs/en/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ variables.
If you're throwing your application out into the wild, it's a good idea to make
sure it doesn't have any obvious leaks:

- Ensure you are using the [Csrf Middleware](security/csrf#csrf-middleware) component or middleware.
- Ensure you are using the [Csrf Middleware](security/csrf#cross-site-request-forgery-csrf-middleware) component or middleware.
- You may want to enable the [Form Protection Component](controllers/components/form-protection) component.
It can help prevent several types of form tampering and reduce the possibility
of mass-assignment issues.
Expand Down
2 changes: 1 addition & 1 deletion docs/en/development/application.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ class Application extends BaseApplication
```

Loading plugins and events in `Application::bootstrap()` makes
[Integration Testing](../development/testing#integration-testing) easier as events and routes will be re-processed on
[Integration Testing](../development/testing#controller-integration-testing) easier as events and routes will be re-processed on
each test method.
14 changes: 7 additions & 7 deletions docs/en/development/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ of paths for plugins, view templates and locale files respectively.
App.uploadedFilesAsObjects
Defines whether uploaded files are being represented as objects (`true`),
or arrays (`false`). This option is being treated as enabled by default.
See the [File Uploads section](../controllers/request-response#request-file-uploads) in the Request &
See the [File Uploads section](../controllers/request-response#file-uploads) in the Request &
Response Objects chapter for more information.

Security.salt
Expand Down Expand Up @@ -192,27 +192,27 @@ If you set `App.imageBaseUrl` to `https://mycdn.example.com/`:

### Database Configuration

See the [Database Configuration](../orm/database-basics#database-configuration) for information
See the [Database Configuration](../orm/database-basics#configuration) for information
on configuring your database connections.

### Caching Configuration

See the [Caching Configuration](../core-libraries/caching#cache-configuration) for information on
See the [Caching Configuration](../core-libraries/caching#configuring-cache-engines) for information on
configuring caching in CakePHP.

### Error and Exception Handling Configuration

See the [Error and Exception Configuration](../development/errors#error-configuration) for
See the [Error and Exception Configuration](../development/errors#configuration) for
information on configuring error and exception handlers.

### Logging Configuration

See the [Log Configuration](../core-libraries/logging#log-configuration) for information on configuring logging in
See the [Log Configuration](../core-libraries/logging#logging-configuration) for information on configuring logging in
CakePHP.

### Email Configuration

See the [Email Configuration](../core-libraries/email#email-configuration) for information on
See the [Email Configuration](../core-libraries/email#configuration) for information on
configuring email presets in CakePHP.

### Session Configuration
Expand All @@ -222,7 +222,7 @@ handling in CakePHP.

### Routing configuration

See the [Routes Configuration](../development/routing#routes-configuration) for more information
See the [Routes Configuration](../development/routing#connecting-routes) for more information
on configuring routing and creating routes for your application.

## Additional Class Paths
Expand Down
4 changes: 2 additions & 2 deletions docs/en/development/rest.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ In our `RecipesController`, we have several actions that define the logic
to create, edit, view and delete recipes. In each of our actions we're using
the `serialize` option to tell CakePHP which view variables should be
serialized when making API responses. We'll connect our controller to the
application URLs with [Resource Routes](../development/routing#resource-routes):
application URLs with [Resource Routes](../development/routing#restful-routing):

``` php
// in config/routes.php
Expand Down Expand Up @@ -123,7 +123,7 @@ If we wanted to modify the data before it is converted into JSON we should not
define the `serialize` option, and instead use template files. We would place
the REST templates for our RecipesController inside **templates/Recipes/json**.

See the [Controller Viewclasses](../controllers#controller-viewclasses) for more information on how CakePHP's
See the [Controller Viewclasses](../controllers#content-type-negotiation) for more information on how CakePHP's
response negotiation functionality works.

## Parsing Request Bodies
Expand Down
8 changes: 4 additions & 4 deletions docs/en/development/routing.md
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ will go to the 'update' action. There are HTTP helper methods for:
- HEAD

All of these methods return the route instance allowing you to leverage the
[fluent setters](#route-fluent-methods) to further configure your route.
[fluent setters](#configuring-route-options) to further configure your route.

### Route Elements

Expand Down Expand Up @@ -414,7 +414,7 @@ CakePHP, and should not be used unless you want the special meaning
- `action` Used to name the controller action for a route.
- `plugin` Used to name the plugin a controller is located in.
- `prefix` Used for [Prefix Routing](#prefix-routing)
- `_ext` Used for [File extensions routing](#file-extensions).
- `_ext` Used for [File extensions routing](#routing-file-extensions).
- `_base` Set to `false` to remove the base path from the generated URL. If
your application is not in the root directory, this can be used to generate
URLs that are 'cake relative'.
Expand All @@ -428,7 +428,7 @@ CakePHP, and should not be used unless you want the special meaning
- `_https` Set to `true` to convert the generated URL to https or `false`
to force http. Prior to 4.5.0 use `_ssl`.
- `_method` Define the HTTP verb/method to use. Useful when working with
[Resource Routes](#resource-routes).
[Resource Routes](#restful-routing).
- `_name` Name of route. If you have setup named routes, you can use this key
to specify it.

Expand Down Expand Up @@ -1496,7 +1496,7 @@ $routes->url([

You can also use any of the special route elements when generating URLs:

- `_ext` Used for [File Extensions](#file-extensions) routing.
- `_ext` Used for [File Extensions](#routing-file-extensions) routing.
- `_base` Set to `false` to remove the base path from the generated URL. If
your application is not in the root directory, this can be used to generate
URLs that are 'cake relative'.
Expand Down
Loading