From 1c40be1f4b5a00fd6da081225b04efad228f8025 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 10 Dec 2015 21:24:57 +0000
Subject: Switch to JSON::MaybeXS, remove JSON::XS.

Travis has Cpanel::JSON::XS preinstalled, which means that the build
would fail there, as JSON::MaybeXS would try and upgrade JSON::XS to
version 3 which the snapshot did not contain.
---
 perllib/FixMyStreet/App/Controller/Auth.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perllib/FixMyStreet/App/Controller/Auth.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index 6de416c53..b6cd84cf0 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -7,7 +7,7 @@ BEGIN { extends 'Catalyst::Controller'; }
 use Email::Valid;
 use Net::Domain::TLD;
 use mySociety::AuthToken;
-use JSON;
+use JSON::MaybeXS;
 
 =head1 NAME
 
@@ -275,7 +275,7 @@ sub ajax_sign_in : Path('ajax/sign_in') {
         $return->{error} = 1;
     }
 
-    my $body = JSON->new->utf8(1)->encode( $return );
+    my $body = encode_json($return);
     $c->res->content_type('application/json; charset=utf-8');
     $c->res->body($body);
 
@@ -287,7 +287,7 @@ sub ajax_sign_out : Path('ajax/sign_out') {
 
     $c->logout();
 
-    my $body = JSON->new->utf8(1)->encode( { signed_out => 1 } );
+    my $body = encode_json( { signed_out => 1 } );
     $c->res->content_type('application/json; charset=utf-8');
     $c->res->body($body);
 
@@ -305,7 +305,7 @@ sub ajax_check_auth : Path('ajax/check_auth') {
         $code = 200;
     }
 
-    my $body = JSON->new->utf8(1)->encode( $data );
+    my $body = encode_json($data);
     $c->res->content_type('application/json; charset=utf-8');
     $c->res->code($code);
     $c->res->body($body);
-- 
cgit v1.2.3