Sync skel and app directories.

Closes #1698

app/Config/database.php.default

@@ -1,9 +1,5 @@
 <?php
 /**
- * This is core configuration file.
- *
- * Use it to configure core behaviour of CakePHP.
- *
  * PHP 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@@ -18,15 +14,18 @@
  * @package       app.Config
  * @since         CakePHP(tm) v 0.2.9
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- *
+ */
+
+/**
  * Database configuration class.
+ *
  * You can specify multiple configurations for production, development and testing.
  *
  * datasource => The name of a supported datasource; valid options are as follows:
- *		Database/Mysql 		- MySQL 4 & 5,
- *		Database/Sqlite		- SQLite (PHP5 only),
- *		Database/Postgres	- PostgreSQL 7 and higher,
- *		Database/Sqlserver	- Microsoft SQL Server 2005 and higher
+ *  Database/Mysql - MySQL 4 & 5,
+ *  Database/Sqlite - SQLite (PHP5 only),
+ *  Database/Postgres - PostgreSQL 7 and higher,
+ *  Database/Sqlserver - Microsoft SQL Server 2005 and higher
  *
  * You can add custom database datasources (or override existing datasources) by adding the
  * appropriate file to app/Model/Datasource/Database. Datasources should be named 'MyDatasource.php',
@@ -43,7 +42,8 @@
  * on a per-table basis with the Model::$tablePrefix property.
  *
  * schema =>
- * For Postgres/Sqlserver specifies which schema you would like to use the tables in. Postgres defaults to 'public'. For Sqlserver, it defaults to empty and use
+ * For Postgres/Sqlserver specifies which schema you would like to use the tables in.
+ * Postgres defaults to 'public'. For Sqlserver, it defaults to empty and use
  * the connected user's default schema (typically 'dbo').
  *
  * encoding =>

app/Config/email.php.default

@@ -1,9 +1,5 @@
 <?php
 /**
- * This is email configuration file.
- *
- * Use it to configure email transports of CakePHP.
- *
  * PHP 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@@ -18,14 +14,20 @@
  * @package       app.Config
  * @since         CakePHP(tm) v 2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+/**
+ * This is email configuration file.
+ *
+ * Use it to configure email transports of CakePHP.
  *
  * Email configuration class.
  * You can specify multiple configurations for production, development and testing.
  *
  * transport => The name of a supported transport; valid options are as follows:
- *		Mail 		- Send using PHP mail function
- *		Smtp		- Send using SMTP
- *		Debug		- Do not send the email, just return the result
+ *  Mail - Send using PHP mail function
+ *  Smtp - Send using SMTP
+ *  Debug - Do not send the email, just return the result
  *
  * You can add custom transports (or override existing transports) by adding the
  * appropriate file to app/Network/Email. Transports should be named 'YourTransport.php',

app/Console/cake.php

@@ -18,6 +18,7 @@
  * @since         CakePHP(tm) v 2.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 $ds = DIRECTORY_SEPARATOR;
 $dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
 

app/webroot/index.php

@@ -78,7 +78,7 @@ if (!defined('WWW_ROOT')) {
 }
 
 // for built-in server
-if (php_sapi_name() == 'cli-server') {
+if (php_sapi_name() === 'cli-server') {
 	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
 		return false;
 	}

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

@@ -45,7 +45,7 @@ Cache::config('default', array('engine' => 'File'));
  */
 
 /**
- * Custom Inflector rules, can be set to correctly pluralize or singularize table, model, controller names or whatever other
+ * Custom Inflector rules can be set to correctly pluralize or singularize table, model, controller names or whatever other
  * string is passed to the inflection functions
  *
  * Inflector::rules('singular', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
@@ -55,7 +55,7 @@ Cache::config('default', array('engine' => 'File'));
 
 /**
  * Plugins need to be loaded manually, you can either load them one by one or all of them in a single call
- * Uncomment one of the lines below, as you need. make sure you read the documentation on CakePlugin to use more
+ * Uncomment one of the lines below, as you need. Make sure you read the documentation on CakePlugin to use more
  * advanced ways of loading plugins
  *
  * CakePlugin::loadAll(); // Loads all plugins at once
@@ -64,7 +64,7 @@ Cache::config('default', array('engine' => 'File'));
  */
 
 /**
- * You can attach event listeners to the request lifecycle as Dispatcher Filter . By Default CakePHP bundles two filters:
+ * You can attach event listeners to the request lifecycle as Dispatcher Filter . By default CakePHP bundles two filters:
  *
  * - AssetDispatcher filter will serve your asset files (css, images, js, etc) from your themes and plugins
  * - CacheDispatcher filter will read the Cache.check configure variable and try to serve cached content generated from controllers

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

@@ -61,7 +61,7 @@
  * - `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?
-  * - `skipLog` - array - list of exceptions to skip for logging. Exceptions that
+ * - `skipLog` - array - list of exceptions to skip for logging. Exceptions that
  *   extend one of the listed exceptions will also be skipped for logging.
  *   Example: `'skipLog' => array('NotFoundException', 'UnauthorizedException')`
  *

lib/Cake/Console/Templates/skel/Config/database.php.default

@@ -1,9 +1,5 @@
 <?php
 /**
- * This is core configuration file.
- *
- * Use it to configure core behaviour of Cake.
- *
  * PHP 5
  *
  * @link          http://cakephp.org CakePHP(tm) Project
@@ -16,10 +12,10 @@
  * You can specify multiple configurations for production, development and testing.
  *
  * datasource => The name of a supported datasource; valid options are as follows:
- *		Database/Mysql		- MySQL 4 & 5,
- *		Database/Sqlite		- SQLite (PHP5 only),
- *		Database/Postgres	- PostgreSQL 7 and higher,
- *		Database/Sqlserver	- Microsoft SQL Server 2005 and higher
+ *  Database/Mysql - MySQL 4 & 5,
+ *  Database/Sqlite - SQLite (PHP5 only),
+ *  Database/Postgres - PostgreSQL 7 and higher,
+ *  Database/Sqlserver - Microsoft SQL Server 2005 and higher
  *
  * You can add custom database datasources (or override existing datasources) by adding the
  * appropriate file to app/Model/Datasource/Database. Datasources should be named 'MyDatasource.php',
@@ -45,6 +41,12 @@
  *
  * unix_socket =>
  * For MySQL to connect via socket specify the `unix_socket` parameter instead of `host` and `port`
+
+ * settings =>
+ * Array of key/value pairs, on connection it executes SET statements for each pair
+ * For MySQL : http://dev.mysql.com/doc/refman/5.6/en/set-statement.html
+ * For Postgres : http://www.postgresql.org/docs/9.2/static/sql-set.html
+ * For Sql Server : http://msdn.microsoft.com/en-us/library/ms190356.aspx
  */
 class DATABASE_CONFIG {
 

lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp

@@ -14,9 +14,9 @@
 <?php echo $this->Html->charset(); ?>
 <title><?php echo $page_title; ?></title>
 
-<?php if (Configure::read('debug') == 0) { ?>
+<?php if (Configure::read('debug') == 0): ?>
 <meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
-<?php } ?>
+<?php endif ?>
 <style><!--
 P { text-align:center; font:bold 1.1em sans-serif }
 A { color:#444; text-decoration:none }
@@ -26,4 +26,4 @@ A:HOVER { text-decoration: underline; color:#44E }
 <body>
 <p><a href="<?php echo $url; ?>"><?php echo $message; ?></a></p>
 </body>
-</html>
+</html>

lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp

@@ -1,14 +1,13 @@
 <?php
-if (!isset($channel)) {
+if (!isset($channel)):
 	$channel = array();
-}
-if (!isset($channel['title'])) {
+endif;
+if (!isset($channel['title'])):
 	$channel['title'] = $title_for_layout;
-}
+endif;
 
 echo $this->Rss->document(
 	$this->Rss->channel(
 		array(), $channel, $this->fetch('content')
 	)
 );
-?>