X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny%2FJSON.pm;h=950424f398bdff4800a1974fc9b237e3c9524f4e;hp=e8a12461ac5d66b9d1c608c29d7b5a79fe5071b8;hb=4473d906364e79b0d6bb89471a49acca1531dc9d;hpb=a8ffcd3bebfdfed41159d7ab3f48bb67082db773

diff --git a/lib/Config/Any/JSON.pm b/lib/Config/Any/JSON.pm
index e8a1246..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( )
@@ -94,7 +90,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2013 by Brian Cassidy
+Copyright 2006-2016 by Brian Cassidy
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.