reginaldojunior / winners

lib/Cake/Log/Engine/SyslogLog.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
  * @return boolean success of write.
  */
 	public function write($type, $message) {
-		if (!$this->_open) {
+		if ( ! $this->_open) {
 			$config = $this->_config;
 			$this->_open($config['prefix'], $config['flag'], $config['facility']);
 			$this->_open = true;

lib/Cake/Log/LogEngineCollection.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 		unset($options['engine']);
 		$className = $this->_getLogger($loggerName);
 		$logger = new $className($options);
-		if (!$logger instanceof CakeLogInterface) {
+		if ( ! $logger instanceof CakeLogInterface) {
 			throw new CakeLogException(
 				__d('cake_dev', 'logger class %s does not implement a %s method.', $loggerName, 'write()')
 			);
@@ -64,8 +64,8 @@ 
 		if (substr($loggerName, -3) !== 'Log') {
 			$loggerName .= 'Log';
 		}
-		App::uses($loggerName, $plugin . 'Log/Engine');
-		if (!class_exists($loggerName)) {
+		App::uses($loggerName, $plugin.'Log/Engine');
+		if ( ! class_exists($loggerName)) {
 			throw new CakeLogException(__d('cake_dev', 'Could not load class %s', $loggerName));
 		}
 		return $loggerName;

lib/Cake/Model/AclNode.php

Spacing +17 added lines, -17 removed lines

@@ -63,7 +63,7 @@ 
 		$type = $this->alias;
 		$result = null;
 
-		if (!empty($this->useTable)) {
+		if ( ! empty($this->useTable)) {
 			$table = $this->useTable;
 		} else {
 			$table = Inflector::pluralize(Inflector::underscore($type));
@@ -78,8 +78,8 @@ 
 
 			$queryData = array(
 				'conditions' => array(
-					$db->name("{$type}.lft") . ' <= ' . $db->name("{$type}0.lft"),
-					$db->name("{$type}.rght") . ' >= ' . $db->name("{$type}0.rght")),
+					$db->name("{$type}.lft").' <= '.$db->name("{$type}0.lft"),
+					$db->name("{$type}.rght").' >= '.$db->name("{$type}0.rght")),
 				'fields' => array('id', 'parent_id', 'model', 'foreign_key', 'alias'),
 				'joins' => array(array(
 					'table' => $table,
@@ -87,7 +87,7 @@ 
 					'type' => 'INNER',
 					'conditions' => array("{$type}0.alias" => $start)
 				)),
-				'order' => $db->name("{$type}.lft") . ' DESC'
+				'order' => $db->name("{$type}.lft").' DESC'
 			);
 
 			foreach ($path as $i => $alias) {
@@ -98,31 +98,31 @@ 
 					'alias' => "{$type}{$i}",
 					'type' => 'INNER',
 					'conditions' => array(
-						$db->name("{$type}{$i}.lft") . ' > ' . $db->name("{$type}{$j}.lft"),
-						$db->name("{$type}{$i}.rght") . ' < ' . $db->name("{$type}{$j}.rght"),
-						$db->name("{$type}{$i}.alias") . ' = ' . $db->value($alias, 'string'),
-						$db->name("{$type}{$j}.id") . ' = ' . $db->name("{$type}{$i}.parent_id")
+						$db->name("{$type}{$i}.lft").' > '.$db->name("{$type}{$j}.lft"),
+						$db->name("{$type}{$i}.rght").' < '.$db->name("{$type}{$j}.rght"),
+						$db->name("{$type}{$i}.alias").' = '.$db->value($alias, 'string'),
+						$db->name("{$type}{$j}.id").' = '.$db->name("{$type}{$i}.parent_id")
 					)
 				);
 
 				$queryData['conditions'] = array('or' => array(
-					$db->name("{$type}.lft") . ' <= ' . $db->name("{$type}0.lft") . ' AND ' . $db->name("{$type}.rght") . ' >= ' . $db->name("{$type}0.rght"),
-					$db->name("{$type}.lft") . ' <= ' . $db->name("{$type}{$i}.lft") . ' AND ' . $db->name("{$type}.rght") . ' >= ' . $db->name("{$type}{$i}.rght"))
+					$db->name("{$type}.lft").' <= '.$db->name("{$type}0.lft").' AND '.$db->name("{$type}.rght").' >= '.$db->name("{$type}0.rght"),
+					$db->name("{$type}.lft").' <= '.$db->name("{$type}{$i}.lft").' AND '.$db->name("{$type}.rght").' >= '.$db->name("{$type}{$i}.rght"))
 				);
 			}
 			$result = $db->read($this, $queryData, -1);
 			$path = array_values($path);
 
 			if (
-				!isset($result[0][$type]) ||
-				(!empty($path) && $result[0][$type]['alias'] != $path[count($path) - 1]) ||
+				! isset($result[0][$type]) ||
+				( ! empty($path) && $result[0][$type]['alias'] != $path[count($path) - 1]) ||
 				(empty($path) && $result[0][$type]['alias'] != $start)
 			) {
 				return false;
 			}
 		} elseif (is_object($ref) && $ref instanceof Model) {
 			$ref = array('model' => $ref->name, 'foreign_key' => $ref->id);
-		} elseif (is_array($ref) && !(isset($ref['model']) && isset($ref['foreign_key']))) {
+		} elseif (is_array($ref) && ! (isset($ref['model']) && isset($ref['foreign_key']))) {
 			$name = key($ref);
 			list(, $alias) = pluginSplit($name);
 
@@ -164,15 +164,15 @@ 
 					'alias' => "{$type}0",
 					'type' => 'INNER',
 					'conditions' => array(
-						$db->name("{$type}.lft") . ' <= ' . $db->name("{$type}0.lft"),
-						$db->name("{$type}.rght") . ' >= ' . $db->name("{$type}0.rght")
+						$db->name("{$type}.lft").' <= '.$db->name("{$type}0.lft"),
+						$db->name("{$type}.rght").' >= '.$db->name("{$type}0.rght")
 					)
 				)),
-				'order' => $db->name("{$type}.lft") . ' DESC'
+				'order' => $db->name("{$type}.lft").' DESC'
 			);
 			$result = $db->read($this, $queryData, -1);
 
-			if (!$result) {
+			if ( ! $result) {
 				throw new CakeException(__d('cake_dev', "AclNode::node() - Couldn't find %s node identified by \"%s\"", $type, print_r($ref, true)));
 			}
 		}

lib/Cake/Model/Behavior/AclBehavior.php

Spacing +7 added lines, -7 removed lines

@@ -56,13 +56,13 @@ 
 
 		$types = $this->_typeMaps[$this->settings[$model->name]['type']];
 
-		if (!is_array($types)) {
+		if ( ! is_array($types)) {
 			$types = array($types);
 		}
 		foreach ($types as $type) {
 			$model->{$type} = ClassRegistry::init($type);
 		}
-		if (!method_exists($model, 'parentNode')) {
+		if ( ! method_exists($model, 'parentNode')) {
 			trigger_error(__d('cake_dev', 'Callback %s not defined in %s', 'parentNode()', $model->alias), E_USER_WARNING);
 		}
 	}
@@ -100,12 +100,12 @@ 
  */
 	public function afterSave(Model $model, $created, $options = array()) {
 		$types = $this->_typeMaps[$this->settings[$model->name]['type']];
-		if (!is_array($types)) {
+		if ( ! is_array($types)) {
 			$types = array($types);
 		}
 		foreach ($types as $type) {
 			$parent = $model->parentNode();
-			if (!empty($parent)) {
+			if ( ! empty($parent)) {
 				$parent = $this->node($model, $parent, $type);
 			}
 			$data = array(
@@ -113,7 +113,7 @@ 
 				'model' => $model->name,
 				'foreign_key' => $model->id
 			);
-			if (!$created) {
+			if ( ! $created) {
 				$node = $this->node($model, null, $type);
 				$data['id'] = isset($node[0][$type]['id']) ? $node[0][$type]['id'] : null;
 			}
@@ -130,12 +130,12 @@ 
  */
 	public function afterDelete(Model $model) {
 		$types = $this->_typeMaps[$this->settings[$model->name]['type']];
-		if (!is_array($types)) {
+		if ( ! is_array($types)) {
 			$types = array($types);
 		}
 		foreach ($types as $type) {
 			$node = Hash::extract($this->node($model, null, $type), "0.{$type}.id");
-			if (!empty($node)) {
+			if ( ! empty($node)) {
 				$model->{$type}->delete($node);
 			}
 		}

lib/Cake/Model/Behavior/ContainableBehavior.php

Spacing +39 added lines, -39 removed lines

@@ -63,7 +63,7 @@ 
  * @return void
  */
 	public function setup(Model $Model, $settings = array()) {
-		if (!isset($this->settings[$Model->alias])) {
+		if ( ! isset($this->settings[$Model->alias])) {
 			$this->settings[$Model->alias] = array('recursive' => true, 'notices' => true, 'autoFields' => true);
 		}
 		$this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], $settings);
@@ -104,7 +104,7 @@ 
 		if (isset($query['contain'])) {
 			$noContain = $noContain || empty($query['contain']);
 			if ($query['contain'] !== false) {
-				$contain = array_merge($contain, (array)$query['contain']);
+				$contain = array_merge($contain, (array) $query['contain']);
 			}
 		}
 		$noContain = $noContain && empty($contain);
@@ -127,13 +127,13 @@ 
 		foreach ($containments['models'] as $model) {
 			$instance = $model['instance'];
 			$needed = $this->fieldDependencies($instance, $map, false);
-			if (!empty($needed)) {
+			if ( ! empty($needed)) {
 				$mandatory = array_merge($mandatory, $needed);
 			}
 			if ($contain) {
 				$backupBindings = array();
 				foreach ($this->types as $relation) {
-					if (!empty($instance->__backAssociation[$relation])) {
+					if ( ! empty($instance->__backAssociation[$relation])) {
 						$backupBindings[$relation] = $instance->__backAssociation[$relation];
 					} else {
 						$backupBindings[$relation] = $instance->{$relation};
@@ -142,29 +142,29 @@ 
 				foreach ($this->types as $type) {
 					$unbind = array();
 					foreach ($instance->{$type} as $assoc => $options) {
-						if (!isset($model['keep'][$assoc])) {
+						if ( ! isset($model['keep'][$assoc])) {
 							$unbind[] = $assoc;
 						}
 					}
-					if (!empty($unbind)) {
-						if (!$reset && empty($instance->__backOriginalAssociation)) {
+					if ( ! empty($unbind)) {
+						if ( ! $reset && empty($instance->__backOriginalAssociation)) {
 							$instance->__backOriginalAssociation = $backupBindings;
 						}
 						$instance->unbindModel(array($type => $unbind), $reset);
 					}
 					foreach ($instance->{$type} as $assoc => $options) {
-						if (isset($model['keep'][$assoc]) && !empty($model['keep'][$assoc])) {
+						if (isset($model['keep'][$assoc]) && ! empty($model['keep'][$assoc])) {
 							if (isset($model['keep'][$assoc]['fields'])) {
 								$model['keep'][$assoc]['fields'] = $this->fieldDependencies($containments['models'][$assoc]['instance'], $map, $model['keep'][$assoc]['fields']);
 							}
-							if (!$reset && empty($instance->__backOriginalAssociation)) {
+							if ( ! $reset && empty($instance->__backOriginalAssociation)) {
 								$instance->__backOriginalAssociation = $backupBindings;
 							} elseif ($reset) {
 								$instance->__backAssociation[$type] = $backupBindings[$type];
 							}
 							$instance->{$type}[$assoc] = array_merge($instance->{$type}[$assoc], $model['keep'][$assoc]);
 						}
-						if (!$reset) {
+						if ( ! $reset) {
 							$instance->__backInnerAssociation[] = $assoc;
 						}
 					}
@@ -177,34 +177,34 @@ 
 		}
 
 		$autoFields = ($this->settings[$Model->alias]['autoFields']
-					&& !in_array($Model->findQueryType, array('list', 'count'))
-					&& !empty($query['fields']));
+					&& ! in_array($Model->findQueryType, array('list', 'count'))
+					&& ! empty($query['fields']));
 
-		if (!$autoFields) {
+		if ( ! $autoFields) {
 			return $query;
 		}
 
-		$query['fields'] = (array)$query['fields'];
+		$query['fields'] = (array) $query['fields'];
 		foreach (array('hasOne', 'belongsTo') as $type) {
-			if (!empty($Model->{$type})) {
+			if ( ! empty($Model->{$type})) {
 				foreach ($Model->{$type} as $assoc => $data) {
-					if ($Model->useDbConfig === $Model->{$assoc}->useDbConfig && !empty($data['fields'])) {
-						foreach ((array)$data['fields'] as $field) {
-							$query['fields'][] = (strpos($field, '.') === false ? $assoc . '.' : '') . $field;
+					if ($Model->useDbConfig === $Model->{$assoc}->useDbConfig && ! empty($data['fields'])) {
+						foreach ((array) $data['fields'] as $field) {
+							$query['fields'][] = (strpos($field, '.') === false ? $assoc.'.' : '').$field;
 						}
 					}
 				}
 			}
 		}
 
-		if (!empty($mandatory[$Model->alias])) {
+		if ( ! empty($mandatory[$Model->alias])) {
 			foreach ($mandatory[$Model->alias] as $field) {
 				if ($field === '--primaryKey--') {
 					$field = $Model->primaryKey;
 				} elseif (preg_match('/^.+\.\-\-[^-]+\-\-$/', $field)) {
 					list($modelName, $field) = explode('.', $field);
 					if ($Model->useDbConfig === $Model->{$modelName}->useDbConfig) {
-						$field = $modelName . '.' . (
+						$field = $modelName.'.'.(
 							($field === '--primaryKey--') ? $Model->$modelName->primaryKey : $field
 						);
 					} else {
@@ -243,12 +243,12 @@ 
  * @return void
  */
 	public function resetBindings(Model $Model) {
-		if (!empty($Model->__backOriginalAssociation)) {
+		if ( ! empty($Model->__backOriginalAssociation)) {
 			$Model->__backAssociation = $Model->__backOriginalAssociation;
 			unset($Model->__backOriginalAssociation);
 		}
 		$Model->resetAssociations();
-		if (!empty($Model->__backInnerAssociation)) {
+		if ( ! empty($Model->__backInnerAssociation)) {
 			$assocs = $Model->__backInnerAssociation;
 			$Model->__backInnerAssociation = array();
 			foreach ($assocs as $currentModel) {
@@ -272,7 +272,7 @@ 
 		if ($throwErrors === null) {
 			$throwErrors = (empty($this->settings[$Model->alias]) ? true : $this->settings[$Model->alias]['notices']);
 		}
-		foreach ((array)$contain as $name => $children) {
+		foreach ((array) $contain as $name => $children) {
 			if (is_numeric($name)) {
 				$name = $children;
 				$children = array();
@@ -286,10 +286,10 @@ 
 				$children = array(implode('.', $chain) => $children);
 			}
 
-			$children = (array)$children;
+			$children = (array) $children;
 			foreach ($children as $key => $val) {
-				if (is_string($key) && is_string($val) && !in_array($key, $options, true)) {
-					$children[$key] = (array)$val;
+				if (is_string($key) && is_string($val) && ! in_array($key, $options, true)) {
+					$children[$key] = (array) $val;
 				}
 			}
 
@@ -303,33 +303,33 @@ 
 					continue;
 				}
 				$optionKey = in_array($key, $options, true);
-				if (!$optionKey && is_string($key) && preg_match('/^[a-z(]/', $key) && (!isset($Model->{$key}) || !is_object($Model->{$key}))) {
+				if ( ! $optionKey && is_string($key) && preg_match('/^[a-z(]/', $key) && ( ! isset($Model->{$key}) || ! is_object($Model->{$key}))) {
 					$option = 'fields';
 					$val = array($key);
 					if ($key{0} === '(') {
 						$val = preg_split('/\s*,\s*/', substr($key, 1, -1));
 					} elseif (preg_match('/ASC|DESC$/', $key)) {
 						$option = 'order';
-						$val = $Model->{$name}->alias . '.' . $key;
+						$val = $Model->{$name}->alias.'.'.$key;
 					} elseif (preg_match('/[ =!]/', $key)) {
 						$option = 'conditions';
-						$val = $Model->{$name}->alias . '.' . $key;
+						$val = $Model->{$name}->alias.'.'.$key;
 					}
 					$children[$option] = is_array($val) ? $val : array($val);
 					$newChildren = null;
-					if (!empty($name) && !empty($children[$key])) {
+					if ( ! empty($name) && ! empty($children[$key])) {
 						$newChildren = $children[$key];
 					}
 					unset($children[$key], $children[$i]);
 					$key = $option;
 					$optionKey = true;
-					if (!empty($newChildren)) {
+					if ( ! empty($newChildren)) {
 						$children = Hash::merge($children, $newChildren);
 					}
 				}
 				if ($optionKey && isset($children[$key])) {
-					if (!empty($keep[$name][$key]) && is_array($keep[$name][$key])) {
-						$keep[$name][$key] = array_merge((isset($keep[$name][$key]) ? $keep[$name][$key] : array()), (array)$children[$key]);
+					if ( ! empty($keep[$name][$key]) && is_array($keep[$name][$key])) {
+						$keep[$name][$key] = array_merge((isset($keep[$name][$key]) ? $keep[$name][$key] : array()), (array) $children[$key]);
 					} else {
 						$keep[$name][$key] = $children[$key];
 					}
@@ -337,7 +337,7 @@ 
 				}
 			}
 
-			if (!isset($Model->{$name}) || !is_object($Model->{$name})) {
+			if ( ! isset($Model->{$name}) || ! is_object($Model->{$name})) {
 				if ($throwErrors) {
 					trigger_error(__d('cake_dev', 'Model "%s" is not associated with model "%s"', $Model->alias, $name), E_USER_WARNING);
 				}
@@ -346,12 +346,12 @@ 
 
 			$containments = $this->containments($Model->{$name}, $children, $containments);
 			$depths[] = $containments['depth'] + 1;
-			if (!isset($keep[$name])) {
+			if ( ! isset($keep[$name])) {
 				$keep[$name] = array();
 			}
 		}
 
-		if (!isset($containments['models'][$Model->alias])) {
+		if ( ! isset($containments['models'][$Model->alias])) {
 			$containments['models'][$Model->alias] = array('keep' => array(), 'instance' => &$Model);
 		}
 
@@ -376,7 +376,7 @@ 
 						if ($type === 'hasAndBelongsToMany') {
 							$fields[$parent][] = '--primaryKey--';
 						} elseif ($type === 'belongsTo') {
-							$fields[$parent][] = $dependency . '.--primaryKey--';
+							$fields[$parent][] = $dependency.'.--primaryKey--';
 						}
 					}
 				}
@@ -399,7 +399,7 @@ 
 						$fields[] = $Model->primaryKey;
 						break;
 				}
-				if (!empty($innerFields) && !empty($Model->{$type}[$dependency]['fields'])) {
+				if ( ! empty($innerFields) && ! empty($Model->{$type}[$dependency]['fields'])) {
 					$Model->{$type}[$dependency]['fields'] = array_unique(array_merge($Model->{$type}[$dependency]['fields'], $innerFields));
 				}
 			}
@@ -420,7 +420,7 @@ 
 			foreach ($this->types as $type) {
 				foreach ($instance->{$type} as $assoc => $options) {
 					if (isset($model['keep'][$assoc])) {
-						$map[$name][$type] = isset($map[$name][$type]) ? array_merge($map[$name][$type], (array)$assoc) : (array)$assoc;
+						$map[$name][$type] = isset($map[$name][$type]) ? array_merge($map[$name][$type], (array) $assoc) : (array) $assoc;
 					}
 				}
 			}

lib/Cake/Model/CakeSchema.php

Spacing +49 added lines, -49 removed lines

@@ -81,7 +81,7 @@ 
 		if (empty($options['name'])) {
 			$this->name = preg_replace('/schema$/i', '', get_class($this));
 		}
-		if (!empty($options['plugin'])) {
+		if ( ! empty($options['plugin'])) {
 			$this->plugin = $options['plugin'];
 		}
 
@@ -90,7 +90,7 @@ 
 		}
 
 		if (empty($options['path'])) {
-			$this->path = APP . 'Config' . DS . 'Schema';
+			$this->path = APP.'Config'.DS.'Schema';
 		}
 
 		$options = array_merge(get_object_vars($this), $options);
@@ -106,25 +106,25 @@ 
 	public function build($data) {
 		$file = null;
 		foreach ($data as $key => $val) {
-			if (!empty($val)) {
-				if (!in_array($key, array('plugin', 'name', 'path', 'file', 'connection', 'tables', '_log'))) {
+			if ( ! empty($val)) {
+				if ( ! in_array($key, array('plugin', 'name', 'path', 'file', 'connection', 'tables', '_log'))) {
 					if ($key[0] === '_') {
 						continue;
 					}
 					$this->tables[$key] = $val;
 					unset($this->{$key});
 				} elseif ($key !== 'tables') {
-					if ($key === 'name' && $val !== $this->name && !isset($data['file'])) {
-						$file = Inflector::underscore($val) . '.php';
+					if ($key === 'name' && $val !== $this->name && ! isset($data['file'])) {
+						$file = Inflector::underscore($val).'.php';
 					}
 					$this->{$key} = $val;
 				}
 			}
 		}
-		if (file_exists($this->path . DS . $file) && is_file($this->path . DS . $file)) {
+		if (file_exists($this->path.DS.$file) && is_file($this->path.DS.$file)) {
 			$this->file = $file;
-		} elseif (!empty($this->plugin)) {
-			$this->path = CakePlugin::path($this->plugin) . 'Config' . DS . 'Schema';
+		} elseif ( ! empty($this->plugin)) {
+			$this->path = CakePlugin::path($this->plugin).'Config'.DS.'Schema';
 		}
 	}
 
@@ -161,13 +161,13 @@ 
 		$this->build($options);
 		extract(get_object_vars($this));
 
-		$class = $name . 'Schema';
+		$class = $name.'Schema';
 
-		if (!class_exists($class)) {
-			if (file_exists($path . DS . $file) && is_file($path . DS . $file)) {
-				require_once $path . DS . $file;
-			} elseif (file_exists($path . DS . 'schema.php') && is_file($path . DS . 'schema.php')) {
-				require_once $path . DS . 'schema.php';
+		if ( ! class_exists($class)) {
+			if (file_exists($path.DS.$file) && is_file($path.DS.$file)) {
+				require_once $path.DS.$file;
+			} elseif (file_exists($path.DS.'schema.php') && is_file($path.DS.'schema.php')) {
+				require_once $path.DS.'schema.php';
 			}
 		}
 
@@ -202,20 +202,20 @@ 
 		$db = ConnectionManager::getDataSource($connection);
 
 		if (isset($this->plugin)) {
-			App::uses($this->plugin . 'AppModel', $this->plugin . '.Model');
+			App::uses($this->plugin.'AppModel', $this->plugin.'.Model');
 		}
 
 		$tables = array();
-		$currentTables = (array)$db->listSources();
+		$currentTables = (array) $db->listSources();
 
 		$prefix = null;
 		if (isset($db->config['prefix'])) {
 			$prefix = $db->config['prefix'];
 		}
 
-		if (!is_array($models) && $models !== false) {
+		if ( ! is_array($models) && $models !== false) {
 			if (isset($this->plugin)) {
-				$models = App::objects($this->plugin . '.Model', null, false);
+				$models = App::objects($this->plugin.'.Model', null, false);
 			} else {
 				$models = App::objects('Model');
 			}
@@ -230,15 +230,15 @@ 
 				}
 
 				if (isset($this->plugin)) {
-					if ($model === $this->plugin . 'AppModel') {
+					if ($model === $this->plugin.'AppModel') {
 						continue;
 					}
 					$importModel = $model;
-					$plugin = $this->plugin . '.';
+					$plugin = $this->plugin.'.';
 				}
 
-				App::uses($importModel, $plugin . 'Model');
-				if (!class_exists($importModel)) {
+				App::uses($importModel, $plugin.'Model');
+				if ( ! class_exists($importModel)) {
 					continue;
 				}
 
@@ -253,7 +253,7 @@ 
 					continue;
 				}
 
-				if (!is_object($Object) || $Object->useTable === false) {
+				if ( ! is_object($Object) || $Object->useTable === false) {
 					continue;
 				}
 				$db = $Object->getDataSource();
@@ -262,7 +262,7 @@ 
 				if ($prefix && strpos($table, $prefix) !== 0) {
 					continue;
 				}
-				if (!in_array($fulltable, $currentTables)) {
+				if ( ! in_array($fulltable, $currentTables)) {
 					continue;
 				}
 
@@ -282,7 +282,7 @@ 
 					if (isset($assocData['with'])) {
 						$class = $assocData['with'];
 					}
-					if (!is_object($Object->$class)) {
+					if ( ! is_object($Object->$class)) {
 						continue;
 					}
 					$withTable = $db->fullTableName($Object->$class, false, false);
@@ -302,7 +302,7 @@ 
 			}
 		}
 
-		if (!empty($currentTables)) {
+		if ( ! empty($currentTables)) {
 			foreach ($currentTables as $table) {
 				if ($prefix) {
 					if (strpos($table, $prefix) !== 0) {
@@ -383,13 +383,13 @@ 
 		}
 
 		foreach ($tables as $table => $fields) {
-			if (!is_numeric($table) && $table !== 'missing') {
+			if ( ! is_numeric($table) && $table !== 'missing') {
 				$out .= $this->generateTable($table, $fields);
 			}
 		}
 		$out .= "}\n";
 
-		$file = new File($path . DS . $file, true);
+		$file = new File($path.DS.$file, true);
 		$content = "<?php \n{$out}";
 		if ($file->write($content)) {
 			return $content;
@@ -415,20 +415,20 @@ 
 						$type = $value;
 						$value = array('type' => $type);
 					}
-					$col = "\t\t'{$field}' => array('type' => '" . $value['type'] . "', ";
+					$col = "\t\t'{$field}' => array('type' => '".$value['type']."', ";
 					unset($value['type']);
 					$col .= implode(', ', $this->_values($value));
 				} elseif ($field === 'indexes') {
 					$col = "\t\t'indexes' => array(\n\t\t\t";
 					$props = array();
-					foreach ((array)$value as $key => $index) {
-						$props[] = "'{$key}' => array(" . implode(', ', $this->_values($index)) . ")";
+					foreach ((array) $value as $key => $index) {
+						$props[] = "'{$key}' => array(".implode(', ', $this->_values($index)).")";
 					}
-					$col .= implode(",\n\t\t\t", $props) . "\n\t\t";
+					$col .= implode(",\n\t\t\t", $props)."\n\t\t";
 				} elseif ($field === 'tableParameters') {
 					$col = "\t\t'tableParameters' => array(";
 					$props = array();
-					foreach ((array)$value as $key => $param) {
+					foreach ((array) $value as $key => $param) {
 						$props[] = "'{$key}' => '$param'";
 					}
 					$col .= implode(', ', $props);
@@ -473,23 +473,23 @@ 
 			if ($table === 'missing') {
 				continue;
 			}
-			if (!array_key_exists($table, $old)) {
+			if ( ! array_key_exists($table, $old)) {
 				$tables[$table]['create'] = $fields;
 			} else {
 				$diff = $this->_arrayDiffAssoc($fields, $old[$table]);
-				if (!empty($diff)) {
+				if ( ! empty($diff)) {
 					$tables[$table]['add'] = $diff;
 				}
 				$diff = $this->_arrayDiffAssoc($old[$table], $fields);
-				if (!empty($diff)) {
+				if ( ! empty($diff)) {
 					$tables[$table]['drop'] = $diff;
 				}
 			}
 
 			foreach ($fields as $field => $value) {
-				if (!empty($old[$table][$field])) {
+				if ( ! empty($old[$table][$field])) {
 					$diff = $this->_arrayDiffAssoc($value, $old[$table][$field]);
-					if (!empty($diff) && $field !== 'indexes' && $field !== 'tableParameters') {
+					if ( ! empty($diff) && $field !== 'indexes' && $field !== 'tableParameters') {
 						$tables[$table]['change'][$field] = $value;
 					}
 				}
@@ -507,7 +507,7 @@ 
 			if (isset($old[$table]['indexes']) && isset($new[$table]['indexes'])) {
 				$diff = $this->_compareIndexes($new[$table]['indexes'], $old[$table]['indexes']);
 				if ($diff) {
-					if (!isset($tables[$table])) {
+					if ( ! isset($tables[$table])) {
 						$tables[$table] = array();
 					}
 					if (isset($diff['drop'])) {
@@ -544,7 +544,7 @@ 
 	protected function _arrayDiffAssoc($array1, $array2) {
 		$difference = array();
 		foreach ($array1 as $key => $value) {
-			if (!array_key_exists($key, $array2)) {
+			if ( ! array_key_exists($key, $array2)) {
 				$difference[$key] = $value;
 				continue;
 			}
@@ -579,13 +579,13 @@ 
 		if (is_array($values)) {
 			foreach ($values as $key => $val) {
 				if (is_array($val)) {
-					$vals[] = "'{$key}' => array(" . implode(", ", $this->_values($val)) . ")";
+					$vals[] = "'{$key}' => array(".implode(", ", $this->_values($val)).")";
 				} else {
 					$val = var_export($val, true);
 					if ($val === 'NULL') {
 						$val = 'null';
 					}
-					if (!is_numeric($key)) {
+					if ( ! is_numeric($key)) {
 						$vals[] = "'{$key}' => {$val}";
 					} else {
 						$vals[] = "{$val}";
@@ -611,7 +611,7 @@ 
 			if ($Obj->primaryKey === $name) {
 				$value['key'] = 'primary';
 			}
-			if (!isset($db->columns[$value['type']])) {
+			if ( ! isset($db->columns[$value['type']])) {
 				trigger_error(__d('cake_dev', 'Schema generation error: invalid column type %s for %s.%s does not exist in DBO', $value['type'], $Obj->name, $name), E_USER_NOTICE);
 				continue;
 			} else {
@@ -647,7 +647,7 @@ 
  * @return mixed False on failure, or an array of parameters to add & drop.
  */
 	protected function _compareTableParameters($new, $old) {
-		if (!is_array($new) || !is_array($old)) {
+		if ( ! is_array($new) || ! is_array($old)) {
 			return false;
 		}
 		$change = $this->_arrayDiffAssoc($new, $old);
@@ -662,19 +662,19 @@ 
  * @return mixed false on failure or array of indexes to add and drop
  */
 	protected function _compareIndexes($new, $old) {
-		if (!is_array($new) || !is_array($old)) {
+		if ( ! is_array($new) || ! is_array($old)) {
 			return false;
 		}
 
 		$add = $drop = array();
 
 		$diff = $this->_arrayDiffAssoc($new, $old);
-		if (!empty($diff)) {
+		if ( ! empty($diff)) {
 			$add = $diff;
 		}
 
 		$diff = $this->_arrayDiffAssoc($old, $new);
-		if (!empty($diff)) {
+		if ( ! empty($diff)) {
 			$drop = $diff;
 		}
 
@@ -713,7 +713,7 @@ 
  * @return string Prefix-less table name
  */
 	protected function _noPrefixTable($prefix, $table) {
-		return preg_replace('/^' . preg_quote($prefix) . '/', '', $table);
+		return preg_replace('/^'.preg_quote($prefix).'/', '', $table);
 	}
 
 }

lib/Cake/Model/ConnectionManager.php

Spacing +11 added lines, -11 removed lines

@@ -64,7 +64,7 @@ 
  * @return void
  */
 	protected static function _init() {
-		include_once APP . 'Config' . DS . 'database.php';
+		include_once APP.'Config'.DS.'database.php';
 		if (class_exists('DATABASE_CONFIG')) {
 			self::$config = new DATABASE_CONFIG();
 		}
@@ -83,7 +83,7 @@ 
 			self::_init();
 		}
 
-		if (!empty(self::$_dataSources[$name])) {
+		if ( ! empty(self::$_dataSources[$name])) {
 			return self::$_dataSources[$name];
 		}
 
@@ -166,15 +166,15 @@ 
 		}
 
 		$plugin = $package = null;
-		if (!empty($conn['plugin'])) {
-			$plugin = $conn['plugin'] . '.';
+		if ( ! empty($conn['plugin'])) {
+			$plugin = $conn['plugin'].'.';
 		}
-		if (!empty($conn['package'])) {
-			$package = '/' . $conn['package'];
+		if ( ! empty($conn['package'])) {
+			$package = '/'.$conn['package'];
 		}
 
-		App::uses($conn['classname'], $plugin . 'Model/Datasource' . $package);
-		if (!class_exists($conn['classname'])) {
+		App::uses($conn['classname'], $plugin.'Model/Datasource'.$package);
+		if ( ! class_exists($conn['classname'])) {
 			throw new MissingDatasourceException(array(
 				'class' => $conn['classname'],
 				'plugin' => substr($plugin, 0, -1)
@@ -193,7 +193,7 @@ 
 		if (empty(self::$_init)) {
 			self::_init();
 		}
-		return (array)self::$config;
+		return (array) self::$config;
 	}
 
 /**
@@ -228,7 +228,7 @@ 
 			self::_init();
 		}
 
-		if (!isset(self::$config->{$name})) {
+		if ( ! isset(self::$config->{$name})) {
 			return false;
 		}
 		unset(self::$_connectionsEnum[$name], self::$_dataSources[$name], self::$config->{$name});
@@ -243,7 +243,7 @@ 
  * @throws MissingDatasourceConfigException
  */
 	protected static function _getConnectionObject($name) {
-		if (!empty(self::$config->{$name})) {
+		if ( ! empty(self::$config->{$name})) {
 			self::$_connectionsEnum[$name] = self::_connectionData(self::$config->{$name});
 		} else {
 			throw new MissingDatasourceConfigException(array('config' => $name));

lib/Cake/Model/ModelBehavior.php

Spacing +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
 			}
 			return;
 		}
-		if (!empty($model->whitelist) && !in_array($field, $model->whitelist)) {
+		if ( ! empty($model->whitelist) && ! in_array($field, $model->whitelist)) {
 			$model->whitelist[] = $field;
 		}
 	}

lib/Cake/Model/Permission.php

Spacing +21 added lines, -21 removed lines

@@ -59,7 +59,7 @@ 
  */
 	public function __construct() {
 		$config = Configure::read('Acl.database');
-		if (!empty($config)) {
+		if ( ! empty($config)) {
 			$this->useDbConfig = $config;
 		}
 		parent::__construct();
@@ -74,7 +74,7 @@ 
  * @return boolean Success (true if ARO has access to action in ACO, false otherwise)
  */
 	public function check($aro, $aco, $action = '*') {
-		if (!$aro || !$aco) {
+		if ( ! $aro || ! $aco) {
 			return false;
 		}
 
@@ -82,7 +82,7 @@ 
 		$aroPath = $this->Aro->node($aro);
 		$acoPath = $this->Aco->node($aco);
 
-		if (!$aroPath) {
+		if ( ! $aroPath) {
 			trigger_error(__d('cake_dev',
 					"%s - Failed ARO node lookup in permissions check. Node references:\nAro: %s\nAco: %s",
 					'DbAcl::check()',
@@ -93,7 +93,7 @@ 
 			return false;
 		}
 
-		if (!$acoPath) {
+		if ( ! $acoPath) {
 			trigger_error(__d('cake_dev',
 					"%s - Failed ACO node lookup in permissions check. Node references:\nAro: %s\nAco: %s",
 					'DbAcl::check()',
@@ -104,13 +104,13 @@ 
 			return false;
 		}
 
-		if ($action !== '*' && !in_array('_' . $action, $permKeys)) {
+		if ($action !== '*' && ! in_array('_'.$action, $permKeys)) {
 			trigger_error(__d('cake_dev', "ACO permissions key %s does not exist in %s", $action, 'DbAcl::check()'), E_USER_NOTICE);
 			return false;
 		}
 
 		$inherited = array();
-		$acoIDs = Hash::extract($acoPath, '{n}.' . $this->Aco->alias . '.id');
+		$acoIDs = Hash::extract($acoPath, '{n}.'.$this->Aco->alias.'.id');
 
 		$count = count($aroPath);
 		for ($i = 0; $i < $count; $i++) {
@@ -121,19 +121,19 @@ 
 					"{$permAlias}.aro_id" => $aroPath[$i][$this->Aro->alias]['id'],
 					"{$permAlias}.aco_id" => $acoIDs
 				),
-				'order' => array($this->Aco->alias . '.lft' => 'desc'),
+				'order' => array($this->Aco->alias.'.lft' => 'desc'),
 				'recursive' => 0
 			));
 
 			if (empty($perms)) {
 				continue;
 			}
-			$perms = Hash::extract($perms, '{n}.' . $this->alias);
+			$perms = Hash::extract($perms, '{n}.'.$this->alias);
 			foreach ($perms as $perm) {
 				if ($action === '*') {
 
 					foreach ($permKeys as $key) {
-						if (!empty($perm)) {
+						if ( ! empty($perm)) {
 							if ($perm[$key] == -1) {
 								return false;
 							} elseif ($perm[$key] == 1) {
@@ -146,7 +146,7 @@ 
 						return true;
 					}
 				} else {
-					switch ($perm['_' . $action]) {
+					switch ($perm['_'.$action]) {
 						case -1:
 							return false;
 						case 0:
@@ -175,7 +175,7 @@ 
 		$permKeys = $this->getAcoKeys($this->schema());
 		$save = array();
 
-		if (!$perms) {
+		if ( ! $perms) {
 			trigger_error(__d('cake_dev', '%s - Invalid node', 'DbAcl::allow()'), E_USER_WARNING);
 			return false;
 		}
@@ -186,14 +186,14 @@ 
 		if ($actions === '*') {
 			$save = array_combine($permKeys, array_pad(array(), count($permKeys), $value));
 		} else {
-			if (!is_array($actions)) {
-				$actions = array('_' . $actions);
+			if ( ! is_array($actions)) {
+				$actions = array('_'.$actions);
 			}
 			foreach ($actions as $action) {
 				if ($action{0} !== '_') {
-					$action = '_' . $action;
+					$action = '_'.$action;
 				}
-				if (!in_array($action, $permKeys, true)) {
+				if ( ! in_array($action, $permKeys, true)) {
 					throw new AclException(__d('cake_dev', 'Invalid permission key "%s"', $action));
 				}
 				$save[$action] = $value;
@@ -201,7 +201,7 @@ 
 		}
 		list($save['aro_id'], $save['aco_id']) = array($perms['aro'], $perms['aco']);
 
-		if ($perms['link'] && !empty($perms['link'])) {
+		if ($perms['link'] && ! empty($perms['link'])) {
 			$save['id'] = $perms['link'][0][$this->alias]['id'];
 		} else {
 			unset($save['id']);
@@ -225,8 +225,8 @@ 
 		if (empty($obj['Aro']) || empty($obj['Aco'])) {
 			return false;
 		}
-		$aro = Hash::extract($obj, 'Aro.0.' . $this->Aro->alias . '.id');
-		$aco = Hash::extract($obj, 'Aco.0.' . $this->Aco->alias . '.id');
+		$aro = Hash::extract($obj, 'Aro.0.'.$this->Aro->alias.'.id');
+		$aco = Hash::extract($obj, 'Aco.0.'.$this->Aco->alias.'.id');
 		$aro = current($aro);
 		$aco = current($aco);
 
@@ -234,8 +234,8 @@ 
 			'aro' => $aro,
 			'aco' => $aco,
 			'link' => $this->find('all', array('conditions' => array(
-				$this->alias . '.aro_id' => $aro,
-				$this->alias . '.aco_id' => $aco
+				$this->alias.'.aro_id' => $aro,
+				$this->alias.'.aco_id' => $aco
 			)))
 		);
 	}
@@ -250,7 +250,7 @@ 
 		$newKeys = array();
 		$keys = array_keys($keys);
 		foreach ($keys as $key) {
-			if (!in_array($key, array('id', 'aro_id', 'aco_id'))) {
+			if ( ! in_array($key, array('id', 'aro_id', 'aco_id'))) {
 				$newKeys[] = $key;
 			}
 		}