From 560e7228fce8eed107c81774eb264ddfec3000ba Mon Sep 17 00:00:00 2001 From: Scott Walters Date: Tue, 10 Jul 2012 14:04:50 -0400 Subject: [PATCH] Revert "Config::JSON stopped providing a BUILDARGS method, so we can't "around" it. subclass new() the old fashioned way and bump the Config::JSON version dep so we know we're getting the non-Moose one." ... fix is bad Moose style and no one can replicate this problem but me; need to look harder for the problem locally This reverts commit 55aead887bd1b937169e09cef7710351634a103e. --- lib/WebGUI/Config.pm | 9 +++++---- sbin/testEnvironment.pl | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/WebGUI/Config.pm b/lib/WebGUI/Config.pm index 5453d6de1..347931abf 100644 --- a/lib/WebGUI/Config.pm +++ b/lib/WebGUI/Config.pm @@ -100,12 +100,13 @@ The filename of the config file to read. =cut -sub new { - my $package = shift; +around BUILDARGS => sub { + my $orig = shift; + my $class = shift; my $filename = shift; $filename = Cwd::realpath(File::Spec->rel2abs($filename, WebGUI::Paths->configBase)); - return $package->SUPER::new($filename); -} + return $class->$orig($filename); +}; 1; diff --git a/sbin/testEnvironment.pl b/sbin/testEnvironment.pl index 2e906c1f9..ed1d23e8b 100755 --- a/sbin/testEnvironment.pl +++ b/sbin/testEnvironment.pl @@ -111,7 +111,7 @@ checkModule("XML::FeedPP::MediaRSS", 0.02 ); checkModule("JSON", 2.12 ); checkModule("JSON::Any", 1.22 ); checkModule("JSON::PP", 0.00 ); -checkModule("Config::JSON", 1.5100 ); +checkModule("Config::JSON", "1.3.1" ); checkModule("Text::CSV_XS", "0.64" ); checkModule("Net::CIDR::Lite", 0.20 ); checkModule("Finance::Quote", 1.15 );