10:19 up 12 days, 17:45, 2 users, load averages: 1,26 1,41 1,32

USER     TTY      FROM              LOGIN@  IDLE WHAT
peg      console  -                27Dic12 12days -
peg      s000     -                10:16       - w

.editorconfig

@@ -0,0 +1,13 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = tab
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.bat]
+end_of_line = crlf

.travis.yml

@@ -10,6 +10,16 @@ env:
   - DB=pgsql
   - DB=sqlite
 
+matrix:
+  allow_failures:
+    - php: 5.4
+      env:
+        - PHPCS=1
+  include:
+    - php: 5.4
+      env:
+        - PHPCS=1
+
 before_script:
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test2;'; fi"
@@ -23,6 +33,9 @@ before_script:
     server.listen(80, 'localhost');
     console.log('TCP server listening on port 80 at localhost.');" > app/tmp/socket.js
   - sudo node ./app/tmp/socket.js &
+  - pear channel-discover pear.cakephp.org
+  - pear install --alldeps cakephp/CakePHP_CodeSniffer
+  - phpenv rehash
   - set +H
   - echo "<?php
     class DATABASE_CONFIG {
@@ -105,7 +118,7 @@ before_script:
     }" > app/Config/database.php
 
 script:
-  - ./lib/Cake/Console/cake test core AllTests --stderr
+  - sh -c "if [ '$PHPCS' != '1' ]; then ./lib/Cake/Console/cake test core AllTests --stderr; else phpcs --extensions=php --standard=CakePHP ./lib/Cake; fi"
 
 notifications:
   email: false

app/Config/Schema/i18n.php

