Skip to content

Commit

Permalink
Shortened line length of trigger_error calls and improved @param of w…
Browse files Browse the repository at this point in the history
…rite()

http://www.phpdoc.org/docs/latest/for-users/phpdoc/tags/param.html
> The @param tag MAY have a multi-line description and does not need explicit delimiting.
  • Loading branch information
ravage84 committed Aug 15, 2013
1 parent 6bec7a3 commit 64f4adf
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions lib/Cake/Core/Configure.php
Expand Up @@ -70,7 +70,11 @@ public static function bootstrap($boot = true) {
self::_appDefaults();

if (!include APP . 'Config' . DS . 'core.php') {
trigger_error(__d('cake_dev', "Can't find application core file. Please create %s, and make sure it is readable by PHP.", APP . 'Config' . DS . 'core.php'), E_USER_ERROR);
trigger_error(__d('cake_dev',
"Can't find application core file. Please create %s, and make sure it is readable by PHP.",
APP . 'Config' . DS . 'core.php'),
E_USER_ERROR
);
}
App::init();
App::$bootstrapping = false;
Expand All @@ -86,7 +90,11 @@ public static function bootstrap($boot = true) {
self::_setErrorHandlers($error, $exception);

if (!include APP . 'Config' . DS . 'bootstrap.php') {
trigger_error(__d('cake_dev', "Can't find application bootstrap file. Please create %s, and make sure it is readable by PHP.", APP . 'Config' . DS . 'bootstrap.php'), E_USER_ERROR);
trigger_error(__d('cake_dev',
"Can't find application bootstrap file. Please create %s, and make sure it is readable by PHP.",
APP . 'Config' . DS . 'bootstrap.php'),
E_USER_ERROR
);
}
restore_error_handler();

Expand Down Expand Up @@ -136,7 +144,8 @@ protected static function _appDefaults() {
* }}}
*
* @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::write
* @param array $config Name of var to write
* @param string|array $config The key to write, can be a dot notation value.
* Alternatively can be an array containing key(s) and value(s).
* @param mixed $value Value to set for var
* @return boolean True if write was successful
*/
Expand Down

0 comments on commit 64f4adf

Please sign in to comment.