reginaldojunior / winners

lib/Cake/Controller/Controller.php

Doc Comments +1 added lines, -1 removed lines

@@ -629,7 +629,7 @@
  * see Controller::loadModel(); for more info.
  * Loads Components and prepares them for initialization.
  *
- * @return mixed true if models found and instance created.
+ * @return boolean true if models found and instance created.
  * @see Controller::loadModel()
  * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::constructClasses
  * @throws MissingModelException

Spacing +36 added lines, -36 removed lines

@@ -320,7 +320,7 @@ 
 			$this->name = substr(get_class($this), 0, -10);
 		}
 
-		if (!$this->viewPath) {
+		if ( ! $this->viewPath) {
 			$this->viewPath = $this->name;
 		}
 
@@ -371,10 +371,10 @@ 
 
 		if ($name === $this->modelClass) {
 			list($plugin, $class) = pluginSplit($name, true);
-			if (!$plugin) {
-				$plugin = $this->plugin ? $this->plugin . '.' : null;
+			if ( ! $plugin) {
+				$plugin = $this->plugin ? $this->plugin.'.' : null;
 			}
-			return $this->loadModel($plugin . $this->modelClass);
+			return $this->loadModel($plugin.$this->modelClass);
 		}
 
 		return false;
@@ -459,10 +459,10 @@ 
 			$this->passedArgs = array_merge($request->params['pass'], $request->params['named']);
 		}
 
-		if (!empty($request->params['return']) && $request->params['return'] == 1) {
+		if ( ! empty($request->params['return']) && $request->params['return'] == 1) {
 			$this->autoRender = false;
 		}
-		if (!empty($request->params['bare'])) {
+		if ( ! empty($request->params['bare'])) {
 			$this->autoLayout = false;
 		}
 	}
@@ -483,7 +483,7 @@ 
 
 			if ($this->_isPrivateAction($method, $request)) {
 				throw new PrivateActionException(array(
-					'controller' => $this->name . "Controller",
+					'controller' => $this->name."Controller",
 					'action' => $request->params['action']
 				));
 			}
@@ -494,7 +494,7 @@ 
 				return $this->_getScaffold($request);
 			}
 			throw new MissingActionException(array(
-				'controller' => $this->name . "Controller",
+				'controller' => $this->name."Controller",
 				'action' => $request->params['action']
 			));
 		}
