diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cde41f8aa..0af4f7b89 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -63,11 +63,11 @@ Check the [cakephp-codesniffer](https://github.com/cakephp/cakephp-codesniffer) repository to setup the CakePHP standard. The README contains installation info for the sniff and phpcs. - # Additional Resources * [CakePHP coding standards](http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html) * [Existing issues](https://github.com/cakephp/cakephp/issues) +* [Development Roadmaps](https://github.com/cakephp/cakephp/wiki#roadmaps) * [General GitHub documentation](https://help.github.com/) * [GitHub pull request documentation](https://help.github.com/send-pull-requests/) * #cakephp IRC channel on freenode.org diff --git a/README.md b/README.md index 42d1193b0..343abce10 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,8 @@ Get Support! [GitHub Issues](https://github.com/cakephp/cakephp/issues) - Got issues? Please tell us! +[Roadmaps](https://github.com/cakephp/cakephp/wiki#roadmaps) - Want to contribute? Get involved! + [![Bake Status](https://secure.travis-ci.org/cakephp/cakephp.png?branch=master)](http://travis-ci.org/cakephp/cakephp) ![Cake Power](https://raw.github.com/cakephp/cakephp/master/lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif) diff --git a/app/Config/database.php.default b/app/Config/database.php.default index 47613acf1..01e3442c0 100644 --- a/app/Config/database.php.default +++ b/app/Config/database.php.default @@ -1,9 +1,5 @@ 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 => diff --git a/app/Config/email.php.default b/app/Config/email.php.default index 717a45860..6e784170b 100644 --- a/app/Config/email.php.default +++ b/app/Config/email.php.default @@ -1,9 +1,5 @@ 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', diff --git a/app/Console/cake.php b/app/Console/cake.php index 9c2751028..fa81cebb9 100644 --- a/app/Console/cake.php +++ b/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'; @@ -29,7 +30,7 @@ if (function_exists('ini_set')) { ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path')); } -if (!include ($dispatcher)) { +if (!include $dispatcher) { trigger_error('Could not locate CakePHP core files.', E_USER_ERROR); } unset($paths, $path, $dispatcher, $root, $ds); diff --git a/app/View/Pages/home.ctp b/app/View/Pages/home.ctp index 0e4ccb0f5..40e7967ec 100644 --- a/app/View/Pages/home.ctp +++ b/app/View/Pages/home.ctp @@ -144,7 +144,7 @@ if (isset($filePresent)): echo ''; echo __d('cake_dev', 'DebugKit is not installed. It will help you inspect and debug different aspects of your application.'); echo '
'; - echo __d('cake_dev', 'You can install it from %s', $this->Html->link('github', 'https://github.com/cakephp/debug_kit')); + echo __d('cake_dev', 'You can install it from %s', $this->Html->link('GitHub', 'https://github.com/cakephp/debug_kit')); echo ''; endif; ?> @@ -194,7 +194,7 @@ You can also add some CSS styles for your pages at: %s.',

-

+

@@ -203,24 +203,32 @@ You can also add some CSS styles for your pages at: %s.',

diff --git a/app/webroot/index.php b/app/webroot/index.php index 9e87e31d8..e4192dc58 100644 --- a/app/webroot/index.php +++ b/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; } @@ -89,11 +89,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) { if (function_exists('ini_set')) { ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path')); } - if (!include ('Cake' . DS . 'bootstrap.php')) { + if (!include 'Cake' . DS . 'bootstrap.php') { $failed = true; } } else { - if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) { + if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') { $failed = true; } } diff --git a/app/webroot/test.php b/app/webroot/test.php index bccfe2272..cbd0f02a8 100644 --- a/app/webroot/test.php +++ b/app/webroot/test.php @@ -79,11 +79,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) { if (function_exists('ini_set')) { ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path')); } - if (!include ('Cake' . DS . 'bootstrap.php')) { + if (!include 'Cake' . DS . 'bootstrap.php') { $failed = true; } } else { - if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) { + if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') { $failed = true; } } diff --git a/build.xml b/build.xml index 01d6e25e6..af2a1e288 100644 --- a/build.xml +++ b/build.xml @@ -145,9 +145,9 @@ php php - - + + php php diff --git a/lib/Cake/Cache/Cache.php b/lib/Cake/Cache/Cache.php index acbd5dc81..1836532e2 100644 --- a/lib/Cake/Cache/Cache.php +++ b/lib/Cake/Cache/Cache.php @@ -533,7 +533,7 @@ class Cache { * @throws CacheException */ public static function groupConfigs($group = null) { - if ($group == null) { + if ($group === null) { return self::$_groups; } if (isset(self::$_groups[$group])) { diff --git a/lib/Cake/Cache/Engine/FileEngine.php b/lib/Cake/Cache/Engine/FileEngine.php index 98f4aa9df..d7198e945 100644 --- a/lib/Cake/Cache/Engine/FileEngine.php +++ b/lib/Cake/Cache/Engine/FileEngine.php @@ -44,7 +44,7 @@ class FileEngine extends CacheEngine { * * - path = absolute path to cache directory, default => CACHE * - prefix = string prefix for filename, default => cake_ - * - lock = enable file locking on write, default => false + * - lock = enable file locking on write, default => true * - serialize = serialize the data, default => true * * @var array diff --git a/lib/Cake/Console/Command/AclShell.php b/lib/Cake/Console/Command/AclShell.php index 9291ee99d..7eebea40b 100644 --- a/lib/Cake/Console/Command/AclShell.php +++ b/lib/Cake/Console/Command/AclShell.php @@ -91,7 +91,7 @@ class AclShell extends AppShell { $this->args = null; return $this->DbConfig->execute(); } - require_once (APP . 'Config' . DS . 'database.php'); + require_once APP . 'Config' . DS . 'database.php'; if (!in_array($this->command, array('initdb'))) { $collection = new ComponentCollection(); diff --git a/lib/Cake/Console/Command/SchemaShell.php b/lib/Cake/Console/Command/SchemaShell.php index 121cba91c..1d5b8ce24 100644 --- a/lib/Cake/Console/Command/SchemaShell.php +++ b/lib/Cake/Console/Command/SchemaShell.php @@ -67,12 +67,12 @@ class SchemaShell extends AppShell { $name = $this->params['name'] = $splitName; } - if ($name && empty($this->params['file'])) { - $this->params['file'] = Inflector::underscore($name); - } - + $defaultFile = 'schema.php'; if (empty($this->params['file'])) { - $this->params['file'] = 'schema.php'; + $this->params['file'] = $defaultFile; + } + if ($name && $this->params['file'] === $defaultFile) { + $this->params['file'] = Inflector::underscore($name); } if (strpos($this->params['file'], '.php') === false) { $this->params['file'] .= '.php'; diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php index 27e1a0960..8ed2b2ea0 100644 --- a/lib/Cake/Console/Command/Task/ModelTask.php +++ b/lib/Cake/Console/Command/Task/ModelTask.php @@ -438,6 +438,8 @@ class ModelTask extends BakeTask { $guess = $methods['notEmpty']; } elseif ($metaData['type'] === 'integer') { $guess = $methods['numeric']; + } elseif ($metaData['type'] === 'float') { + $guess = $methods['numeric']; } elseif ($metaData['type'] === 'boolean') { $guess = $methods['boolean']; } elseif ($metaData['type'] === 'date') { diff --git a/lib/Cake/Console/Command/Task/TestTask.php b/lib/Cake/Console/Command/Task/TestTask.php index 3b8babf1f..5251ab233 100644 --- a/lib/Cake/Console/Command/Task/TestTask.php +++ b/lib/Cake/Console/Command/Task/TestTask.php @@ -295,7 +295,7 @@ class TestTask extends BakeTask { * * @param string $type The Type of object you are generating tests for eg. controller * @param string $class the Classname of the class the test is being generated for. - * @return string Real classname + * @return string Real class name */ public function getRealClassName($type, $class) { if (strtolower($type) === 'model' || empty($this->classTypes[$type])) { @@ -430,7 +430,7 @@ class TestTask extends BakeTask { } /** - * Add classname to the fixture list. + * Add class name to the fixture list. * Sets the app. or plugin.plugin_name. prefix. * * @param string $name Name of the Model class that a fixture might be required for. @@ -476,7 +476,7 @@ class TestTask extends BakeTask { } /** - * Generate a constructor code snippet for the type and classname + * Generate a constructor code snippet for the type and class name * * @param string $type The Type of object you are generating tests for eg. controller * @param string $fullClassName The Classname of the class the test is being generated for. @@ -504,7 +504,7 @@ class TestTask extends BakeTask { } /** - * Generate the uses() calls for a type & classname + * Generate the uses() calls for a type & class name * * @param string $type The Type of object you are generating tests for eg. controller * @param string $realType The package name for the class. diff --git a/lib/Cake/Console/Templates/skel/Config/bootstrap.php b/lib/Cake/Console/Templates/skel/Config/bootstrap.php index 99375397e..74028d8ee 100644 --- a/lib/Cake/Console/Templates/skel/Config/bootstrap.php +++ b/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 diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php index b867453ae..1bb1f5a85 100644 --- a/lib/Cake/Console/Templates/skel/Config/core.php +++ b/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')` * diff --git a/lib/Cake/Console/Templates/skel/Config/database.php.default b/lib/Cake/Console/Templates/skel/Config/database.php.default index a124e9ddd..4b679f473 100644 --- a/lib/Cake/Console/Templates/skel/Config/database.php.default +++ b/lib/Cake/Console/Templates/skel/Config/database.php.default @@ -1,9 +1,5 @@ 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 { diff --git a/lib/Cake/Console/Templates/skel/Console/cake.php b/lib/Cake/Console/Templates/skel/Console/cake.php index dc48cb9e9..9499f8478 100644 --- a/lib/Cake/Console/Templates/skel/Console/cake.php +++ b/lib/Cake/Console/Templates/skel/Console/cake.php @@ -29,7 +29,7 @@ if (function_exists('ini_set')) { ini_set('include_path', $root . PATH_SEPARATOR . __CAKE_PATH__ . PATH_SEPARATOR . ini_get('include_path')); } -if (!include ($dispatcher)) { +if (!include $dispatcher) { trigger_error('Could not locate CakePHP core files.', E_USER_ERROR); } unset($paths, $path, $dispatcher, $root, $ds); diff --git a/lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp b/lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp index 72047d40f..eaf6caf98 100644 --- a/lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp +++ b/lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp @@ -14,9 +14,9 @@ Html->charset(); ?> <?php echo $page_title; ?> - + - +