X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=87fd4af386b664a6bad5762c4ae0dcddec036cd4;hb=83a8fcacf68e1063b5382835f2f9beb93f4bfe87;hp=1075c434cec1f59495a9516612fb1de87d1ca8ca;hpb=0f895006548490d5382421201b2f3f2f2406b7c6;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 1075c43..87fd4af 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -18,6 +18,19 @@ use URI; use Scalar::Util qw/weaken/; use attributes; +# For PAR +require Catalyst::Helper; +require Catalyst::PAR; +require Catalyst::Build; +require Catalyst::Test; + +require Catalyst::Engine::HTTP; +require Catalyst::Engine::CGI; + +require Catalyst::Controller; +require Catalyst::Model; +require Catalyst::View; + __PACKAGE__->mk_accessors( qw/counter request response state action stack namespace/ ); @@ -43,7 +56,7 @@ our $DETACH = "catalyst_detach\n"; require Module::Pluggable::Fast; # Helper script generation -our $CATALYST_SCRIPT_GEN = 12; +our $CATALYST_SCRIPT_GEN = 18; __PACKAGE__->mk_classdata($_) for qw/components arguments dispatcher engine log dispatcher_class @@ -54,7 +67,7 @@ __PACKAGE__->engine_class('Catalyst::Engine::CGI'); __PACKAGE__->request_class('Catalyst::Request'); __PACKAGE__->response_class('Catalyst::Response'); -our $VERSION = '5.56'; +our $VERSION = '5.57'; sub import { my ( $class, @arguments ) = @_; @@ -276,7 +289,9 @@ sub detach { my $c = shift; $c->dispatcher->detach( $c, @_ ) } =item $c->error($arrayref) -Returns an arrayref containing error messages. +Returns an arrayref containing error messages. If Catalyst encounters an +error while processing a request, it stores the error in $c->error. This +method should not be used to store non-fatal error messages. my @error = @{ $c->error }; @@ -284,7 +299,8 @@ Add a new error. $c->error('Something bad happened'); -Clear errors. +Clear errors. You probably don't want to clear the errors unless you are +implementing a custom error screen. $c->error(0);