Browse Source

Merge pull request #5182 from bcrowe/3.0-unused-vars

3.0 - Removed unused variables
Mark S. 11 years ago
parent
commit
1ce5787d50

+ 0 - 4
src/Datasource/ConnectionRegistry.php

@@ -68,10 +68,6 @@ class ConnectionRegistry extends ObjectRegistry {
  * @return object A connection with the correct settings.
  */
 	protected function _create($class, $alias, $settings) {
-		if (is_object($class)) {
-			$instance = $class;
-		}
-
 		unset($settings['className']);
 		return new $class($settings);
 	}

+ 1 - 1
src/ORM/Association/SelectableAssociationTrait.php

@@ -134,7 +134,7 @@ trait SelectableAssociationTrait {
  * @return \Cake\ORM\Query
  */
 	public function _addFilteringJoin($query, $key, $subquery) {
-		$filter = $fields = [];
+		$filter = [];
 		$aliasedTable = $subquery->repository()->alias();
 
 		foreach ($subquery->clause('select') as $aliasedField => $field) {