Skip to content
Permalink
Browse files

Removing ReflectionMethod::setAccessible() from tests, it was limitin…

…g to PHP 5.3.2 or newer.
  • Loading branch information...
renan committed Mar 2, 2012
1 parent c84e25e commit 3412c0cb0fa90217b7a5cd2c786f6170674e2e5d
Showing with 16 additions and 3 deletions.
  1. +16 −3 lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
@@ -1085,14 +1085,27 @@ protected function &_prepareAssociationQuery(Model $model, &$queryData, $binding
$linkModel = $model->{$className};
$external = isset($assocData['external']);
$reflection = new ReflectionMethod($this->Dbo, '_scrubQueryData');
$reflection->setAccessible(true);
$queryData = $reflection->invokeArgs($this->Dbo, array($queryData));
$queryData = $this->_scrubQueryData($queryData);
$result = array_merge(array('linkModel' => &$linkModel), compact('type', 'assoc', 'assocData', 'external'));
return $result;
}
/**
* Helper method copied from DboSource::_scrubQueryData()
*
* @param array $data
* @return array
*/
function _scrubQueryData($data) {
static $base = null;
if ($base === null) {
$base = array_fill_keys(array('conditions', 'fields', 'joins', 'order', 'limit', 'offset', 'group'), array());
$base['callbacks'] = null;
}
return (array)$data + $base;
}
/**
* testGenerateInnerJoinAssociationQuery method
*

0 comments on commit 3412c0c

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