From 94e58117fe18161a7ee8a0e69798c0379df79244 Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 6 Aug 2012 23:50:03 -0400 Subject: [PATCH] Add default configuration files. Add default config files for email and datasources. Both config() methods are still not implemented. --- App/Config/bootstrap.php | 20 +++++- App/Config/datasources.default.php | 82 +++++++++++++++++++++ App/Config/datasources.php | 0 App/Config/email.php.default | 111 +++++++++++------------------ 4 files changed, 143 insertions(+), 70 deletions(-) create mode 100644 App/Config/datasources.default.php delete mode 100644 App/Config/datasources.php diff --git a/App/Config/bootstrap.php b/App/Config/bootstrap.php index 2070afc72f9..fc7e59f8d57 100644 --- a/App/Config/bootstrap.php +++ b/App/Config/bootstrap.php @@ -33,6 +33,9 @@ /** * Configure the App and debug values. + * + * You won't be able to load application classes + * until after the autoloader is configured in app.php */ require __DIR__ . '/app.php'; @@ -46,10 +49,25 @@ */ require __DIR__ . '/error.php'; +/** + * Load email configuration. + * + * Create and uncomment this file to use pre-configured + * email defaults. + * + * See App/Config/email.default.php for a template + */ +// require __DIR__ . '/email.php'; + /** * Load datasource connections. + * + * Create and uncomment this file to use datasource + * connections. + * + * See App/Config/datasources.default.php for a template. */ -require __DIR__ . '/datasources.php'; +// require __DIR__ . '/datasources.php'; /** * Load logging configuration. diff --git a/App/Config/datasources.default.php b/App/Config/datasources.default.php new file mode 100644 index 00000000000..940bb24b91f --- /dev/null +++ b/App/Config/datasources.default.php @@ -0,0 +1,82 @@ + 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 + * + * 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', + * + * persistent => true / false + * Determines whether or not the database should use a persistent connection + * + * host => + * the host you connect to the database. To add a socket or port number, use 'port' => # + * + * prefix => + * Uses the given prefix for all the tables in this database. This setting can be overridden + * on a per-table basis with the Model::$tablePrefix property. + * + * schema => + * For Postgres specifies which schema you would like to use the tables in. Postgres defaults to 'public'. + * + * encoding => + * For MySQL, Postgres specifies the character encoding to use when connecting to the + * database. Uses database default not specified. + * + * unix_socket => + * For MySQL to connect via socket specify the `unix_socket` parameter instead of `host` and `port` + */ + +/** + * Create the default connection, this is the conventional default connection used + * by all models. + */ +ConnectionManager::config('default', [ + 'datasource' => 'Database/Mysql', + 'persistent' => false, + 'host' => 'localhost', + 'login' => 'user', + 'password' => 'password', + 'database' => 'database_name', + 'prefix' => '', + //'encoding' => 'utf8', +]); + +/** + * Create a test connection. This connection is used + * while running unit and integration tests. + */ +ConnectionManager::config('test', [ + 'datasource' => 'Database/Mysql', + 'persistent' => false, + 'host' => 'localhost', + 'login' => 'user', + 'password' => 'password', + 'database' => 'test_database_name', + 'prefix' => '', + //'encoding' => 'utf8', +]); diff --git a/App/Config/datasources.php b/App/Config/datasources.php deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/App/Config/email.php.default b/App/Config/email.php.default index 971471e28aa..fdc6f23adac 100644 --- a/App/Config/email.php.default +++ b/App/Config/email.php.default @@ -1,11 +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', @@ -40,60 +32,41 @@ namespace App\Config; * * from => * The origin email. See Cake\Network\Email\Email::from() about the valid values - * */ -class EmailConfig { - - public $default = array( - 'transport' => 'Mail', - 'from' => 'you@localhost', - //'charset' => 'utf-8', - //'headerCharset' => 'utf-8', - ); - - public $smtp = array( - 'transport' => 'Smtp', - 'from' => array('site@localhost' => 'My Site'), - 'host' => 'localhost', - 'port' => 25, - 'timeout' => 30, - 'username' => 'user', - 'password' => 'secret', - 'client' => null, - 'log' => false, - //'charset' => 'utf-8', - //'headerCharset' => 'utf-8', - ); - - public $fast = array( - 'from' => 'you@localhost', - 'sender' => null, - 'to' => null, - 'cc' => null, - 'bcc' => null, - 'replyTo' => null, - 'readReceipt' => null, - 'returnPath' => null, - 'messageId' => true, - 'subject' => null, - 'message' => null, - 'headers' => null, - 'viewRender' => null, - 'template' => false, - 'layout' => false, - 'viewVars' => null, - 'attachments' => null, - 'emailFormat' => null, - 'transport' => 'Smtp', - 'host' => 'localhost', - 'port' => 25, - 'timeout' => 30, - 'username' => 'user', - 'password' => 'secret', - 'client' => null, - 'log' => true, - //'charset' => 'utf-8', - //'headerCharset' => 'utf-8', - ); +Email::config('default', [ + 'transport' => 'Mail', + 'from' => 'you@localhost', + //'charset' => 'utf-8', + //'headerCharset' => 'utf-8', +]); -} +Email::config('smtp', [ + 'transport' => 'Smtp', + 'host' => 'localhost', + 'port' => 25, + 'timeout' => 30, + 'username' => 'user', + 'password' => 'secret', + 'client' => null, + 'from' => ['site@localhost' => 'My Site'], + 'sender' => null, + 'to' => null, + 'cc' => null, + 'bcc' => null, + 'replyTo' => null, + 'readReceipt' => null, + 'returnPath' => null, + 'messageId' => true, + 'subject' => null, + 'message' => null, + 'headers' => null, + 'viewRender' => null, + 'template' => false, + 'layout' => false, + 'viewVars' => null, + 'attachments' => null, + 'emailFormat' => null, + 'log' => true, + //'charset' => 'utf-8', + //'headerCharset' => 'utf-8', +]);