Stop using Class::Inspector. Class::MOP::load_class does all we need.

diff --git a/Makefile.PL b/Makefile.PL
index f8a7fff..7aec347 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,7 +8,7 @@ all_from 'lib/Catalyst/Runtime.pm';
 requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00300';
 requires 'Moose' => '0.59';
 requires 'Carp';
-requires 'Class::Inspector' => '1.06';
+requires 'Class::MOP';
 requires 'CGI::Simple::Cookie';
 requires 'Data::Dump';
 requires 'File::Modified';
@@ -32,6 +32,7 @@ requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
 requires 'MRO::Compat';
 
 test_requires 'NEXT';
+test_requires 'Class::Inspector';
 test_requires 'Class::Data::Inheritable';
 
 if (   ( exists $ENV{AGGREGATE_TESTS} && !$ENV{AGGREGATE_TESTS})

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index e5a9a74..faa7ae8 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2138,9 +2138,6 @@ sub setup_engine {
     }
 
     Class::MOP::load_class($engine);
-    #unless (Class::Inspector->loaded($engine)) {
-    #    require Class::Inspector->filename($engine);
-    #}
 
     # check for old engines that are no longer compatible
     my $old_engine;

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index 9d6a362..9ea7e7d 100644 (file)
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -7,7 +7,6 @@ use Moose;
 use Scalar::Util qw/blessed/;
 use Catalyst::Exception;
 use Catalyst::Utils;
-use Class::Inspector;
 
 has path_prefix =>
     (

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index d27fa9c..9fd9c32 100644 (file)
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -6,7 +6,6 @@ use File::Spec;
 use HTTP::Request;
 use Path::Class;
 use URI;
-use Class::Inspector;
 use Carp qw/croak/;
 use Cwd;
 
@@ -261,7 +260,9 @@ sub ensure_class_loaded {
         if $class =~ m/\.pm$/;
 
     return if !$opts->{ ignore_loaded }
-        && Class::Inspector->loaded( $class ); # if a symbol entry exists we don't load again
+        && Class::MOP::is_class_loaded($class); # if a symbol entry exists we don't load again
+
+    # as soon as Class::MOP 0.67 + 1 is released Class::MOP::load_class($class) can be used instead
 
     # this hack is so we don't overwrite $@ if the load did not generate an error
     my $error;
@@ -274,8 +275,9 @@ sub ensure_class_loaded {
     }
 
     die $error if $error;
+
     die "require $class was successful but the package is not defined"
-        unless Class::Inspector->loaded($class);
+        unless Class::MOP::is_class_loaded($class);
 
     return 1;
 }

diff --git a/t/unit_utils_load_class.t b/t/unit_utils_load_class.t
index 8fe1828..f8ce296 100644 (file)
--- a/t/unit_utils_load_class.t
+++ b/t/unit_utils_load_class.t
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use Test::More tests => 16;
+use Class::Inspector;
 
 use lib "t/lib";