[libcode-tidyall-perl] 331/374: use capture_merged

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libcode-tidyall-perl.

commit ddcc26cd41844f7f101524a17287b8c933fec146
Author: Jonathan Swartz <swartz at pobox.com>
Date:   Wed Oct 17 01:17:48 2012 -0700

    use capture_merged
---
 lib/Code/TidyAll/Plugin/PHPCodeSniffer.pm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Code/TidyAll/Plugin/PHPCodeSniffer.pm b/lib/Code/TidyAll/Plugin/PHPCodeSniffer.pm
index 674e6f3..fbfe75a 100644
--- a/lib/Code/TidyAll/Plugin/PHPCodeSniffer.pm
+++ b/lib/Code/TidyAll/Plugin/PHPCodeSniffer.pm
@@ -1,6 +1,6 @@
 package Code::TidyAll::Plugin::PHPCodeSniffer;
 use IPC::System::Simple qw(runx EXIT_ANY);
-use Capture::Tiny qw(capture_stdout);
+use Capture::Tiny qw(capture_merged);
 use Moo;
 extends 'Code::TidyAll::Plugin';
 
@@ -11,7 +11,7 @@ sub validate_file {
 
     my $exit;
     my @cmd = ( $self->cmd, $self->argv, $file );
-    my $output = capture_stdout { $exit = runx( EXIT_ANY, @cmd ) };
+    my $output = capture_merged { $exit = runx( EXIT_ANY, @cmd ) };
     if ( $exit > 0 ) {
         $output ||= "problem running " . $self->cmd;
         die "$output\n";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcode-tidyall-perl.git