Merge branch 'fix/display_stderr_on_publish_error' of github.com:Wayl…

…andAce/pact-php into WaylandAce-fix/display_stderr_on_publish_error
pact-foundation · Apr 28, 2023 · a4b5a41 · a4b5a41
2 parents 4cbc3db + 16c3b6e
commit a4b5a41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/PhpPact/Standalone/Broker/Broker.php b/src/PhpPact/Standalone/Broker/Broker.php
@@ -245,13 +245,13 @@ public function publish(): void
                 $this->getArguments()
             )
         );
-        $runner->runBlocking();
 
-        if ($runner->getExitCode() !== 0) {
-            $this->logger->error($runner->getStderr());
+        try {
+            $runner->runBlocking();
+        } finally {
+            $this->logger->info('out > ' . $runner->getOutput());
+            $this->logger->error('err > ' . $runner->getStderr());
         }
-
-        $this->logger->debug($runner->getOutput());
     }
 
     public function testWebhook()

diff --git a/src/PhpPact/Standalone/ProviderVerifier/VerifierProcess.php b/src/PhpPact/Standalone/ProviderVerifier/VerifierProcess.php
@@ -61,14 +61,9 @@ public function run(array $arguments, $processTimeout, $processIdleTimeout)
 
         try {
             $processRunner->runBlocking();
-
-            $logger->info('out > ' . $processRunner->getOutput());
-            $logger->error('err > ' . $processRunner->getStderr());
-        } catch (\Exception $e) {
+        } finally {
             $logger->info('out > ' . $processRunner->getOutput());
             $logger->error('err > ' . $processRunner->getStderr());
-
-            throw $e;
         }
     }