adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add missing type hints.

Browse source
This commit is contained in:
Ber Clausen 2013-11-12 03:42:17 -03:00
parent 0e74a0757a
commit ed142d8c89
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Cake/Model/Datasource/DboSource.php
View file

@ -1208,7 +1208,7 @@ class DboSource extends DataSource {
* @return mixed
* @throws CakeException when results cannot be created.
*/
public function queryAssociation(Model $Model, &$LinkModel, $type, $association, $assocData, &$queryData, $external, &$resultSet, $recursive, $stack) {
public function queryAssociation(Model $Model, Model $LinkModel, $type, $association, $assocData, &$queryData, $external, &$resultSet, $recursive, $stack) {
if (isset($stack['_joined'])) {
$joined = $stack['_joined'];
unset($stack['_joined']);
@ -1299,7 +1299,6 @@ class DboSource extends DataSource {
if ($type !== 'hasAndBelongsToMany') {
$q = $this->insertQueryData($query, $row, $association, $Model, $stack);
$fetch = null;
if ($q !== false) {
$joinedData = array();
@ -1581,7 +1580,7 @@ class DboSource extends DataSource {
* @return mixed
* True. when $external is false and association $type is 'hasOne' or 'belongsTo'.
*/
public function generateAssociationQuery(Model $Model, $LinkModel, $type, $association, $assocData, &$queryData, $external) {
public function generateAssociationQuery(Model $Model, Model $LinkModel, $type, $association, $assocData, &$queryData, $external) {
$assocData = $this->_scrubQueryData($assocData);
if ($external && !empty($assocData['finderQuery'])) {
@ -1789,6 +1788,7 @@ class DboSource extends DataSource {
*/
public function buildStatement($query, $model) {
$query = array_merge($this->_queryDefaults, $query);
if (!empty($query['joins'])) {
$count = count($query['joins']);
for ($i = 0; $i < $count; $i++) {
@ -1797,6 +1797,7 @@ class DboSource extends DataSource {
}
}
}
return $this->renderStatement('select', array(
'conditions' => $this->conditions($query['conditions'], true, true, $model),
'fields' => implode(', ', $query['fields']),