ConstructorInjection now depends on the application, not the application_name

[catagits/Catalyst-Runtime.git] / lib / Catalyst / IOC / Container.pm

diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm
index 22f29b8..e5609b3 100644 (file)
--- a/lib/Catalyst/IOC/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -41,6 +41,13 @@ has substitutions => (
     default => sub { +{} },
 );
 
+has application => (
+    is       => 'ro',
+    isa      => 'Catalyst|Str',
+    lazy     => 1,
+    default  => sub { shift->application_name },
+);
+
 has application_name => (
     is       => 'ro',
     isa      => 'Str',
@@ -66,6 +73,7 @@ sub BUILD {
         substitutions
         file
         driver
+        application
         application_name
         prefix
         extensions
@@ -189,6 +197,15 @@ sub build_root_service {
     );
 }
 
+sub build_application_service {
+    my $self = shift;
+
+    return Bread::Board::Literal->new(
+        name  => 'application',
+        value => $self->application,
+    );
+}
+
 sub build_application_name_service {
     my $self = shift;
 
@@ -719,7 +736,7 @@ sub add_component {
             class     => $component,
             lifecycle => 'Singleton',
             dependencies => [
-                depends_on( '/application_name' ),
+                depends_on( '/application' ),
             ],
         ),
     );