adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #144 from majna/2.0

Browse source 
Fix for exception messages and typos
This commit is contained in:
José Lorenzo Rodríguez 2011-07-07 11:26:32 -07:00
commit a69fccabf6
2 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/Cake/Error/exceptions.php
View file

@ -39,7 +39,7 @@ class BadRequestException extends HttpException {
* Constructor
*
* @param string $message If no message is given 'Bad Request' will be the message
* @param string $code Status code, defaults to 401
* @param string $code Status code, defaults to 400
*/
public function __construct($message = null, $code = 400) {
if (empty($message)) {
@ -79,7 +79,7 @@ class ForbiddenException extends HttpException {
* Constructor
*
* @param string $message If no message is given 'Forbidden' will be the message
* @param string $code Status code, defaults to 401
* @param string $code Status code, defaults to 403
*/
public function __construct($message = null, $code = 403) {
if (empty($message)) {
@ -119,7 +119,7 @@ class MethodNotAllowedException extends HttpException {
* Constructor
*
* @param string $message If no message is given 'Method Not Allowed' will be the message
* @param string $code Status code, defaults to 401
* @param string $code Status code, defaults to 405
*/
public function __construct($message = null, $code = 405) {
if (empty($message)) {
@ -138,8 +138,8 @@ class InternalErrorException extends HttpException {
/**
* Constructor
*
* @param string $message If no message is given 'Not Found' will be the message
* @param string $code Status code, defaults to 404
* @param string $message If no message is given 'Internal Server Error' will be the message
* @param string $code Status code, defaults to 500
*/
public function __construct($message = null, $code = 500) {
if (empty($message)) {
@ -228,7 +228,7 @@ class MissingActionException extends CakeException {
}
/**
* Private Action exception - used when a controller action
* is protected, or starts with a `_`.
* starts with a `_`.
*
* @package cake.libs
*/
@ -246,7 +246,7 @@ class PrivateActionException extends CakeException {
* @package cake.libs
*/
class MissingComponentFileException extends CakeException {
protected $_messageTemplate = 'Component File "%s" is missing.';
protected $_messageTemplate = 'Component file "%s" is missing.';
}
/**
@ -296,7 +296,7 @@ class MissingLayoutException extends CakeException {
* @package cake.libs
*/
class MissingHelperFileException extends CakeException {
protected $_messageTemplate = 'Helper File "%s" is missing.';
protected $_messageTemplate = 'Helper file "%s" is missing.';
}
/**
@ -364,7 +364,7 @@ class MissingShellClassException extends CakeException {
}
/**
* Used when a shell class cannot be found.
* Used when a shell file cannot be found.
*
* @package cake.libs
*/
@ -373,21 +373,21 @@ class MissingShellFileException extends CakeException {
}
/**
* Exception class to be thrown when a database file is not found
* Exception class to be thrown when a datasource configuration is not found
*
* @package cake.libs
*/
class MissingDatasourceConfigException extends CakeException {
protected $_messageTemplate = 'Database connection "%s" could not be loaded.';
protected $_messageTemplate = 'The datasource configuration "%s" was not found in database.php';
}
/**
* Exception class to be thrown when a database file is not found
* Exception class to be thrown when a datasource is not found
*
* @package cake.libs
*/
class MissingDatasourceFileException extends CakeException {
protected $_messageTemplate = 'Database connection "%s" could not be loaded.';
protected $_messageTemplate = 'Datasource "%s" was not found.';
}
/**
@ -400,7 +400,7 @@ class MissingTableException extends CakeException {
}
/**
* Exception Raised when a Model could not be found.
* Exception raised when a Model could not be found.
*
* @package cake.libs
*/
@ -409,7 +409,7 @@ class MissingModelException extends CakeException {
}
/**
* Exception Raised when a test loader could not be found
* Exception raised when a test loader could not be found
*
* @package cake.libs
*/
@ -418,7 +418,7 @@ class MissingTestLoaderException extends CakeException {
}
/**
* Exception Raised when a plugin could not be found
* Exception raised when a plugin could not be found
*
* @package cake.libs
*/
@ -468,7 +468,7 @@ class ConfigureException extends CakeException { }
/**
* Exception class for Socket. This exception will be thrown from CakeSocket, CakeEmail, HttpSocket
* and HttpResponse when it encounters an error.
* SmtpTransport and HttpResponse when it encounters an error.
*
* @package cake.libs
*/

16
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
View file

@ -507,6 +507,22 @@ class ExceptionRendererTest extends CakeTestCase {
),
500
),
array(
new MissingDatasourceConfigException(array('config' => 'default')),
array(
'/<h2>Missing Datasource Configuration<\/h2>/',
'/The datasource configuration <em>default<\/em> was not found in database.php/'
),
500
),
array(
new MissingDatasourceFileException(array('class' => 'MyDatasource', 'plugin' => 'MyPlugin')),
array(
'/<h2>Missing Datasource Class<\/h2>/',
'/Datasource class <em>MyDatasource<\/em> was not found/'
),
500
),
array(
new MissingHelperFileException(array('file' => 'MyCustomHelper.php', 'class' => 'MyCustomHelper')),
array(