Core fix for warnings due to undef body as per fix in FillInForm in r10745

diff --git a/Changes b/Changes
index fce312b..648ea80 100644 (file)
--- a/Changes
+++ b/Changes
@@ -5,6 +5,7 @@
          - Tests for this (Byron Young + Amir Sadoughi)
        - Inherited controller methods can now be specified in
          config->{action(s)}
+       - Assigning an undef response body no longer produces warnings
 
   New features:
        - Add optional second argument to uri_with which appends to existing

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index a6328d5..595decb 100644 (file)
--- a/lib/Catalyst/Response.pm
+++ b/lib/Catalyst/Response.pm
@@ -6,7 +6,14 @@ use HTTP::Headers;
 with 'MooseX::Emulate::Class::Accessor::Fast';
 
 has cookies   => (is => 'rw', default => sub { {} });
-has body      => (is => 'rw', default => '', lazy => 1, predicate => 'has_body');
+has body      => (is => 'rw', default => '', lazy => 1, predicate => 'has_body',
+    clearer => '_clear_body'
+);
+after 'body' => sub { # If someone assigned undef, clear the body so we get ''
+    if (scalar(@_) == 2 && !defined($_[1])) {
+         $_[0]->_clear_body;
+    }
+};
 has location  => (is => 'rw');
 has status    => (is => 'rw', default => 200);
 has finalized_headers => (is => 'rw', default => 0);

diff --git a/t/unit_response.t b/t/unit_response.t
index 4d2317c..31e397a 100644 (file)
--- a/t/unit_response.t
+++ b/t/unit_response.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More tests => 4;
+use Test::More tests => 6;
 
 use_ok('Catalyst::Response');
 
@@ -12,3 +12,7 @@ is($res->code, 500, 'code sets itself');
 is($res->status, 500, 'code sets status');
 $res->status(501);
 is($res->code, 501, 'status sets code');
+is($res->body, '', "default response body ''");
+$res->body(undef);
+is($res->body, '', "response body '' after assigned undef");
+