Skip to content
Permalink
Browse files

Fixed some typos in docblocks

  • Loading branch information...
lorenzo committed Jul 12, 2014
1 parent 111c833 commit eb03ec95d53d4d3849c556d891ffb69ba63a828f
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/ORM/Marshaller.php
@@ -85,7 +85,7 @@ protected function _buildPropertyMap($options) {
* ### Options:
*
* * associated: Associations listed here will be marshalled as well.
* * fiedlList: A whitelist of fields to be assigened to th entity, if not present
* * fiedlList: A whitelist of fields to be assigned to the entity. If not present,
* the accessible fields list in the entity will be used.
*
* @param array $data The data to hydrate.
@@ -160,7 +160,7 @@ protected function _marshalAssociation($assoc, $value, $options) {
* ### Options:
*
* * associated: Associations listed here will be marshalled as well.
* * fiedlList: A whitelist of fields to be assigened to th entity, if not present
* * fiedlList: A whitelist of fields to be assigned to the entity. If not present,
* the accessible fields list in the entity will be used.
*
* @param array $data The data to hydrate.
@@ -252,7 +252,7 @@ protected function _loadBelongsToMany($assoc, $ids) {
* ### Options:
*
* * associated: Associations listed here will be marshalled as well.
* * fiedlList: A whitelist of fields to be assigened to th entity, if not present
* * fiedlList: A whitelist of fields to be assigned to the entity. If not present
* the accessible fields list in the entity will be used.
*
* @param \Cake\Datasource\EntityInterface $entity the entity that will get the
@@ -321,7 +321,7 @@ public function merge(EntityInterface $entity, array $data, array $options = [])
* ### Options:
*
* * associated: Associations listed here will be marshalled as well.
* * fiedlList: A whitelist of fields to be assigened to th entity, if not present
* * fiedlList: A whitelist of fields to be assigned to the entity. If not present,
* the accessible fields list in the entity will be used.
*
* @param array|\Traversable $entities the entities that will get the

0 comments on commit eb03ec9

Please sign in to comment.
You can’t perform that action at this time.