From eb03ec95d53d4d3849c556d891ffb69ba63a828f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Lorenzo=20Rodr=C3=ADguez?= Date: Sat, 12 Jul 2014 14:12:50 +0200 Subject: [PATCH] Fixed some typos in docblocks --- src/ORM/Marshaller.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php index 5d0cbeea735..639b6d55005 100644 --- a/src/ORM/Marshaller.php +++ b/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