Skip to content

Commit 4796728

Browse files
authored
Merge pull request #16826 from niden-code/T16825-doctypes
Fixing docblocks
2 parents 5156538 + 77bb923 commit 4796728

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

CHANGELOG-5.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
- Fixed `Phalcon\Events\ManagerInterface` adding priority property [#16817](https://github.com/phalcon/cphalcon/issues/16817)
3333
- Fixed `Phalcon\Storage\Adapters\Libmemcached::getAdapter()` to correctly merge adapter options [#16818](https://github.com/phalcon/cphalcon/issues/16818)
3434
- Fixed `Phalcon\Encryption\Crypt` method `checkCipherHashIsAvailable(string $cipher, string $type)` to correctly check the `cipher` or `hash` type [#16822](https://github.com/phalcon/cphalcon/issues/16822)
35+
- Fixed `Phalcon\Mvc\Model` docblocks [#16825](https://github.com/phalcon/cphalcon/issues/16825)
3536

3637
### Removed
3738

phalcon/Mvc/Model.zep

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
963963
if metaData === null {
964964
let metaData = instance->getModelsMetaData();
965965
}
966-
966+
967967
let reverseMap = metaData->getReverseColumnMap(instance);
968968
if !fetch attribute, reverseMap[key] {
969969
if unlikely !globals_get("orm.ignore_unknown_columns") {
@@ -1636,7 +1636,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
16361636
* 'limit' => 10,
16371637
* 'offset' => 5,
16381638
* 'group' => 'name, status',
1639-
* 'for_updated' => false,
1639+
* 'for_update' => false,
16401640
* 'shared_lock' => false,
16411641
* 'cache' => [
16421642
* 'lifetime' => 3600,
@@ -1754,7 +1754,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
17541754
* 'limit' => 10,
17551755
* 'offset' => 5,
17561756
* 'group' => 'name, status',
1757-
* 'for_updated' => false,
1757+
* 'for_update' => false,
17581758
* 'shared_lock' => false,
17591759
* 'cache' => [
17601760
* 'lifetime' => 3600,
@@ -5435,7 +5435,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
54355435
* 'limit' => 10,
54365436
* 'offset' => 5,
54375437
* 'group' => 'name, status',
5438-
* 'for_updated' => false,
5438+
* 'for_update' => false,
54395439
* 'shared_lock' => false,
54405440
* 'cache' => [
54415441
* 'lifetime' => 3600,
@@ -5547,7 +5547,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
55475547
* 'limit' => 10,
55485548
* 'offset' => 5,
55495549
* 'group' => 'name, status',
5550-
* 'for_updated' => false,
5550+
* 'for_update' => false,
55515551
* 'shared_lock' => false,
55525552
* 'cache' => [
55535553
* 'lifetime' => 3600,
@@ -5613,7 +5613,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
56135613
* 'limit' => 10,
56145614
* 'offset' => 5,
56155615
* 'group' => 'name, status',
5616-
* 'for_updated' => false,
5616+
* 'for_update' => false,
56175617
* 'shared_lock' => false,
56185618
* 'cache' => [
56195619
* 'lifetime' => 3600,
@@ -5679,7 +5679,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
56795679
* 'limit' => 10,
56805680
* 'offset' => 5,
56815681
* 'group' => 'name, status',
5682-
* 'for_updated' => false,
5682+
* 'for_update' => false,
56835683
* 'shared_lock' => false,
56845684
* 'cache' => [
56855685
* 'lifetime' => 3600,

0 commit comments

Comments
 (0)