Skip to content

Commit

Permalink
Fixing incorrect doc blocks regarding error handler.
Browse files Browse the repository at this point in the history
  • Loading branch information
majna committed Oct 23, 2011
1 parent 205d755 commit a9dbde0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/Config/core.php
Expand Up @@ -65,7 +65,7 @@
* - `handler` - callback - The callback to handle exceptions. You can set this to any callback type,
* including anonymous functions.
* - `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/Error. This class needs to implement a render method.
* 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?
*
* @see ErrorHandler for more information on exception handling and configuration.
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Console/Templates/skel/Config/core.php
Expand Up @@ -65,7 +65,7 @@
* - `handler` - callback - The callback to handle exceptions. You can set this to any callback type,
* including anonymous functions.
* - `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/Error. This class needs to implement a render method.
* 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?
*
* @see ErrorHandler for more information on exception handling and configuration.
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Error/ErrorHandler.php
Expand Up @@ -60,7 +60,7 @@
*
* If you don't want to take control of the exception handling, but want to change how exceptions are
* rendered you can use `Exception.renderer` to choose a class to render exception pages. By default
* `ExceptionRenderer` is used. Your custom exception renderer class should be placed in app/Error.
* `ExceptionRenderer` is used. Your custom exception renderer class should be placed in app/Lib/Error.
*
* Your custom renderer should expect an exception in its constructor, and implement a render method.
* Failing to do so will cause additional errors.
Expand Down Expand Up @@ -100,7 +100,7 @@ class ErrorHandler {
/**
* Set as the default exception handler by the CakePHP bootstrap process.
*
* This will either use an AppError class if your application has one,
* This will either use custom exception renderer class if configured,
* or use the default ExceptionRenderer.
*
* @param Exception $exception
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Error/exceptions.php
Expand Up @@ -426,7 +426,7 @@ class ConfigureException extends CakeException { }

/**
* Exception class for Socket. This exception will be thrown from CakeSocket, CakeEmail, HttpSocket
* SmtpTransport and HttpResponse when it encounters an error.
* SmtpTransport, MailTransport and HttpResponse when it encounters an error.
*
* @package Cake.Error
*/
Expand Down

0 comments on commit a9dbde0

Please sign in to comment.