Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add default configuration files.
Add default config files for email and datasources.
Both config() methods are still not implemented.
  • Loading branch information
markstory committed Sep 18, 2012
1 parent f17097c commit 94e5811
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 70 deletions.
20 changes: 19 additions & 1 deletion App/Config/bootstrap.php
Expand Up @@ -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';

Expand All @@ -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.
Expand Down
82 changes: 82 additions & 0 deletions App/Config/datasources.default.php
@@ -0,0 +1,82 @@
<?php
/**
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
* @package app.Config
* @since CakePHP(tm) v3.0.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
namespace App\Config;

use Cake\Model\ConnectionManager;

/**
* 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
*
* 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',
]);
Empty file removed App/Config/datasources.php
Empty file.
111 changes: 42 additions & 69 deletions App/Config/email.php.default
@@ -1,11 +1,5 @@
<?php
/**
* This is email configuration file.
*
* Use it to configure email transports of Cake.
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
Expand All @@ -20,80 +14,59 @@
*/
namespace App\Config;

use Cake\Network\Email\Email;
/**
* In this file you set up your send email details.
* Email configuration.
*
* @package cake.config
*/
/**
* 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',
* where 'Your' is the name of the transport.
*
* 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',
]);

0 comments on commit 94e5811

Please sign in to comment.