created disable_regex_fallback attr

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

diff --git a/lib/Catalyst/IOC/SubContainer.pm b/lib/Catalyst/IOC/SubContainer.pm
index 95bb8d3..8306db8 100644 (file)
--- a/lib/Catalyst/IOC/SubContainer.pm
+++ b/lib/Catalyst/IOC/SubContainer.pm
@@ -2,9 +2,16 @@ package Catalyst::IOC::SubContainer;
 use Bread::Board;
 use Moose;
 use Catalyst::IOC::BlockInjection;
+use Catalyst::Utils;
 
 extends 'Bread::Board::Container';
 
+has disable_regex_fallback => (
+    is      => 'ro',
+    isa     => 'Bool',
+    default => 1,
+);
+
 sub get_component {
     my ( $self, $name, $args ) = @_;
 
@@ -18,14 +25,11 @@ sub get_component_regexp {
     my ( $self, $c, $name, $args ) = @_;
 
     return
-        if $c->config->{disable_component_resolution_regex_fallback} && !ref $name;
-
-    my $appclass = ref $c || $c;
-    my $prefix   = ucfirst $self->name;
-    my $p        = substr $prefix, 0, 1;
+        if $self->disable_regex_fallback && !ref $name;
 
-    my $query = ref $name ? $name : qr{$name}i;
-    $query =~ s/^${appclass}::($p|$prefix):://i;
+    my $query  = ref $name ? $name : qr{$name}i;
+    my $prefix = Catalyst::Utils::class2classprefix($query) // '';
+    $query     =~ s/^${prefix}:://i;
 
     my @result = map {
         $self->get_component( $_, $args )