More indirect call removals: the second part of 77c3a5dc

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / ResultSetManager.pm

diff --git a/lib/DBIx/Class/ResultSetManager.pm b/lib/DBIx/Class/ResultSetManager.pm
index bb9f3bf..3ae9502 100644 (file)
--- a/lib/DBIx/Class/ResultSetManager.pm
+++ b/lib/DBIx/Class/ResultSetManager.pm
@@ -2,8 +2,10 @@ package DBIx::Class::ResultSetManager;
 use strict;
 use warnings;
 use base 'DBIx::Class';
-use Sub::Name ();
-use Class::Inspector;
+use Package::Stash ();
+
+use DBIx::Class::_Util 'set_subname';
+use namespace::clean;
 
 warn "DBIx::Class::ResultSetManager never left experimental status and
 has now been DEPRECATED. This module will be deleted in 09000 so please
@@ -27,8 +29,9 @@ appropriate My::Schema::ResultSet::* classes for it to pick up.";
 
 =cut
 
-__PACKAGE__->mk_classdata($_)
-  for qw/ base_resultset_class table_resultset_class_suffix /;
+__PACKAGE__->mk_group_accessors(inherited => qw(
+  base_resultset_class table_resultset_class_suffix
+));
 __PACKAGE__->base_resultset_class('DBIx::Class::ResultSet');
 __PACKAGE__->table_resultset_class_suffix('::_resultset');
 
@@ -53,14 +56,23 @@ sub _register_attributes {
     my $cache = $self->_attr_cache;
     return if keys %$cache == 0;
 
-    foreach my $meth (@{Class::Inspector->methods($self) || []}) {
+    foreach my $meth (keys %{ { map
+      { $_ => 1 }
+      map
+        { Package::Stash->new($_)->list_all_symbols("CODE") }
+        @{ mro::get_linear_isa( ref $self || $self ) }
+    } } ) {
+        # *DO NOT* rely on P::S returning crefs in reverse mro order
+        # but instead ask the mro to redo the lookup
+        # This codepath is extremely old, miht as well keep it running
+        # as-is with no room for surprises
         my $attrs = $cache->{$self->can($meth)};
         next unless $attrs;
         if ($attrs->[0] eq 'ResultSet') {
             no strict 'refs';
             my $resultset_class = $self->_setup_resultset_class;
             my $name = join '::',$resultset_class, $meth;
-            *$name = Sub::Name::subname $name, $self->can($meth);
+            *$name = set_subname $name, $self->can($meth);
             delete ${"${self}::"}{$meth};
         }
     }