From: Graham Knop <haarg@haarg.org>
Date: Sat, 4 Feb 2017 06:33:55 +0000 (-0500)
Subject: refactor option module loads for JSON subclass
X-Git-Tag: v0.28~7
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=commitdiff_plain;h=4473d906364e79b0d6bb89471a49acca1531dc9d;hp=1febe9e798741e52f72d701e4e806e2c30b004e9

refactor option module loads for JSON subclass
---

diff --git a/lib/Config/Any/JSON.pm b/lib/Config/Any/JSON.pm
index 5a432d7..950424f 100644
--- a/lib/Config/Any/JSON.pm
+++ b/lib/Config/Any/JSON.pm
@@ -49,34 +49,30 @@ sub load {
     my $content = do { local $/; <$fh> };
     close $fh;
 
-    eval { require JSON::DWIW; };
-    unless( $@ ) {
+    if ( eval { require JSON::DWIW } ) {
         my $decoder = JSON::DWIW->new;
         my ( $data, $error ) = $decoder->from_json( $content );
         die $error if $error;
         return $data;
     }
-
-    eval { require JSON::XS; };
-    unless( $@ ) {
+    elsif ( eval { require JSON::XS } ) {
         my $decoder = JSON::XS->new->relaxed;
         return $decoder->decode( $content );
     }
-
-    eval { require JSON::Syck; };
-    unless( $@ ) {
+    elsif ( eval { require JSON::Syck } ) {
         return JSON::Syck::Load( $content );
     }
-
-    eval { require JSON::PP; JSON::PP->VERSION( 2 ); };
-    unless( $@ ) {
+    elsif ( eval { require JSON::PP; JSON::PP->VERSION( 2 ); } ) {
         my $decoder = JSON::PP->new->relaxed;
         return $decoder->decode( $content );
     }
-
     require JSON;
-    eval { JSON->VERSION( 2 ); };
-    return $@ ? JSON::jsonToObj( $content ) : JSON::from_json( $content );
+    if ( eval { JSON->VERSION( 2 ) } ) {
+        return JSON::from_json( $content );
+    }
+    else {
+        return JSON::jsonToObj( $content );
+    }
 }
 
 =head2 requires_any_of( )