From: Henry Van Styn <vanstyn@intellitree.com>
Date: Sat, 8 Mar 2014 00:55:42 +0000 (-0500)
Subject: Moved setup_middleware() to after plugin setup block
X-Git-Tag: 5.90061~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=ac34e337f6bc778b8e5622d9c41fe70ca2056a3d

Moved setup_middleware() to after plugin setup block

After moving the plugin setup block back down to its pre 5.90052
location, the setup_middleware() call also needed to be moved, now after
that block and immediately before setup_components. All tests now seem
to pass.
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 6d77f40..76ea133 100755
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1133,7 +1133,6 @@ sub setup {
     $class->setup_log( delete $flags->{log} );
     $class->setup_plugins( delete $flags->{plugins} );
 
-    $class->setup_middleware();
     $class->setup_data_handlers();
     $class->setup_dispatcher( delete $flags->{dispatcher} );
     if (my $engine = delete $flags->{engine}) {
@@ -1174,6 +1173,8 @@ EOF
         $class->setup unless $Catalyst::__AM_RESTARTING;
     }
 
+    $class->setup_middleware();
+
     # Initialize our data structure
     $class->components( {} );