Skip to content

[pull] develop from codeigniter4:develop #534

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

Merged
pull merged 2 commits into from
Jan 7, 2021
Merged

[pull] develop from codeigniter4:develop #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0bb7a7
docs: fix models indentation
kenjis Jan 6, 2021
1cc2c83
Merge pull request #4073 from kenjis/fix-models-indent
paulbalandan Jan 7, 2021
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
4 changes: 2 additions & 2 deletions user_guide_src/source/models/entities.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,8 @@ the value whenever the property is set::
{
protected $casts = [
'options' => 'array',
'options_object' => 'json',
'options_array' => 'json-array',
'options_object' => 'json',
'options_array' => 'json-array',
];
}

Expand Down
30 changes: 15 additions & 15 deletions user_guide_src/source/models/model.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,12 +674,12 @@ Working With Query Builder
You can get access to a shared instance of the Query Builder for that model's database connection any time you
need it::

$builder = $userModel->builder();
$builder = $userModel->builder();

This builder is already set up with the model's $table. If you need access to another table
you can pass it in as a parameter, but be aware that this will not return a shared instance::

$groupBuilder = $userModel->builder('groups');
$groupBuilder = $userModel->builder('groups');

You can also use Query Builder methods and the Model's CRUD methods in the same chained call, allowing for
very elegant use::
Expand Down Expand Up @@ -777,12 +777,12 @@ use the same callback in multiple events::

Additionally, each model may allow (default) or deny callbacks class-wide by setting its $allowCallbacks property::

protected $allowCallbacks = false;
protected $allowCallbacks = false;

You may also change this setting temporarily for a single model call sing the ``allowCallbacks()`` method::

$model->allowCallbacks(false)->find(1); // No callbacks triggered
$model->find(1); // Callbacks subject to original property value
$model->allowCallbacks(false)->find(1); // No callbacks triggered
$model->find(1); // Callbacks subject to original property value

Event Parameters
----------------
Expand Down Expand Up @@ -829,16 +829,16 @@ boolean, ``returnData``::

protected $beforeFind = ['checkCache'];
...
protected function checkCache(array $data)
{
// Check if the requested item is already in our cache
if (isset($data['id']) && $item = $this->getCachedItem($data['id']]))
{
$data['data'] = $item;
$data['returnData'] = true;

return $data;
...
protected function checkCache(array $data)
{
// Check if the requested item is already in our cache
if (isset($data['id']) && $item = $this->getCachedItem($data['id']]))
{
$data['data'] = $item;
$data['returnData'] = true;

return $data;
...

Manual Model Creation
=====================
Expand Down