From: Peter Rabbitson <ribasushi@cpan.org>
Date: Fri, 29 Apr 2016 16:00:03 +0000 (+0200)
Subject: Bump Sub::Uplevel dep - too much breaks on <= 0.18
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1d9c2229153784640763c271088c9bf7d0d25dab;p=dbsrgits%2FDBIx-Class.git

Bump Sub::Uplevel dep - too much breaks on <= 0.18

Note that this is a kludge - the guts of ::Carp need to be protected much
better by a faulty caller() override (as was the case in RT#32640)

An attempt to do so in 821edc09 turned out insufficient - everything still
fails on `DBIC_TRACE=1 prove ...` if the older Sub::Uplevel is installed :(
---

diff --git a/Changes b/Changes
index f3bd753..e288bb2 100644
--- a/Changes
+++ b/Changes
@@ -80,8 +80,6 @@ Revision history for DBIx::Class
         - Make the Optional::Dependencies error messages cpanm-friendly
         - Incompatibly change values (not keys) of the hash returned by
           Optional::Dependencies::req_group_list (no known users in the wild)
-        - Protect tests and codebase from incomplete caller() overrides, like
-          e.g. RT#32640
         - Stop using bare $] throughout - protects the codebase from issues
           similar (but likely not limited to) P5#72210
         - Config::Any is no longer a core dep, but instead is migrated to a new
diff --git a/Makefile.PL b/Makefile.PL
index 9a4f074..412aa52 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -76,6 +76,15 @@ my $test_requires = {
   'Test::Warn'               => '0.21',
   'Test::More'               => '0.94',
 
+  # This has a bug in the caller() override, ideally we need go get rid
+  # of it entirely, but that's for another maint
+  #
+  # FIXME - this does protect tests, but does *NOT* protect the rest of
+  # DBIC itself from a faulty caller() override. Something more substantial
+  # needs to be done in the guts of DBIC::Carp
+  #
+  'Sub::Uplevel'             => '0.19',
+
   # this is already a dep of n::c, but just in case - used by t/55namespaces_cleaned.t
   # remove and do a manual glob-collection if n::c is no longer a dep
   'Package::Stash'           => '0.28',