Browse Source

Add missing type hints.

Ber Clausen 12 years ago
parent
commit
ed142d8c89
1 changed files with 4 additions and 3 deletions
  1. 4 3
      lib/Cake/Model/Datasource/DboSource.php

+ 4 - 3
lib/Cake/Model/Datasource/DboSource.php

@@ -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']),