@@ -511,12 +511,12 @@ 
 	protected function _isPrivateAction(ReflectionMethod $method, CakeRequest $request) {
 		$privateAction = (
 			$method->name[0] === '_' ||
-			!$method->isPublic() ||
-			!in_array($method->name, $this->methods)
+			! $method->isPublic() ||
+			! in_array($method->name, $this->methods)
 		);
 		$prefixes = Router::prefixes();
 
-		if (!$privateAction && !empty($prefixes)) {
+		if ( ! $privateAction && ! empty($prefixes)) {
 			if (empty($request->params['prefix']) && strpos($request->params['action'], '_') > 0) {
 				list($prefix) = explode('_', $request->params['action']);
 				$privateAction = in_array($prefix, $prefixes);
@@ -547,12 +547,12 @@ 
 		$pluginVars = array();
 		$appVars = array();
 
-		if (!empty($this->plugin)) {
-			$pluginController = $this->plugin . 'AppController';
-			if (!is_subclass_of($this, $pluginController)) {
+		if ( ! empty($this->plugin)) {
+			$pluginController = $this->plugin.'AppController';
+			if ( ! is_subclass_of($this, $pluginController)) {
 				$pluginController = null;
 			}
-			$pluginDot = $this->plugin . '.';
+			$pluginDot = $this->plugin.'.';
 		}
 
 		if ($pluginController) {
@@ -560,7 +560,7 @@ 
 			$this->_mergeVars($merge, $pluginController);
 		}
 
-		if ($mergeParent || !empty($pluginController)) {
+		if ($mergeParent || ! empty($pluginController)) {
 			$appVars = get_class_vars($this->_mergeParent);
 			$merge = array('components', 'helpers');
 			$this->_mergeVars($merge, $this->_mergeParent, true);
@@ -570,10 +570,10 @@ 
 			$this->uses = false;
 		}
 		if ($this->uses === true) {
-			$this->uses = array($pluginDot . $this->modelClass);
+			$this->uses = array($pluginDot.$this->modelClass);
 		}
 		if (isset($appVars['uses']) && $appVars['uses'] === $this->uses) {
-			array_unshift($this->uses, $pluginDot . $this->modelClass);
+			array_unshift($this->uses, $pluginDot.$this->modelClass);
 		}
 		if ($pluginController) {
 			$pluginVars = get_class_vars($pluginController);
@@ -597,7 +597,7 @@ 
  * @return void
  */
 	protected function _mergeUses($merge) {
-		if (!isset($merge['uses'])) {
+		if ( ! isset($merge['uses'])) {
 			return;
 		}
 		if ($merge['uses'] === true) {
@@ -637,7 +637,7 @@ 
 	public function constructClasses() {
 		$this->_mergeControllerVars();
 		if ($this->uses) {
-			$this->uses = (array)$this->uses;
+			$this->uses = (array) $this->uses;
 			list(, $this->modelClass) = pluginSplit(reset($this->uses));
 		}
 		$this->Components->init($this);
@@ -726,17 +726,17 @@ 
 			$modelClass = $this->modelClass;
 		}
 
-		$this->uses = ($this->uses) ? (array)$this->uses : array();
-		if (!in_array($modelClass, $this->uses, true)) {
+		$this->uses = ($this->uses) ? (array) $this->uses : array();
+		if ( ! in_array($modelClass, $this->uses, true)) {
 			$this->uses[] = $modelClass;
 		}
 
 		list($plugin, $modelClass) = pluginSplit($modelClass, true);
 
 		$this->{$modelClass} = ClassRegistry::init(array(
-			'class' => $plugin . $modelClass, 'alias' => $modelClass, 'id' => $id
+			'class' => $plugin.$modelClass, 'alias' => $modelClass, 'id' => $id
 		));
-		if (!$this->{$modelClass}) {
+		if ( ! $this->{$modelClass}) {
 			throw new MissingModelException($modelClass);
 		}
 		return true;
@@ -911,7 +911,7 @@ 
 			$errors = array_merge($errors, $object->invalidFields());
 		}
 
-		return $this->validationErrors = (!empty($errors) ? $errors : false);
+		return $this->validationErrors = ( ! empty($errors) ? $errors : false);
 	}
 
 /**
@@ -930,7 +930,7 @@ 
 			return $this->response;
 		}
 
-		if (!empty($this->uses) && is_array($this->uses)) {
+		if ( ! empty($this->uses) && is_array($this->uses)) {
 			foreach ($this->uses as $model) {
 				list($plugin, $className) = pluginSplit($model);
 				$this->request->params['models'][$className] = compact('plugin', 'className');
@@ -946,7 +946,7 @@ 
 				$className = get_class($currentObject);
 				list($plugin) = pluginSplit(App::location($className));
 				$this->request->params['models'][$currentObject->alias] = compact('plugin', 'className');
-				$this->View->validationErrors[$currentObject->alias] =& $currentObject->validationErrors;
+				$this->View->validationErrors[$currentObject->alias] = & $currentObject->validationErrors;
 			}
 		}
 
@@ -964,7 +964,7 @@ 
  * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::referer
  */
 	public function referer($default = null, $local = false) {
-		if (!$this->request) {
+		if ( ! $this->request) {
 			return '/';
 		}
 
@@ -1021,8 +1021,8 @@ 
  * @deprecated Will be removed in 3.0.
  */
 	public function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive = false) {
-		if (!is_array($data) || empty($data)) {
-			if (!empty($this->request->data)) {
+		if ( ! is_array($data) || empty($data)) {
+			if ( ! empty($this->request->data)) {
 				$data = $this->request->data;
 			} else {
 				return null;
@@ -1037,7 +1037,7 @@ 
 		$arrayOp = is_array($op);
 		foreach ($data as $model => $fields) {
 			foreach ($fields as $field => $value) {
-				$key = $model . '.' . $field;
+				$key = $model.'.'.$field;
 				$fieldOp = $op;
 				if ($arrayOp) {
 					if (array_key_exists($key, $op)) {
@@ -1053,10 +1053,10 @@ 
 				}
 				$fieldOp = strtoupper(trim($fieldOp));
 				if ($fieldOp === 'LIKE') {
-					$key = $key . ' LIKE';
-					$value = '%' . $value . '%';
+					$key = $key.' LIKE';
+					$value = '%'.$value.'%';
 				} elseif ($fieldOp && $fieldOp !== '=') {
-					$key = $key . ' ' . $fieldOp;
+					$key = $key.' '.$fieldOp;
 				}
 				$cond[$key] = $value;
 			}
@@ -1234,8 +1234,8 @@ 
 		$viewClass = $this->viewClass;
 		if ($this->viewClass !== 'View') {
 			list($plugin, $viewClass) = pluginSplit($viewClass, true);
-			$viewClass = $viewClass . 'View';
-			App::uses($viewClass, $plugin . 'View');
+			$viewClass = $viewClass.'View';
+			App::uses($viewClass, $plugin.'View');
 		}
 
 		return new $viewClass($this);

lib/Cake/Controller/Scaffold.php

Doc Comments +5 added lines, -5 removed lines

@@ -155,7 +155,7 @@ 
  * Renders a view action of scaffolded model.
  *
  * @param CakeRequest $request Request Object for scaffolding
- * @return mixed A rendered view of a row from Models database table
+ * @return null|CakeResponse A rendered view of a row from Models database table
  * @throws NotFoundException
  */
 	protected function _scaffoldView(CakeRequest $request) {
@@ -180,8 +180,8 @@ 
 /**
  * Renders index action of scaffolded model.
  *
- * @param array $params Parameters for scaffolding
- * @return mixed A rendered view listing rows from Models database table
+ * @param CakeRequest $params Parameters for scaffolding
+ * @return null|CakeResponse A rendered view listing rows from Models database table
  */
 	protected function _scaffoldIndex($params) {
 		if ($this->controller->beforeScaffold('index')) {
@@ -285,7 +285,7 @@ 
  * Performs a delete on given scaffolded Model.
  *
  * @param CakeRequest $request Request for scaffolding
- * @return mixed Success on delete, error if delete fails
+ * @return null|CakeResponse Success on delete, error if delete fails
  * @throws MethodNotAllowedException When HTTP method is not a DELETE
  * @throws NotFoundException When id being deleted does not exist.
  */
@@ -335,7 +335,7 @@ 
 /**
  * Show a scaffold error
  *
- * @return mixed A rendered view showing the error
+ * @return CakeResponse A rendered view showing the error
  */
 	protected function _scaffoldError() {
 		return $this->controller->render('error', $this->layout);

Spacing +18 added lines, -18 removed lines

@@ -118,14 +118,14 @@ 
 		$this->modelClass = $controller->modelClass;
 		$this->modelKey = $controller->modelKey;
 
-		if (!is_object($this->controller->{$this->modelClass})) {
+		if ( ! is_object($this->controller->{$this->modelClass})) {
 			throw new MissingModelException($this->modelClass);
 		}
 
 		$this->ScaffoldModel = $this->controller->{$this->modelClass};
 		$this->scaffoldTitle = Inflector::humanize(Inflector::underscore($this->viewPath));
 		$this->scaffoldActions = $controller->scaffold;
-		$title = __d('cake', 'Scaffold :: ') . Inflector::humanize($request->action) . ' :: ' . $this->scaffoldTitle;
+		$title = __d('cake', 'Scaffold :: ').Inflector::humanize($request->action).' :: '.$this->scaffoldTitle;
 		$modelClass = $this->controller->modelClass;
 		$primaryKey = $this->ScaffoldModel->primaryKey;
 		$displayField = $this->ScaffoldModel->displayField;
@@ -163,7 +163,7 @@ 
 			if (isset($request->params['pass'][0])) {
 				$this->ScaffoldModel->id = $request->params['pass'][0];
 			}
-			if (!$this->ScaffoldModel->exists()) {
+			if ( ! $this->ScaffoldModel->exists()) {
 				throw new NotFoundException(__d('cake', 'Invalid %s', Inflector::humanize($this->modelKey)));
 			}
 			$this->ScaffoldModel->recursive = 1;
@@ -230,12 +230,12 @@ 
 				if (isset($request->params['pass'][0])) {
 					$this->ScaffoldModel->id = $request['pass'][0];
 				}
-				if (!$this->ScaffoldModel->exists()) {
+				if ( ! $this->ScaffoldModel->exists()) {
 					throw new NotFoundException(__d('cake', 'Invalid %s', Inflector::humanize($this->modelKey)));
 				}
 			}
 
-			if (!empty($request->data)) {
+			if ( ! empty($request->data)) {
 				if ($action === 'create') {
 					$this->ScaffoldModel->create();
 				}
@@ -291,7 +291,7 @@ 
  */
 	protected function _scaffoldDelete(CakeRequest $request) {
 		if ($this->controller->beforeScaffold('delete')) {
-			if (!$request->is('post')) {
+			if ( ! $request->is('post')) {
 				throw new MethodNotAllowedException();
 			}
 			$id = false;
@@ -299,7 +299,7 @@ 
 				$id = $request->params['pass'][0];
 			}
 			$this->ScaffoldModel->id = $id;
-			if (!$this->ScaffoldModel->exists()) {
+			if ( ! $this->ScaffoldModel->exists()) {
 				throw new NotFoundException(__d('cake', 'Invalid %s', Inflector::humanize($this->modelClass)));
 			}
 			if ($this->ScaffoldModel->delete()) {
@@ -361,22 +361,22 @@ 
 				$this->scaffoldActions = array(
 					'index', 'list', 'view', 'add', 'create', 'edit', 'update', 'delete'
 				);
-			} elseif (!empty($prefixes) && in_array($scaffoldPrefix, $prefixes)) {
+			} elseif ( ! empty($prefixes) && in_array($scaffoldPrefix, $prefixes)) {
 				$this->scaffoldActions = array(
-					$scaffoldPrefix . '_index',
-					$scaffoldPrefix . '_list',
-					$scaffoldPrefix . '_view',
-					$scaffoldPrefix . '_add',
-					$scaffoldPrefix . '_create',
-					$scaffoldPrefix . '_edit',
-					$scaffoldPrefix . '_update',
-					$scaffoldPrefix . '_delete'
+					$scaffoldPrefix.'_index',
+					$scaffoldPrefix.'_list',
+					$scaffoldPrefix.'_view',
+					$scaffoldPrefix.'_add',
+					$scaffoldPrefix.'_create',
+					$scaffoldPrefix.'_edit',
+					$scaffoldPrefix.'_update',
+					$scaffoldPrefix.'_delete'
 				);
 			}
 
 			if (in_array($request->params['action'], $this->scaffoldActions)) {
-				if (!empty($prefixes)) {
-					$request->params['action'] = str_replace($scaffoldPrefix . '_', '', $request->params['action']);
+				if ( ! empty($prefixes)) {
+					$request->params['action'] = str_replace($scaffoldPrefix.'_', '', $request->params['action']);
 				}
 				switch ($request->params['action']) {
 					case 'index':

lib/Cake/Core/App.php

Doc Comments +1 added lines, -1 removed lines

@@ -394,7 +394,7 @@
  * `App::core('Cache/Engine'); will return the full path to the cache engines package`
  *
  * @param string $type
- * @return array full path to package
+ * @return string[] full path to package
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::core
  */
 	public static function core($type) {

Spacing +79 added lines, -79 removed lines

@@ -217,15 +217,15 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::path
  */
 	public static function path($type, $plugin = null) {
-		if (!empty(self::$legacy[$type])) {
+		if ( ! empty(self::$legacy[$type])) {
 			$type = self::$legacy[$type];
 		}
 
-		if (!empty($plugin)) {
+		if ( ! empty($plugin)) {
 			$path = array();
 			$pluginPath = self::pluginPath($plugin);
 			$packageFormat = self::_packageFormat();
-			if (!empty($packageFormat[$type])) {
+			if ( ! empty($packageFormat[$type])) {
 				foreach ($packageFormat[$type] as $f) {
 					$path[] = sprintf($f, $pluginPath);
 				}
@@ -233,7 +233,7 @@ 
 			return $path;
 		}
 
-		if (!isset(self::$_packages[$type])) {
+		if ( ! isset(self::$_packages[$type])) {
 			return array();
 		}
 		return self::$_packages[$type];
@@ -278,7 +278,7 @@ 
 		//Provides Backwards compatibility for old-style package names
 		$legacyPaths = array();
 		foreach ($paths as $type => $path) {
-			if (!empty(self::$legacy[$type])) {
+			if ( ! empty(self::$legacy[$type])) {
 				$type = self::$legacy[$type];
 			}
 			$legacyPaths[$type] = $path;
@@ -287,7 +287,7 @@ 
 
 		if ($mode === App::RESET) {
 			foreach ($paths as $type => $new) {
-				self::$_packages[$type] = (array)$new;
+				self::$_packages[$type] = (array) $new;
 				self::objects($type, null, false);
 			}
 			return;
@@ -328,14 +328,14 @@ 
 		}
 
 		foreach ($defaults as $type => $default) {
-			if (!empty(self::$_packages[$type])) {
+			if ( ! empty(self::$_packages[$type])) {
 				$path = self::$_packages[$type];
 			} else {
 				$path = $default;
 			}
 
-			if (!empty($paths[$type])) {
-				$newPath = (array)$paths[$type];
+			if ( ! empty($paths[$type])) {
+				$newPath = (array) $paths[$type];
 
 				if ($mode === App::PREPEND) {
 					$path = array_merge($newPath, $path);
@@ -377,13 +377,13 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::themePath
  */
 	public static function themePath($theme) {
-		$themeDir = 'Themed' . DS . Inflector::camelize($theme);
+		$themeDir = 'Themed'.DS.Inflector::camelize($theme);
 		foreach (self::$_packages['View'] as $path) {
-			if (is_dir($path . $themeDir)) {
-				return $path . $themeDir . DS;
+			if (is_dir($path.$themeDir)) {
+				return $path.$themeDir.DS;
 			}
 		}
-		return self::$_packages['View'][0] . $themeDir . DS;
+		return self::$_packages['View'][0].$themeDir.DS;
 	}
 
 /**
@@ -398,7 +398,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::core
  */
 	public static function core($type) {
-		return array(CAKE . str_replace('/', DS, $type) . DS);
+		return array(CAKE.str_replace('/', DS, $type).DS);
 	}
 
 /**
@@ -426,7 +426,7 @@ 
  */
 	public static function objects($type, $path = null, $cache = true) {
 		if (empty(self::$_objects) && $cache === true) {
-			self::$_objects = (array)Cache::read('object_map', '_cake_core_');
+			self::$_objects = (array) Cache::read('object_map', '_cake_core_');
 		}
 
 		$extension = '/\.php$/';
@@ -444,36 +444,36 @@ 
 
 		list($plugin, $type) = pluginSplit($type);
 
-		if (isset(self::$legacy[$type . 's'])) {
-			$type = self::$legacy[$type . 's'];
+		if (isset(self::$legacy[$type.'s'])) {
+			$type = self::$legacy[$type.'s'];
 		}
 
-		if ($type === 'file' && !$path) {
+		if ($type === 'file' && ! $path) {
 			return false;
 		} elseif ($type === 'file') {
 			$extension = '/\.php$/';
-			$name = $type . str_replace(DS, '', $path);
+			$name = $type.str_replace(DS, '', $path);
 		}
 
 		$cacheLocation = empty($plugin) ? 'app' : $plugin;
 
-		if ($cache !== true || !isset(self::$_objects[$cacheLocation][$name])) {
+		if ($cache !== true || ! isset(self::$_objects[$cacheLocation][$name])) {
 			$objects = array();
 
 			if (empty($path)) {
 				$path = self::path($type, $plugin);
 			}
 
-			foreach ((array)$path as $dir) {
+			foreach ((array) $path as $dir) {
 				if ($dir != APP && is_dir($dir)) {
 					$files = new RegexIterator(new DirectoryIterator($dir), $extension);
 					foreach ($files as $file) {
 						$fileName = basename($file);
-						if (!$file->isDot() && $fileName[0] !== '.') {
+						if ( ! $file->isDot() && $fileName[0] !== '.') {
 							$isDir = $file->isDir();
 							if ($isDir && $includeDirectories) {
 								$objects[] = $fileName;
-							} elseif (!$includeDirectories && !$isDir) {
+							} elseif ( ! $includeDirectories && ! $isDir) {
 								$objects[] = substr($fileName, 0, -4);
 							}
 						}
@@ -530,7 +530,7 @@ 
  * @return boolean
  */
 	public static function load($className) {
-		if (!isset(self::$_classMap[$className])) {
+		if ( ! isset(self::$_classMap[$className])) {
 			return false;
 		}
 		if (strpos($className, '..') !== false) {
@@ -548,18 +548,18 @@ 
 
 		if (empty($plugin)) {
 			$appLibs = empty(self::$_packages['Lib']) ? APPLIBS : current(self::$_packages['Lib']);
-			$paths[] = $appLibs . $package . DS;
-			$paths[] = APP . $package . DS;
-			$paths[] = CAKE . $package . DS;
+			$paths[] = $appLibs.$package.DS;
+			$paths[] = APP.$package.DS;
+			$paths[] = CAKE.$package.DS;
 		} else {
 			$pluginPath = self::pluginPath($plugin);
-			$paths[] = $pluginPath . 'Lib' . DS . $package . DS;
-			$paths[] = $pluginPath . $package . DS;
+			$paths[] = $pluginPath.'Lib'.DS.$package.DS;
+			$paths[] = $pluginPath.$package.DS;
 		}
 
 		$normalizedClassName = str_replace('\\', DS, $className);
 		foreach ($paths as $path) {
-			$file = $path . $normalizedClassName . '.php';
+			$file = $path.$normalizedClassName.'.php';
 			if (file_exists($file)) {
 				self::_map($file, $className, $plugin);
 				return include $file;
@@ -577,7 +577,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::location
  */
 	public static function location($className) {
-		if (!empty(self::$_classMap[$className])) {
+		if ( ! empty(self::$_classMap[$className])) {
 			return self::$_classMap[$className];
 		}
 		return null;
@@ -612,13 +612,13 @@ 
 			extract($parent, EXTR_OVERWRITE);
 		}
 
-		if (!$name && !$file) {
+		if ( ! $name && ! $file) {
 			return false;
 		}
 
 		if (is_array($name)) {
 			foreach ($name as $class) {
-				if (!App::import(compact('type', 'parent', 'search', 'file', 'return') + array('name' => $class))) {
+				if ( ! App::import(compact('type', 'parent', 'search', 'file', 'return') + array('name' => $class))) {
 					return false;
 				}
 			}
@@ -627,21 +627,21 @@ 
 
 		$originalType = strtolower($type);
 		$specialPackage = in_array($originalType, array('file', 'vendor'));
-		if (!$specialPackage && isset(self::$legacy[$originalType . 's'])) {
-			$type = self::$legacy[$originalType . 's'];
+		if ( ! $specialPackage && isset(self::$legacy[$originalType.'s'])) {
+			$type = self::$legacy[$originalType.'s'];
 		}
 		list($plugin, $name) = pluginSplit($name);
-		if (!empty($plugin)) {
-			if (!CakePlugin::loaded($plugin)) {
+		if ( ! empty($plugin)) {
+			if ( ! CakePlugin::loaded($plugin)) {
 				return false;
 			}
 		}
 
-		if (!$specialPackage) {
+		if ( ! $specialPackage) {
 			return self::_loadClass($name, $plugin, $type, $originalType, $parent);
 		}
 
-		if ($originalType === 'file' && !empty($file)) {
+		if ($originalType === 'file' && ! empty($file)) {
 			return self::_loadFile($name, $plugin, $search, $file, $return);
 		}
 
@@ -680,14 +680,14 @@ 
 			}
 			App::uses($extends, $extendType);
 			if ($plugin && in_array($originalType, array('controller', 'model'))) {
-				App::uses($plugin . $extends, $plugin . '.' . $type);
+				App::uses($plugin.$extends, $plugin.'.'.$type);
 			}
 		}
 		if ($plugin) {
 			$plugin .= '.';
 		}
 		$name = Inflector::camelize($name);
-		App::uses($name, $plugin . $type);
+		App::uses($name, $plugin.$type);
 		return class_exists($name);
 	}
 
@@ -705,11 +705,11 @@ 
 		$mapped = self::_mapped($name, $plugin);
 		if ($mapped) {
 			$file = $mapped;
-		} elseif (!empty($search)) {
+		} elseif ( ! empty($search)) {
 			foreach ($search as $path) {
 				$found = false;
-				if (file_exists($path . $file)) {
-					$file = $path . $file;
+				if (file_exists($path.$file)) {
+					$file = $path.$file;
 					$found = true;
 					break;
 				}
@@ -718,13 +718,13 @@ 
 				}
 			}
 		}
-		if (!empty($file) && file_exists($file)) {
+		if ( ! empty($file) && file_exists($file)) {
 			self::_map($file, $name, $plugin);
 			$returnValue = include $file;
 			if ($return) {
 				return $returnValue;
 			}
-			return (bool)$returnValue;
+			return (bool) $returnValue;
 		}
 		return false;
 	}
@@ -740,7 +740,7 @@ 
  */
 	protected static function _loadVendor($name, $plugin, $file, $ext) {
 		if ($mapped = self::_mapped($name, $plugin)) {
-			return (bool)include_once $mapped;
+			return (bool) include_once $mapped;
 		}
 		$fileTries = array();
 		$paths = ($plugin) ? App::path('vendors', $plugin) : App::path('vendors');
@@ -748,17 +748,17 @@ 
 			$ext = 'php';
 		}
 		if (empty($file)) {
-			$fileTries[] = $name . '.' . $ext;
-			$fileTries[] = Inflector::underscore($name) . '.' . $ext;
+			$fileTries[] = $name.'.'.$ext;
+			$fileTries[] = Inflector::underscore($name).'.'.$ext;
 		} else {
 			$fileTries[] = $file;
 		}
 
 		foreach ($fileTries as $file) {
 			foreach ($paths as $path) {
-				if (file_exists($path . $file)) {
-					self::_map($path . $file, $name, $plugin);
-					return (bool)include $path . $file;
+				if (file_exists($path.$file)) {
+					self::_map($path.$file, $name, $plugin);
+					return (bool) include $path.$file;
 				}
 			}
 		}
@@ -771,7 +771,7 @@ 
  * @return void
  */
 	public static function init() {
-		self::$_map += (array)Cache::read('file_map', '_cake_core_');
+		self::$_map += (array) Cache::read('file_map', '_cake_core_');
 		register_shutdown_function(array('App', 'shutdown'));
 	}
 
@@ -786,15 +786,15 @@ 
 	protected static function _map($file, $name, $plugin = null) {
 		$key = $name;
 		if ($plugin) {
-			$key = 'plugin.' . $name;
+			$key = 'plugin.'.$name;
 		}
 		if ($plugin && empty(self::$_map[$name])) {
 			self::$_map[$key] = $file;
 		}
-		if (!$plugin && empty(self::$_map['plugin.' . $name])) {
+		if ( ! $plugin && empty(self::$_map['plugin.'.$name])) {
 			self::$_map[$key] = $file;
 		}
-		if (!self::$bootstrapping) {
+		if ( ! self::$bootstrapping) {
 			self::$_cacheChange = true;
 		}
 	}
@@ -809,7 +809,7 @@ 
 	protected static function _mapped($name, $plugin = null) {
 		$key = $name;
 		if ($plugin) {
-			$key = 'plugin.' . $name;
+			$key = 'plugin.'.$name;
 		}
 		return isset(self::$_map[$key]) ? self::$_map[$key] : false;
 	}
@@ -823,60 +823,60 @@ 
 		if (empty(self::$_packageFormat)) {
 			self::$_packageFormat = array(
 				'Model' => array(
-					'%s' . 'Model' . DS
+					'%s'.'Model'.DS
 				),
 				'Model/Behavior' => array(
-					'%s' . 'Model' . DS . 'Behavior' . DS
+					'%s'.'Model'.DS.'Behavior'.DS
 				),
 				'Model/Datasource' => array(
-					'%s' . 'Model' . DS . 'Datasource' . DS
+					'%s'.'Model'.DS.'Datasource'.DS
 				),
 				'Model/Datasource/Database' => array(
-					'%s' . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
+					'%s'.'Model'.DS.'Datasource'.DS.'Database'.DS
 				),
 				'Model/Datasource/Session' => array(
-					'%s' . 'Model' . DS . 'Datasource' . DS . 'Session' . DS
+					'%s'.'Model'.DS.'Datasource'.DS.'Session'.DS
 				),
 				'Controller' => array(
-					'%s' . 'Controller' . DS
+					'%s'.'Controller'.DS
 				),
 				'Controller/Component' => array(
-					'%s' . 'Controller' . DS . 'Component' . DS
+					'%s'.'Controller'.DS.'Component'.DS
 				),
 				'Controller/Component/Auth' => array(
-					'%s' . 'Controller' . DS . 'Component' . DS . 'Auth' . DS
+					'%s'.'Controller'.DS.'Component'.DS.'Auth'.DS
 				),
 				'Controller/Component/Acl' => array(
-					'%s' . 'Controller' . DS . 'Component' . DS . 'Acl' . DS
+					'%s'.'Controller'.DS.'Component'.DS.'Acl'.DS
 				),
 				'View' => array(
-					'%s' . 'View' . DS
+					'%s'.'View'.DS
 				),
 				'View/Helper' => array(
-					'%s' . 'View' . DS . 'Helper' . DS
+					'%s'.'View'.DS.'Helper'.DS
 				),
 				'Console' => array(
-					'%s' . 'Console' . DS
+					'%s'.'Console'.DS
 				),
 				'Console/Command' => array(
-					'%s' . 'Console' . DS . 'Command' . DS
+					'%s'.'Console'.DS.'Command'.DS
 				),
 				'Console/Command/Task' => array(
-					'%s' . 'Console' . DS . 'Command' . DS . 'Task' . DS
+					'%s'.'Console'.DS.'Command'.DS.'Task'.DS
 				),
 				'Lib' => array(
-					'%s' . 'Lib' . DS
+					'%s'.'Lib'.DS
 				),
 				'Locale' => array(
-					'%s' . 'Locale' . DS
+					'%s'.'Locale'.DS
 				),
 				'Vendor' => array(
-					'%s' . 'Vendor' . DS,
-					dirname(dirname(CAKE)) . DS . 'vendors' . DS,
+					'%s'.'Vendor'.DS,
+					dirname(dirname(CAKE)).DS.'vendors'.DS,
 				),
 				'Plugin' => array(
-					APP . 'Plugin' . DS,
-					dirname(dirname(CAKE)) . DS . 'plugins' . DS
+					APP.'Plugin'.DS,
+					dirname(dirname(CAKE)).DS.'plugins'.DS
 				)
 			);
 		}
@@ -909,7 +909,7 @@ 
  */
 	protected static function _checkFatalError() {
 		$lastError = error_get_last();
-		if (!is_array($lastError)) {
+		if ( ! is_array($lastError)) {
 			return;
 		}
 
@@ -923,7 +923,7 @@ 
 		} else {
 			$errorHandler = Configure::read('Error.handler');
 		}
-		if (!is_callable($errorHandler)) {
+		if ( ! is_callable($errorHandler)) {
 			return;
 		}
 		call_user_func($errorHandler, $lastError['type'], $lastError['message'], $lastError['file'], $lastError['line'], array());

lib/Cake/Core/Configure.php

Doc Comments +2 added lines, -2 removed lines

@@ -287,7 +287,7 @@ 
  * @param string $key name of configuration resource to load.
  * @param string $config Name of the configured reader to use to read the resource identified by $key.
  * @param boolean $merge if config files should be merged instead of simply overridden
- * @return mixed false if file not found, void if load successful.
+ * @return boolean false if file not found, void if load successful.
  * @throws ConfigureException Will throw any exceptions the reader raises.
  */
 	public static function load($key, $config = 'default', $merge = true) {
@@ -329,7 +329,7 @@ 
  * @param string $key The identifier to create in the config adapter.
  *   This could be a filename or a cache key depending on the adapter being used.
  * @param string $config The name of the configured adapter to dump data with.
- * @param array $keys The name of the top-level keys you want to dump.
+ * @param string[] $keys The name of the top-level keys you want to dump.
  *   This allows you save only some data stored in Configure.
  * @return boolean success
  * @throws ConfigureException if the adapter does not implement a `dump` method.

Indentation +6 added lines, -6 removed lines

@@ -425,12 +425,12 @@
 		return true;
 	}
 /**
- * Set the error and exception handlers.
- *
- * @param array $error The Error handling configuration.
- * @param array $exception The exception handling configuration.
- * @return void
- */
+	 * Set the error and exception handlers.
+	 *
+	 * @param array $error The Error handling configuration.
+	 * @param array $exception The exception handling configuration.
+	 * @return void
+	 */
 	protected static function _setErrorHandlers($error, $exception) {
 		$level = -1;
 		if (isset($error['level'])) {

Spacing +17 added lines, -17 removed lines

@@ -69,10 +69,10 @@ 
 		if ($boot) {
 			self::_appDefaults();
 
-			if (!include APP . 'Config' . DS . 'core.php') {
+			if ( ! include APP.'Config'.DS.'core.php') {
 				trigger_error(__d('cake_dev',
 						"Can't find application core file. Please create %s, and make sure it is readable by PHP.",
-						APP . 'Config' . DS . 'core.php'),
+						APP.'Config'.DS.'core.php'),
 					E_USER_ERROR
 				);
 			}
@@ -89,10 +89,10 @@ 
 			);
 			self::_setErrorHandlers($error, $exception);
 
-			if (!include APP . 'Config' . DS . 'bootstrap.php') {
+			if ( ! include APP.'Config'.DS.'bootstrap.php') {
 				trigger_error(__d('cake_dev',
 						"Can't find application bootstrap file. Please create %s, and make sure it is readable by PHP.",
-						APP . 'Config' . DS . 'bootstrap.php'),
+						APP.'Config'.DS.'bootstrap.php'),
 					E_USER_ERROR
 				);
 			}
@@ -116,7 +116,7 @@ 
  * @return void
  */
 	protected static function _appDefaults() {
-		self::write('App', (array)self::read('App') + array(
+		self::write('App', (array) self::read('App') + array(
 			'base' => false,
 			'baseUrl' => false,
 			'dir' => APP_DIR,
@@ -150,7 +150,7 @@ 
  * @return boolean True if write was successful
  */
 	public static function write($config, $value = null) {
-		if (!is_array($config)) {
+		if ( ! is_array($config)) {
 			$config = array($config => $value);
 		}
 
@@ -258,7 +258,7 @@ 
  * @return boolean Success
  */
 	public static function drop($name) {
-		if (!isset(self::$_readers[$name])) {
+		if ( ! isset(self::$_readers[$name])) {
 			return false;
 		}
 		unset(self::$_readers[$name]);
@@ -292,7 +292,7 @@ 
  */
 	public static function load($key, $config = 'default', $merge = true) {
 		$reader = self::_getReader($config);
-		if (!$reader) {
+		if ( ! $reader) {
 			return false;
 		}
 		$values = $reader->read($key);
@@ -336,17 +336,17 @@ 
  */
 	public static function dump($key, $config = 'default', $keys = array()) {
 		$reader = self::_getReader($config);
-		if (!$reader) {
+		if ( ! $reader) {
 			throw new ConfigureException(__d('cake_dev', 'There is no "%s" adapter.', $config));
 		}
-		if (!method_exists($reader, 'dump')) {
+		if ( ! method_exists($reader, 'dump')) {
 			throw new ConfigureException(__d('cake_dev', 'The "%s" adapter, does not have a %s method.', $config, 'dump()'));
 		}
 		$values = self::$_values;
-		if (!empty($keys) && is_array($keys)) {
+		if ( ! empty($keys) && is_array($keys)) {
 			$values = array_intersect_key($values, array_flip($keys));
 		}
-		return (bool)$reader->dump($key, $values);
+		return (bool) $reader->dump($key, $values);
 	}
 
 /**
@@ -357,7 +357,7 @@ 
  * @return mixed Reader instance or false
  */
 	protected static function _getReader($config) {
-		if (!isset(self::$_readers[$config])) {
+		if ( ! isset(self::$_readers[$config])) {
 			if ($config !== 'default') {
 				return false;
 			}
@@ -375,8 +375,8 @@ 
  * @return string Current version of CakePHP
  */
 	public static function version() {
-		if (!isset(self::$_values['Cake']['version'])) {
-			require CAKE . 'Config' . DS . 'config.php';
+		if ( ! isset(self::$_values['Cake']['version'])) {
+			require CAKE.'Config'.DS.'config.php';
 			self::write($config);
 		}
 		return self::$_values['Cake']['version'];
@@ -437,10 +437,10 @@ 
 			error_reporting($error['level']);
 			$level = $error['level'];
 		}
-		if (!empty($error['handler'])) {
+		if ( ! empty($error['handler'])) {
 			set_error_handler($error['handler'], $level);
 		}
-		if (!empty($exception['handler'])) {
+		if ( ! empty($exception['handler'])) {
 			set_exception_handler($exception['handler']);
 		}
 	}

lib/Cake/Core/Object.php

Doc Comments +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
  * POST and GET data can be simulated in requestAction. Use `$extra['url']` for
  * GET data. The `$extra['data']` parameter allows POST data simulation.
  *
- * @param string|array $url String or array-based URL. Unlike other URL arrays in CakePHP, this
+ * @param string $url String or array-based URL. Unlike other URL arrays in CakePHP, this
  *    URL will not automatically handle passed and named arguments in the $url parameter.
  * @param array $extra if array includes the key "return" it sets the AutoRender to true. Can
  *    also be used to submit GET/POST data, and named/passed arguments.
@@ -139,7 +139,7 @@ 
  * Stop execution of the current script. Wraps exit() making
  * testing easier.
  *
- * @param integer|string $status see http://php.net/exit for values
+ * @param integer $status see http://php.net/exit for values
  * @return void
  */
 	protected function _stop($status = 0) {

Spacing +5 added lines, -5 removed lines

@@ -78,10 +78,10 @@ 
 			unset($extra[$index]);
 		}
 		$arrayUrl = is_array($url);
-		if ($arrayUrl && !isset($extra['url'])) {
+		if ($arrayUrl && ! isset($extra['url'])) {
 			$extra['url'] = array();
 		}
-		if ($arrayUrl && !isset($extra['data'])) {
+		if ($arrayUrl && ! isset($extra['data'])) {
 			$extra['data'] = array();
 		}
 		$extra = array_merge(array('autoRender' => 0, 'return' => 1, 'bare' => 1, 'requested' => 1), $extra);
@@ -157,7 +157,7 @@ 
  * @return boolean Success of log write
  */
 	public function log($msg, $type = LOG_ERR, $scope = null) {
-		if (!is_string($msg)) {
+		if ( ! is_string($msg)) {
 			$msg = print_r($msg, true);
 		}
 
@@ -172,7 +172,7 @@ 
  * @return void
  */
 	protected function _set($properties = array()) {
-		if (is_array($properties) && !empty($properties)) {
+		if (is_array($properties) && ! empty($properties)) {
 			$vars = get_object_vars($this);
 			foreach ($properties as $key => $val) {
 				if (array_key_exists($key, $vars)) {
@@ -199,7 +199,7 @@ 
 		foreach ($properties as $var) {
 			if (
 				isset($classProperties[$var]) &&
-				!empty($classProperties[$var]) &&
+				! empty($classProperties[$var]) &&
 				is_array($this->{$var}) &&
 				$this->{$var} != $classProperties[$var]
 			) {

lib/Cake/I18n/I18n.php

Doc Comments +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
  * @param string $plural Plural string (if any)
  * @param string $domain Domain The domain of the translation. Domains are often used by plugin translations.
  *    If null, the default domain will be used.
- * @param string $category Category The integer value of the category to use.
+ * @param integer $category Category The integer value of the category to use.
  * @param integer $count Count Count is used with $plural to choose the correct plural form.
  * @param string $language Language to translate string to.
  *    If null it checks for language in session followed by Config.language configuration variable.

Spacing +38 added lines, -38 removed lines

@@ -108,7 +108,7 @@ 
  */
 	public static function getInstance() {
 		static $instance = array();
-		if (!$instance) {
+		if ( ! $instance) {
 			$instance[0] = new I18n();
 		}
 		return $instance[0];
@@ -152,7 +152,7 @@ 
 			}
 		}
 
-		if (($_this->_lang && $_this->_lang !== $language) || !$_this->_lang) {
+		if (($_this->_lang && $_this->_lang !== $language) || ! $_this->_lang) {
 			$lang = $_this->l10n->get($language);
 			$_this->_lang = $lang;
 		}
@@ -164,13 +164,13 @@ 
 			throw new CakeException(__d('cake_dev', 'You cannot use "" as a domain.'));
 		}
 
-		$_this->domain = $domain . '_' . $_this->l10n->lang;
+		$_this->domain = $domain.'_'.$_this->l10n->lang;
 
-		if (!isset($_this->_domains[$domain][$_this->_lang])) {
+		if ( ! isset($_this->_domains[$domain][$_this->_lang])) {
 			$_this->_domains[$domain][$_this->_lang] = Cache::read($_this->domain, '_cake_core_');
 		}
 
-		if (!isset($_this->_domains[$domain][$_this->_lang][$_this->category])) {
+		if ( ! isset($_this->_domains[$domain][$_this->_lang][$_this->category])) {
 			$_this->_bindTextDomain($domain);
 			Cache::write($_this->domain, $_this->_domains[$domain][$_this->_lang], '_cake_core_');
 		}
@@ -179,9 +179,9 @@ 
 			return $_this->_translateTime($singular, $domain);
 		}
 
-		if (!isset($count)) {
+		if ( ! isset($count)) {
 			$plurals = 0;
-		} elseif (!empty($_this->_domains[$domain][$_this->_lang][$_this->category]["%plural-c"]) && $_this->_noLocale === false) {
+		} elseif ( ! empty($_this->_domains[$domain][$_this->_lang][$_this->category]["%plural-c"]) && $_this->_noLocale === false) {
 			$header = $_this->_domains[$domain][$_this->_lang][$_this->category]["%plural-c"];
 			$plurals = $_this->_pluralGuess($header, $count);
 		} else {
@@ -192,7 +192,7 @@ 
 			}
 		}
 
-		if (!empty($_this->_domains[$domain][$_this->_lang][$_this->category][$singular])) {
+		if ( ! empty($_this->_domains[$domain][$_this->_lang][$_this->category][$singular])) {
 			if (($trans = $_this->_domains[$domain][$_this->_lang][$_this->category][$singular]) || ($plurals) && ($trans = $_this->_domains[$domain][$_this->_lang][$_this->category][$plural])) {
 				if (is_array($trans)) {
 					if (isset($trans[$plurals])) {
@@ -200,7 +200,7 @@ 
 					} else {
 						trigger_error(
 							__d('cake_dev',
-								'Missing plural form translation for "%s" in "%s" domain, "%s" locale. ' .
+								'Missing plural form translation for "%s" in "%s" domain, "%s" locale. '.
 								' Check your po file for correct plurals and valid Plural-Forms header.',
 								$singular,
 								$domain,
@@ -217,7 +217,7 @@ 
 			}
 		}
 
-		if (!empty($plurals)) {
+		if ( ! empty($plurals)) {
 			return $plural;
 		}
 		return $singular;
@@ -251,7 +251,7 @@ 
  * @return integer plural match
  */
 	protected function _pluralGuess($header, $n) {
-		if (!is_string($header) || $header === "nplurals=1;plural=0;" || !isset($header[0])) {
+		if ( ! is_string($header) || $header === "nplurals=1;plural=0;" || ! isset($header[0])) {
 			return 0;
 		}
 
@@ -305,11 +305,11 @@ 
 		$searchPaths = App::path('locales');
 		$plugins = CakePlugin::loaded();
 
-		if (!empty($plugins)) {
+		if ( ! empty($plugins)) {
 			foreach ($plugins as $plugin) {
 				$pluginDomain = Inflector::underscore($plugin);
 				if ($pluginDomain === $domain) {
-					$searchPaths[] = CakePlugin::path($plugin) . 'Locale' . DS;
+					$searchPaths[] = CakePlugin::path($plugin).'Locale'.DS;
 					$searchPaths = array_reverse($searchPaths);
 					break;
 				}
@@ -318,7 +318,7 @@ 
 
 		foreach ($searchPaths as $directory) {
 			foreach ($this->l10n->languagePath as $lang) {
-				$localeDef = $directory . $lang . DS . $this->category;
+				$localeDef = $directory.$lang.DS.$this->category;
 				if (is_file($localeDef)) {
 					$definitions = self::loadLocaleDefinition($localeDef);
 					if ($definitions !== false) {
@@ -329,14 +329,14 @@ 
 				}
 
 				if ($core) {
-					$app = $directory . $lang . DS . $this->category . DS . 'core';
+					$app = $directory.$lang.DS.$this->category.DS.'core';
 					$translations = false;
 
-					if (is_file($app . '.mo')) {
-						$translations = self::loadMo($app . '.mo');
+					if (is_file($app.'.mo')) {
+						$translations = self::loadMo($app.'.mo');
 					}
-					if ($translations === false && is_file($app . '.po')) {
-						$translations = self::loadPo($app . '.po');
+					if ($translations === false && is_file($app.'.po')) {
+						$translations = self::loadPo($app.'.po');
 					}
 
 					if ($translations !== false) {
@@ -347,14 +347,14 @@ 
 					}
 				}
 
-				$file = $directory . $lang . DS . $this->category . DS . $domain;
+				$file = $directory.$lang.DS.$this->category.DS.$domain;
 				$translations = false;
 
-				if (is_file($file . '.mo')) {
-					$translations = self::loadMo($file . '.mo');
+				if (is_file($file.'.mo')) {
+					$translations = self::loadMo($file.'.mo');
 				}
-				if ($translations === false && is_file($file . '.po')) {
-					$translations = self::loadPo($file . '.po');
+				if ($translations === false && is_file($file.'.po')) {
+					$translations = self::loadPo($file.'.po');
 				}
 
 				if ($translations !== false) {
@@ -411,7 +411,7 @@ 
 			$header = unpack('L1magic/L1version/L1count/L1o_msg/L1o_trn', $header);
 			extract($header);
 
-			if ((dechex($magic) === '950412de' || dechex($magic) === 'ffffffff950412de') && !$version) {
+			if ((dechex($magic) === '950412de' || dechex($magic) === 'ffffffff950412de') && ! $version) {
 				for ($n = 0; $n < $count; $n++) {
 					$r = unpack("L1len/L1offs", substr($data, $o_msg + $n * 8, 8));
 					$msgid = substr($data, $r["offs"], $r["len"]);
@@ -429,7 +429,7 @@ 
 					$translations[$msgid] = $msgstr;
 
 					if (isset($msgid_plural)) {
-						$translations[$msgid_plural] =& $translations[$msgid];
+						$translations[$msgid_plural] = & $translations[$msgid];
 					}
 				}
 			}
@@ -446,7 +446,7 @@ 
  * @return mixed Array of translations on success or false on failure
  */
 	public static function loadPo($filename) {
-		if (!$file = fopen($filename, 'r')) {
+		if ( ! $file = fopen($filename, 'r')) {
 			return false;
 		}
 
@@ -492,10 +492,10 @@ 
 				$type = 7;
 			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && $type == 7 && $translationKey) {
 				$translations[$translationKey][$plural] .= stripcslashes($regs[1]);
-			} elseif (preg_match("/msgstr[[:space:]]+\"(.+)\"$/i", $line, $regs) && $type == 2 && !$translationKey) {
+			} elseif (preg_match("/msgstr[[:space:]]+\"(.+)\"$/i", $line, $regs) && $type == 2 && ! $translationKey) {
 				$header .= stripcslashes($regs[1]);
 				$type = 5;
-			} elseif (preg_match("/msgstr[[:space:]]+\"\"$/i", $line, $regs) && !$translationKey) {
+			} elseif (preg_match("/msgstr[[:space:]]+\"\"$/i", $line, $regs) && ! $translationKey) {
 				$header = '';
 				$type = 5;
 			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && $type == 5) {
@@ -506,7 +506,7 @@ 
 				$translationKey = '';
 				$plural = 0;
 			}
-		} while (!feof($file));
+		} while ( ! feof($file));
 		fclose($file);
 
 		$merge[''] = $header;
@@ -520,7 +520,7 @@ 
  * @return mixed Array of definitions on success or false on failure
  */
 	public static function loadLocaleDefinition($filename) {
-		if (!$file = fopen($filename, 'r')) {
+		if ( ! $file = fopen($filename, 'r')) {
 			return false;
 		}
 
@@ -549,7 +549,7 @@ 
 				$currentToken = $parts[0];
 				$value = $parts[1];
 			} elseif ($count === 1) {
-				$value = is_array($value) ? $parts[0] : $value . $parts[0];
+				$value = is_array($value) ? $parts[0] : $value.$parts[0];
 			} else {
 				continue;
 			}
@@ -560,7 +560,7 @@ 
 				continue;
 			}
 
-			$mustEscape = array($escape . ',', $escape . ';', $escape . '<', $escape . '>', $escape . $escape);
+			$mustEscape = array($escape.',', $escape.';', $escape.'<', $escape.'>', $escape.$escape);
 			$replacements = array_map('crc32', $mustEscape);
 			$value = str_replace($mustEscape, $replacements, $value);
 			$value = explode(';', $value);
@@ -589,12 +589,12 @@ 
  */
 	protected function _parseLiteralValue($string) {
 		$string = $string[1];
-		if (substr($string, 0, 2) === $this->_escape . 'x') {
-			$delimiter = $this->_escape . 'x';
+		if (substr($string, 0, 2) === $this->_escape.'x') {
+			$delimiter = $this->_escape.'x';
 			return implode('', array_map('chr', array_map('hexdec', array_filter(explode($delimiter, $string)))));
 		}
-		if (substr($string, 0, 2) === $this->_escape . 'd') {
-			$delimiter = $this->_escape . 'd';
+		if (substr($string, 0, 2) === $this->_escape.'d') {
+			$delimiter = $this->_escape.'d';
 			return implode('', array_map('chr', array_filter(explode($delimiter, $string))));
 		}
 		if ($string[0] === $this->_escape && isset($string[1]) && is_numeric($string[1])) {
@@ -619,7 +619,7 @@ 
  * @return mixed translated format string if only value or array of translated strings for corresponding format.
  */
 	protected function _translateTime($format, $domain) {
-		if (!empty($this->_domains[$domain][$this->_lang]['LC_TIME'][$format])) {
+		if ( ! empty($this->_domains[$domain][$this->_lang]['LC_TIME'][$format])) {
 			if (($trans = $this->_domains[$domain][$this->_lang][$this->category][$format])) {
 				return $trans;
 			}

lib/Cake/I18n/L10n.php

Doc Comments +2 added lines, -2 removed lines

@@ -344,7 +344,7 @@ 
  * the method will get the settings from L10n::_setLanguage();
  *
  * @param string $language Language (if null will use DEFAULT_LANGUAGE if defined)
- * @return mixed
+ * @return string|null
  */
 	public function get($language = null) {
 		if ($language !== null) {
@@ -362,7 +362,7 @@ 
  * If $language is null it will use the L10n::$default if defined
  *
  * @param string $language Language (if null will use L10n::$default if defined)
- * @return mixed
+ * @return string|null
  */
 	protected function _setLanguage($language = null) {
 		$catalog = false;

Spacing +3 added lines, -3 removed lines

@@ -351,7 +351,7 @@ 
 			return $this->_setLanguage($language);
 		}
 
-		if (!$this->_autoLanguage()) {
+		if ( ! $this->_autoLanguage()) {
 			$this->_setLanguage();
 		}
 		return $this->lang;
@@ -370,7 +370,7 @@ 
 			$catalog = $this->catalog($language);
 		}
 
-		if (!$catalog && $this->default) {
+		if ( ! $catalog && $this->default) {
 			$language = $this->default;
 			$catalog = $this->catalog($language);
 		}
@@ -393,7 +393,7 @@ 
 		if ($this->default && $language !== $this->default) {
 			$catalog = $this->catalog($this->default);
 			$fallback = $catalog['localeFallback'];
-			if (!in_array($fallback, $this->languagePath)) {
+			if ( ! in_array($fallback, $this->languagePath)) {
 				$this->languagePath[] = $fallback;
 			}
 		}

lib/Cake/I18n/Multibyte.php

Doc Comments +4 added lines, -4 removed lines

@@ -135,7 +135,7 @@ 
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is false.
- * @return integer|boolean The portion of $haystack, or false if $needle is not found.
+ * @return string|false The portion of $haystack, or false if $needle is not found.
  */
 	public static function stristr($haystack, $needle, $part = false) {
 		$php = (PHP_VERSION < 5.3);
@@ -253,7 +253,7 @@ 
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|false The portion of $haystack. or false if $needle is not found.
  */
 	public static function strrchr($haystack, $needle, $part = false) {
 		$check = Multibyte::utf8($haystack);
@@ -313,7 +313,7 @@ 
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|false The portion of $haystack. or false if $needle is not found.
  */
 	public static function strrichr($haystack, $needle, $part = false) {
 		$check = Multibyte::strtoupper($haystack);
@@ -475,7 +475,7 @@ 
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is FALSE.
- * @return string|boolean The portion of $haystack, or true if $needle is not found.
+ * @return string|false The portion of $haystack, or true if $needle is not found.
  */
 	public static function strstr($haystack, $needle, $part = false) {
 		$php = (PHP_VERSION < 5.3);

Spacing +30 added lines, -30 removed lines

@@ -166,22 +166,22 @@ 
 						$found = true;
 					}
 				}
-				if (!$found) {
+				if ( ! $found) {
 					$parts[] = $haystack[$position];
 					unset($haystack[$position]);
 				}
 				$position++;
 			}
 
-			if ($found && $part && !empty($parts)) {
+			if ($found && $part && ! empty($parts)) {
 				return Multibyte::ascii($parts);
-			} elseif ($found && !empty($haystack)) {
+			} elseif ($found && ! empty($haystack)) {
 				return Multibyte::ascii($haystack);
 			}
 			return false;
 		}
 
-		if (!$php) {
+		if ( ! $php) {
 			return stristr($haystack, $needle, $part);
 		}
 		return stristr($haystack, $needle);
@@ -289,16 +289,16 @@ 
 				}
 			}
 
-			if (!$found && isset($haystack[$position])) {
+			if ( ! $found && isset($haystack[$position])) {
 				$parts[] = $haystack[$position];
 				unset($haystack[$position]);
 			}
 			$position++;
 		}
 
-		if ($found && $part && !empty($parts)) {
+		if ($found && $part && ! empty($parts)) {
 			return Multibyte::ascii($parts);
-		} elseif ($found && !empty($haystack)) {
+		} elseif ($found && ! empty($haystack)) {
 			return Multibyte::ascii($haystack);
 		}
 		return false;
@@ -351,16 +351,16 @@ 
 				}
 			}
 
-			if (!$found && isset($haystack[$position])) {
+			if ( ! $found && isset($haystack[$position])) {
 				$parts[] = $haystack[$position];
 				unset($haystack[$position]);
 			}
 			$position++;
 		}
 
-		if ($found && $part && !empty($parts)) {
+		if ($found && $part && ! empty($parts)) {
 			return Multibyte::ascii($parts);
-		} elseif ($found && !empty($haystack)) {
+		} elseif ($found && ! empty($haystack)) {
 			return Multibyte::ascii($haystack);
 		}
 		return false;
@@ -402,7 +402,7 @@ 
 						}
 					}
 
-					if (!$offset && isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
+					if ( ! $offset && isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
 						$matches[$needle[0]] = $matches[$needle[0]] - 1;
 					} elseif ($i === $needleCount) {
 						$found = true;
@@ -452,7 +452,7 @@ 
 						}
 					}
 
-					if (!$offset && isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
+					if ( ! $offset && isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
 						$matches[$needle[0]] = $matches[$needle[0]] - 1;
 					} elseif ($i === $needleCount) {
 						$found = true;
@@ -504,22 +504,22 @@ 
 						$found = true;
 					}
 				}
-				if (!$found) {
+				if ( ! $found) {
 					$parts[] = $haystack[$position];
 					unset($haystack[$position]);
 				}
 				$position++;
 			}
 
-			if ($found && $part && !empty($parts)) {
+			if ($found && $part && ! empty($parts)) {
 				return Multibyte::ascii($parts);
-			} elseif ($found && !empty($haystack)) {
+			} elseif ($found && ! empty($haystack)) {
 				return Multibyte::ascii($haystack);
 			}
 			return false;
 		}
 
-		if (!$php) {
+		if ( ! $php) {
 			return strstr($haystack, $needle, $part);
 		}
 		return strstr($haystack, $needle);
@@ -552,7 +552,7 @@ 
 				$matched = false;
 				$keys = self::_find($char, 'upper');
 
-				if (!empty($keys)) {
+				if ( ! empty($keys)) {
 					foreach ($keys as $key => $value) {
 						if ($keys[$key]['upper'] == $char && count($keys[$key]['lower'][0]) === 1) {
 							$lowerCase[] = $keys[$key]['lower'][0];
@@ -599,7 +599,7 @@ 
 				$keys = self::_find($char);
 				$keyCount = count($keys);
 
-				if (!empty($keys)) {
+				if ( ! empty($keys)) {
 					foreach ($keys as $key => $value) {
 						$matched = false;
 						$replace = 0;
@@ -650,7 +650,7 @@ 
 					}
 				}
 			}
-			if ($matched === false && !in_array($char, $replaced, true)) {
+			if ($matched === false && ! in_array($char, $replaced, true)) {
 				$upperCase[] = $char;
 			}
 		}
@@ -732,7 +732,7 @@ 
  * @return string
  */
 	public static function mimeEncode($string, $charset = null, $newline = "\r\n") {
-		if (!Multibyte::checkMultibyte($string) && strlen($string) < 75) {
+		if ( ! Multibyte::checkMultibyte($string) && strlen($string) < 75) {
 			return $string;
 		}
 
@@ -741,9 +741,9 @@ 
 		}
 		$charset = strtoupper($charset);
 
-		$start = '=?' . $charset . '?B?';
+		$start = '=?'.$charset.'?B?';
 		$end = '?=';
-		$spacer = $end . $newline . ' ' . $start;
+		$spacer = $end.$newline.' '.$start;
 
 		$length = 75 - strlen($start) - strlen($end);
 		$length = $length - ($length % 4);
@@ -752,7 +752,7 @@ 
 			$maxchars = floor(($length * 3) / 4);
 			$stringLength = strlen($string);
 			while ($stringLength > $maxchars) {
-				$i = (int)$maxchars;
+				$i = (int) $maxchars;
 				$test = ord($string[$i]);
 				while ($test >= 128 && $test <= 191) {
 					$i--;
@@ -766,9 +766,9 @@ 
 			$string = implode($spacer, $parts);
 		} else {
 			$string = chunk_split(base64_encode($string), $length, $spacer);
-			$string = preg_replace('/' . preg_quote($spacer) . '$/', '', $string);
+			$string = preg_replace('/'.preg_quote($spacer).'$/', '', $string);
 		}
-		return $start . $string . $end;
+		return $start.$string.$end;
 	}
 
 /**
@@ -828,21 +828,21 @@ 
  */
 	protected static function _find($char, $type = 'lower') {
 		$found = array();
-		if (!isset(self::$_codeRange[$char])) {
+		if ( ! isset(self::$_codeRange[$char])) {
 			$range = self::_codepoint($char);
 			if ($range === false) {
 				return null;
 			}
-			if (!Configure::configured('_cake_core_')) {
+			if ( ! Configure::configured('_cake_core_')) {
 				App::uses('PhpReader', 'Configure');
-				Configure::config('_cake_core_', new PhpReader(CAKE . 'Config' . DS));
+				Configure::config('_cake_core_', new PhpReader(CAKE.'Config'.DS));
 			}
-			Configure::load('unicode' . DS . 'casefolding' . DS . $range, '_cake_core_');
+			Configure::load('unicode'.DS.'casefolding'.DS.$range, '_cake_core_');
 			self::$_caseFold[$range] = Configure::read($range);
 			Configure::delete($range);
 		}
 
-		if (!self::$_codeRange[$char]) {
+		if ( ! self::$_codeRange[$char]) {
 			return null;
 		}
 		self::$_table = self::$_codeRange[$char];

lib/Cake/Log/CakeLog.php

Doc Comments +3 added lines, -3 removed lines

@@ -500,7 +500,7 @@ 
  * Convenience method to log error messages
  *
  * @param string $message log message
- * @param string|array $scope The scope(s) a log message is being created in.
+ * @param string $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
  * @return boolean Success
  */
@@ -512,7 +512,7 @@ 
  * Convenience method to log warning messages
  *
  * @param string $message log message
- * @param string|array $scope The scope(s) a log message is being created in.
+ * @param string $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
  * @return boolean Success
  */
@@ -548,7 +548,7 @@ 
  * Convenience method to log info messages
  *
  * @param string $message log message
- * @param string|array $scope The scope(s) a log message is being created in.
+ * @param string $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
  * @return boolean Success
  */

Spacing +8 added lines, -8 removed lines

@@ -186,7 +186,7 @@ 
  * @throws CakeLogException
  */
 	public static function config($key, $config) {
-		if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $key)) {
+		if ( ! preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $key)) {
 			throw new CakeLogException(__d('cake_dev', 'Invalid key name'));
 		}
 		if (empty($config['engine'])) {
@@ -310,7 +310,7 @@ 
 		if (empty(self::$_Collection)) {
 			self::_init();
 		}
-		if (!isset(self::$_Collection->{$streamName})) {
+		if ( ! isset(self::$_Collection->{$streamName})) {
 			throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
 		}
 		return self::$_Collection->enabled($streamName);
@@ -328,7 +328,7 @@ 
 		if (empty(self::$_Collection)) {
 			self::_init();
 		}
-		if (!isset(self::$_Collection->{$streamName})) {
+		if ( ! isset(self::$_Collection->{$streamName})) {
 			throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
 		}
 		self::$_Collection->enable($streamName);
@@ -347,7 +347,7 @@ 
 		if (empty(self::$_Collection)) {
 			self::_init();
 		}
-		if (!isset(self::$_Collection->{$streamName})) {
+		if ( ! isset(self::$_Collection->{$streamName})) {
 			throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
 		}
 		self::$_Collection->disable($streamName);
@@ -364,7 +364,7 @@ 
 		if (empty(self::$_Collection)) {
 			self::_init();
 		}
-		if (!empty(self::$_Collection->{$streamName})) {
+		if ( ! empty(self::$_Collection->{$streamName})) {
 			return self::$_Collection->{$streamName};
 		}
 		return false;
@@ -420,7 +420,7 @@ 
 		if (is_int($type) && isset(self::$_levels[$type])) {
 			$type = self::$_levels[$type];
 		}
-		if (is_string($type) && empty($scope) && !in_array($type, self::$_levels)) {
+		if (is_string($type) && empty($scope) && ! in_array($type, self::$_levels)) {
 			$scope = $type;
 		}
 		$logged = false;
@@ -436,7 +436,7 @@ 
 			if (isset($config['scopes'])) {
 				$scopes = $config['scopes'];
 			}
-			$inScope = (count(array_intersect((array)$scope, $scopes)) > 0);
+			$inScope = (count(array_intersect((array) $scope, $scopes)) > 0);
 			$correctLevel = in_array($type, $types);
 
 			if (
@@ -453,7 +453,7 @@ 
 				$logged = true;
 			}
 		}
-		if (!$logged) {
+		if ( ! $logged) {
 			self::_autoConfig();
 			self::stream('default')->write($type, $message);
 		}