X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xt%2Fextra%2Finternals%2Fnamespaces_cleaned.t;h=36e12b1dc606fc5c379c3979cadba9f8eaac07be;hb=652d9b762d7b6d36c7dcc396e2cee5264c6d0a95;hp=552a81ecf5904289d9b38eea211a5cf37d26a920;hpb=750a4ad26c8fbe0f513a3abd4a9cb79ef8f40884;p=dbsrgits%2FDBIx-Class.git

diff --git a/xt/extra/internals/namespaces_cleaned.t b/xt/extra/internals/namespaces_cleaned.t
index 552a81e..36e12b1 100644
--- a/xt/extra/internals/namespaces_cleaned.t
+++ b/xt/extra/internals/namespaces_cleaned.t
@@ -1,3 +1,5 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
 BEGIN {
   if ( "$]" < 5.010) {
 
@@ -16,7 +18,7 @@ BEGIN {
     # we want to do this here, in the very beginning, before even
     # warnings/strict are loaded
 
-    unshift @INC, 't/lib';
+
     require DBICTest::Util::OverrideRequire;
 
     DBICTest::Util::OverrideRequire::override_global_require( sub {
@@ -33,15 +35,35 @@ BEGIN {
 use strict;
 use warnings;
 
-use Test::More;
+# FIXME This is a crock of shit, needs to go away
+# currently here to work around https://rt.cpan.org/Ticket/Display.html?id=74151
+# kill with fire when PS::XS / RT#74151 is *finally* fixed
+BEGIN {
+  my $PS_provider;
+
+  if ( "$]" < 5.010 ) {
+    require Package::Stash::PP;
+    $PS_provider = 'Package::Stash::PP';
+  }
+  else {
+    require Package::Stash;
+    $PS_provider = 'Package::Stash';
+  }
+  eval <<"EOS" or die $@;
+
+sub stash_for (\$) {
+  $PS_provider->new(\$_[0]);
+}
+1;
+EOS
+}
 
-use lib 't/lib';
+use Test::More;
 
 use DBICTest;
 use File::Find;
 use File::Spec;
 use B qw/svref_2object/;
-use Package::Stash;
 
 # makes sure we can load at least something
 use DBIx::Class;
@@ -65,8 +87,7 @@ my @modules = grep {
 # have an exception table for old and/or weird code we are not sure
 # we *want* to clean in the first place
 my $skip_idx = { map { $_ => 1 } (
-  (grep { /^DBIx::Class::CDBICompat/ } @modules), # too crufty to touch
-  'SQL::Translator::Producer::DBIx::Class::File', # ditto
+  'SQL::Translator::Producer::DBIx::Class::File', # too crufty to touch
 
   # not sure how to handle type libraries
   'DBIx::Class::Storage::DBI::Replicated::Types',
@@ -90,10 +111,6 @@ my $has_moose = eval { require Moose::Util };
 
 Sub::Defer::undefer_all();
 
-# can't use Class::Inspector for the mundane parts as it does not
-# distinguish imports from anything else, what a crock of...
-# Moose is not always available either - hence just do it ourselves
-
 my $seen; #inheritance means we will see the same method multiple times
 
 for my $mod (@modules) {
@@ -101,7 +118,7 @@ for my $mod (@modules) {
     skip "$mod exempt from namespace checks",1 if $skip_idx->{$mod};
 
     my %all_method_like = (map
-      { %{Package::Stash->new($_)->get_all_symbols('CODE')} }
+      { %{stash_for($_)->get_all_symbols('CODE')} }
       (reverse @{mro::get_linear_isa($mod)})
     );
 
@@ -150,6 +167,9 @@ for my $mod (@modules) {
         # exception time
         if (
           ( $name eq 'import' and $via = 'Exporter' )
+            or
+          # jesus christ nobody had any idea how to design an interface back then
+          ( $name =~ /_trigger/ and $via = 'Class::Trigger' )
         ) {
           pass("${mod}::${name} is a valid uncleaned import from ${name}");
         }