@@ -19,14 +19,17 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+// @codingStandardsIgnoreStart
+
 /*
  *
  * Using the Schema command line utility
  * cake schema run create i18n
- *
  */
 class i18nSchema extends CakeSchema {
 
+// @codingStandardsIgnoreEnd
+
 	public $name = 'i18n';
 
 	public function before($event = array()) {

app/Config/core.php

@@ -42,7 +42,8 @@
  * Options:
  *
  * - `handler` - callback - The callback to handle errors. You can set this to any callable type,
- *    including anonymous functions.
+ *   including anonymous functions.
+ *   Make sure you add App::uses('MyHandler', 'Error'); when using a custom handler class
  * - `level` - int - The level of errors you are interested in capturing.
  * - `trace` - boolean - Include stack traces for errors in log files.
  *
@@ -64,6 +65,7 @@
  *
  * - `handler` - callback - The callback to handle exceptions. You can set this to any callback type,
  *   including anonymous functions.
+ *   Make sure you add App::uses('MyHandler', 'Error'); when using a custom handler class
  * - `renderer` - string - The class responsible for rendering uncaught exceptions.  If you choose a custom class you
  *   should place the file for that class in app/Lib/Error. This class needs to implement a render method.
  * - `log` - boolean - Should Exceptions be logged?

build.xml

@@ -40,6 +40,9 @@
 		<include name="cake" />
 	</fileset>
 
+	<fileset id="non-tests" dir="./lib/Cake">
+		<exclude name=".lib/Cake/Test" />
+	</fileset>
 
 	<!-- start fresh each time.  Remove the dist and build dirs -->
 	<target name="clean">
@@ -197,18 +200,51 @@
 	<!--
 		Upload to pirum pear channel.
 	-->
-	<target name="distribute" depends="prepare">
+	<target name="distribute" depends="prepare" description="Upload pear packages to pear.cakephp.org">
 		<echo msg="Uploading tgz file to cakephp.org" />
 		<exec command="scp ${dist.dir}/${pear.package}.tgz cakephp@cakephp.org:${pirum.dir}" dir="." checkreturn="true"  />
 
 		<echo msg="Adding new release to pirum" />
 		<exec command="ssh cakephp@cakephp.org pirum add ${pirum.dir} ${pirum.dir}/${pear.package}.tgz" checkreturn="true" />
 	</target>
 
+	<target name="codestyle" description="Check codestyle (human readable format)">
+		<phpcodesniffer
+			standard="CakePHP"
+			allowedFileExtensions="php">
+			<fileset refid="libs" />
+		</phpcodesniffer>
+	</target>
+
+	<target name="reports-ci">
+		<phpcodesniffer
+			standard="CakePHP"
+			allowedFileExtensions="php">
+			<fileset refid="libs" />
+			<formatter type="checkstyle" outfile="checkstyle.xml" />
+		</phpcodesniffer>
+		<phpcpd
+			minLines="4"
+			minTokens="50">
+			<fileset refid="libs" />
+			<formatter type="pmd" outfile="pmd-cpd.xml"/>
+		</phpcpd>
+		<phpdepend>
+			<fileset refid="non-tests" />
+			<logger type="jdepend-xml" outfile="jdepend.xml"/>
+		</phpdepend>
+		<phpmd rulesets="codesize,unusedcode,design">
+			<fileset refid="non-tests" />
+			<formatter type="xml" outfile="reports/pmd.html"/>
+		</phpmd>
+	</target>
+
 	<!--
 		Top level easy to type targets
 	-->
-	<target name="build" depends="generate-package" />
-	<target name="release" depends="release-commit,build,distribute" />
+	<target name="build" depends="generate-package" description="Generate a pear package" />
+	<target name="release" depends="release-commit,build,distribute" description="Release a new version of CakePHP" />
+	<target name="code-reports" depends="reports-ci"
+		description="Run the code reports, generating XML output for CI server use." />
 
 </project>

lib/Cake/Console/Command/ConsoleShell.php

@@ -238,7 +238,9 @@ public function main($command = null) {
 
 					if ($this->_isValidModel($modelToCheck)) {
 						$findCommand = "\$data = \$this->$command;";
+						//@codingStandardsIgnoreStart
 						@eval($findCommand);
+						//@codingStandardsIgnoreEnd
 
 						if (is_array($data)) {
 							foreach ($data as $idx => $results) {
@@ -294,7 +296,9 @@ public function main($command = null) {
 						list($foo, $data) = explode("->save", $command);
 						$data = preg_replace('/^\(*(array)?\(*(.+?)\)*$/i', '\\2', $data);
 						$saveCommand = "\$this->{$modelToSave}->save(array('{$modelToSave}' => array({$data})));";
+						//@codingStandardsIgnoreStart
 						@eval($saveCommand);
+						//@codingStandardsIgnoreEnd
 						$this->out(__d('cake_console', 'Saved record for %s', $modelToSave));
 					}
 				break;
@@ -304,7 +308,9 @@ public function main($command = null) {
 					if ($this->_isValidModel($modelToCheck)) {
 						// Get the column info for this model
 						$fieldsCommand = "\$data = \$this->{$modelToCheck}->getColumnTypes();";
+						//@codingStandardsIgnoreStart
 						@eval($fieldsCommand);
+						//@codingStandardsIgnoreEnd
 
 						if (is_array($data)) {
 							foreach ($data as $field => $type) {
@@ -326,7 +332,9 @@ public function main($command = null) {
 					$this->out(print_r(Hash::combine(Router::$routes, '{n}.template', '{n}.defaults'), true));
 				break;
 				case (preg_match("/^route\s+(\(.*\))$/i", $command, $tmp) == true):
+					//@codingStandardsIgnoreStart
 					if ($url = eval('return array' . $tmp[1] . ';')) {
+						//@codingStandardsIgnoreEnd
 						$this->out(Router::url($url));
 					}
 				break;
@@ -362,7 +370,9 @@ protected function _loadRoutes() {
 		Router::reload();
 		extract(Router::getNamedExpressions());
 
+		//@codingStandardsIgnoreStart
 		if (!@include APP . 'Config' . DS . 'routes.php') {
+			//@codingStandardsIgnoreEnd
 			return false;
 		}
 		CakePlugin::routes();

lib/Cake/Console/Command/Task/TemplateTask.php

@@ -78,7 +78,6 @@ protected function _findThemes() {
 
 		$paths[] = $core;
 
-		// TEMPORARY TODO remove when all paths are DS terminated
 		foreach ($paths as $i => $path) {
 			$paths[$i] = rtrim($path, DS) . DS;
 		}

lib/Cake/Console/Command/TestShell.php

@@ -114,7 +114,7 @@ public function getOptionParser() {
 		))->addOption('stop-on-failure', array(
 			'help' => __d('cake_console', 'Stop execution upon first failure.'),
 			'boolean' => true
-		))->addOption('stop-on-skipped ', array(
+		))->addOption('stop-on-skipped', array(
 			'help' => __d('cake_console', 'Stop execution upon first skipped test.'),
 			'boolean' => true
 		))->addOption('stop-on-incomplete', array(
@@ -132,7 +132,7 @@ public function getOptionParser() {
 		))->addOption('no-globals-backup', array(
 			'help' => __d('cake_console', 'Do not backup and restore $GLOBALS for each test.'),
 			'boolean' => true
-		))->addOption('static-backup ', array(
+		))->addOption('static-backup', array(
 			'help' => __d('cake_console', 'Backup and restore static attributes for each test.'),
 			'boolean' => true
 		))->addOption('syntax-check', array(

lib/Cake/Console/ConsoleOptionParser.php

@@ -345,6 +345,7 @@ public function addArgument($name, $params = array()) {
 			$arg = new ConsoleInputArgument($options);
 		}
 		$this->_args[$index] = $arg;
+		ksort($this->_args);
 		return $this;
 	}
 
@@ -584,7 +585,8 @@ protected function _parseOption($name, $params) {
 		$option = $this->_options[$name];
 		$isBoolean = $option->isBoolean();
 		$nextValue = $this->_nextToken();
-		if (!$isBoolean && !empty($nextValue) && !$this->_optionExists($nextValue)) {
+		$emptyNextValue = (empty($nextValue) && $nextValue !== '0');
+		if (!$isBoolean && !$emptyNextValue && !$this->_optionExists($nextValue)) {
 			array_shift($this->_tokens);
 			$value = $nextValue;
 		} elseif ($isBoolean) {
@@ -625,7 +627,7 @@ protected function _optionExists($name) {
  */
 	protected function _parseArg($argument, $args) {
 		if (empty($this->_args)) {
-			array_push($args, $argument);
+			$args[] = $argument;
 			return $args;
 		}
 		$next = count($args);
@@ -634,7 +636,7 @@ protected function _parseArg($argument, $args) {
 		}
 
 		if ($this->_args[$next]->validChoice($argument)) {
-			array_push($args, $argument);
+			$args[] = $argument;
 			return $args;
 		}
 	}

lib/Cake/Console/Shell.php

@@ -372,7 +372,9 @@ public function runCommand($command, $argv) {
 		if (!empty($this->params['quiet'])) {
 			$this->_useLogger(false);
 		}
-
+		if (!empty($this->params['plugin'])) {
+			CakePlugin::load($this->params['plugin']);
+		}
 		$this->command = $command;
 		if (!empty($this->params['help'])) {
 			return $this->_displayHelp($command);
@@ -686,7 +688,9 @@ public function createFile($path, $contents) {
 	protected function _checkUnitTest() {
 		if (class_exists('PHPUnit_Framework_TestCase')) {
 			return true;
+			//@codingStandardsIgnoreStart
 		} elseif (@include 'PHPUnit' . DS . 'Autoload.php') {
+			//@codingStandardsIgnoreEnd
 			return true;
 		} elseif (App::import('Vendor', 'phpunit', array('file' => 'PHPUnit' . DS . 'Autoload.php'))) {
 			return true;

lib/Cake/Console/ShellDispatcher.php

@@ -215,7 +215,7 @@ public function dispatch() {
 				return $Shell->main();
 			}
 		}
-		
+
 		throw new MissingShellMethodException(array('shell' => $shell, 'method' => $command));
 	}
 

lib/Cake/Console/Templates/skel/Config/Schema/i18n.php

@@ -21,14 +21,17 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+// @codingStandardsIgnoreStart
+
 /*
  *
  * Using the Schema command line utility
  * cake schema run create i18n
- *
  */
 class i18nSchema extends CakeSchema {
 
+// @codingStandardsIgnoreEnd
+
 	public $name = 'i18n';
 
 	public function before($event = array()) {

lib/Cake/Console/Templates/skel/Config/core.php

@@ -42,7 +42,8 @@
  * Options:
  *
  * - `handler` - callback - The callback to handle errors. You can set this to any callable type,
- *    including anonymous functions.
+ *   including anonymous functions.
+ *   Make sure you add App::uses('MyHandler', 'Error'); when using a custom handler class
  * - `level` - int - The level of errors you are interested in capturing.
  * - `trace` - boolean - Include stack traces for errors in log files.
  *
@@ -64,6 +65,7 @@
  *
  * - `handler` - callback - The callback to handle exceptions. You can set this to any callback type,
  *   including anonymous functions.
+ *   Make sure you add App::uses('MyHandler', 'Error'); when using a custom handler class
  * - `renderer` - string - The class responsible for rendering uncaught exceptions.  If you choose a custom class you
  *   should place the file for that class in app/Lib/Error. This class needs to implement a render method.
  * - `log` - boolean - Should Exceptions be logged?

lib/Cake/Controller/CakeErrorController.php

@@ -19,6 +19,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppController', 'Controller');
+
 /**
  * Error Handling Controller
  *
@@ -50,18 +52,18 @@ class CakeErrorController extends AppController {
  */
 	public function __construct($request = null, $response = null) {
 		parent::__construct($request, $response);
-		if (count(Router::extensions())) {
-			$this->components[] = 'RequestHandler';
-		}
 		$this->constructClasses();
+		if (count(Router::extensions()) &&
+			!$this->Components->attached('RequestHandler')
+		) {
+			$this->RequestHandler = $this->Components->load('RequestHandler');
+		}
 		if ($this->Components->enabled('Auth')) {
 			$this->Components->disable('Auth');
 		}
 		if ($this->Components->enabled('Security')) {
 			$this->Components->disable('Security');
 		}
-		$this->startupProcess();
-
 		$this->_set(array('cacheAction' => false, 'viewPath' => 'Errors'));
 	}
 

lib/Cake/Controller/Component/Acl/AclInterface.php

@@ -8,7 +8,7 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Controller.Component
+ * @package       Cake.Controller.Component.Acl
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -17,7 +17,7 @@
  * Access Control List interface.
  * Implementing classes are used by AclComponent to perform ACL checks in Cake.
  *
- * @package       Cake.Controller.Component
+ * @package       Cake.Controller.Component.Acl
  */
 interface AclInterface {