Renamed to to be consistent

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 79ecbb8..dfab421 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -335,7 +335,7 @@ Finalize headers.
 
 sub finalize_headers { }
 
-=item $c->handler( $class, $r )
+=item $c->handler( $class, $engine )
 
 Handles the request.
 
@@ -391,7 +391,7 @@ into a Catalyst context .
 =cut
 
 sub prepare {
-    my ( $class, $r ) = @_;
+    my ( $class, $engine ) = @_;
 
     my $c = bless {
         request => Catalyst::Request->new(
@@ -420,7 +420,7 @@ sub prepare {
         $c->res->headers->header( 'X-Catalyst' => $Catalyst::VERSION );
     }
 
-    $c->prepare_request($r);
+    $c->prepare_request($engine);
     $c->prepare_path;
     $c->prepare_headers;
     $c->prepare_cookies;

diff --git a/t/lib/TestApp/Controller/Action.pm b/t/lib/TestApp/Controller/Action.pm
index a254321..b745e82 100644 (file)
--- a/t/lib/TestApp/Controller/Action.pm
+++ b/t/lib/TestApp/Controller/Action.pm
@@ -7,8 +7,6 @@ sub begin : Private {
     my ( $self, $c ) = @_;
     $c->res->header( 'X-Test-Class'  => ref($self) );
     $c->response->content_type('text/plain; charset=utf-8');
-    
-    return 1;
 }
 
 sub default : Private {