Skip to content

Commit

Permalink
Update typos in docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Mar 3, 2014
1 parent faa31cf commit 7a25d23
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/Datasource/RepositoryInterface.php
Expand Up @@ -171,7 +171,7 @@ public function newEntities(array $data, $associations = null);


/** /**
* Merges the passed `$data` into `$entity` respecting the accessible * Merges the passed `$data` into `$entity` respecting the accessible
* fields as configured for it. Returns the same entity after being * fields configured on the entity. Returns the same entity after being
* altered. * altered.
* *
* This is most useful when editing an existing entity using request data: * This is most useful when editing an existing entity using request data:
Expand All @@ -189,8 +189,8 @@ public function newEntities(array $data, $associations = null);
public function patchEntity(EntityInterface $entity, array $data, $associations = null); public function patchEntity(EntityInterface $entity, array $data, $associations = null);


/** /**
* Merges the each for the elements passed in `$data` into each of the entities * Merges each of the elements passed in `$data` into the entities
* found in `$entities` respecting the accessible fields as configured for it. * found in `$entities` respecting the accessible fields configured on the entities.
* Merging is done by matching the primary key in each of the elements in `$data` * Merging is done by matching the primary key in each of the elements in `$data`
* and `$entities`. * and `$entities`.
* *
Expand Down
8 changes: 4 additions & 4 deletions src/ORM/Marshaller.php
Expand Up @@ -220,8 +220,8 @@ protected function _loadBelongsToMany($assoc, $ids) {


/** /**
* Merges `$data` into `$entity` and recursively does the same for each one of * Merges `$data` into `$entity` and recursively does the same for each one of
* the association names passed in `$include`. When merging association, if an * the association names passed in `$include`. When merging associations, if an
* entity is not present in the parent entity for such association, a new one * entity is not present in the parent entity for a given association, a new one
* will be created. * will be created.
* *
* When merging HasMany or BelongsToMany associations, all the entities in the * When merging HasMany or BelongsToMany associations, all the entities in the
Expand Down Expand Up @@ -262,11 +262,11 @@ public function merge(EntityInterface $entity, array $data, $include = []) {
/** /**
* Merges each of the elements from `$data` into each of the entities in `$entities * Merges each of the elements from `$data` into each of the entities in `$entities
* and recursively does the same for each one of the association names passed in * and recursively does the same for each one of the association names passed in
* `$include`. When merging association, if an entity is not present in the parent * `$include`. When merging associations, if an entity is not present in the parent
* entity for such association, a new one will be created. * entity for such association, a new one will be created.
* *
* Records in `$data` are matched against the entities by using the primary key * Records in `$data` are matched against the entities by using the primary key
* column. Those entries in `$entities` that cannot be matched to any record in * column. Entries in `$entities` that cannot be matched to any record in
* `$data` will be discarded. Records in `$data` that could not be matched will * `$data` will be discarded. Records in `$data` that could not be matched will
* be marshalled as a new entity. * be marshalled as a new entity.
* *
Expand Down

0 comments on commit 7a25d23

Please sign in to comment.