Skip to content
Permalink
Browse files

Fix more doc blocks.

  • Loading branch information...
dereuromark committed Nov 20, 2017
1 parent 9a308f2 commit 817abe04fa3dcbbd194884c17fc54977bfa46375
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/ORM/Marshaller.php
@@ -290,7 +290,7 @@ protected function _prepareDataAndOptions($data, $options)
* @param \Cake\ORM\Association $assoc The association to marshall
* @param array $value The data to hydrate
* @param array $options List of options.
* @return mixed
* @return \Cake\Datasource\EntityInterface|\Cake\Datasource\EntityInterface[]|null
*/
protected function _marshalAssociation($assoc, $value, $options)
{
@@ -715,11 +715,11 @@ public function mergeMany($entities, array $data, array $options = [])
/**
* Creates a new sub-marshaller and merges the associated data.
*
* @param \Cake\Datasource\EntityInterface $original The original entity
* @param \Cake\Datasource\EntityInterface|\Cake\Datasource\EntityInterface[] $original The original entity
* @param \Cake\ORM\Association $assoc The association to merge
* @param array $value The data to hydrate
* @param array $options List of options.
* @return mixed
* @return \Cake\Datasource\EntityInterface|\Cake\Datasource\EntityInterface[]|null
*/
protected function _mergeAssociation($original, $assoc, $value, $options)
{

0 comments on commit 817abe0

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