Merge pull request #620 from bugsnag/test-tweaks

Disable XDebug on CI and register default callbacks in PHPT tests
bugsnag · Jan 26, 2021 · bc1d445 · bc1d445
2 parents 5a62ea2 + 4468e96
commit bc1d445
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
@@ -28,6 +28,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-version }}
+        coverage: none
 
     - run: composer validate
 

diff --git a/tests/phpt/_prelude.php b/tests/phpt/_prelude.php
@@ -12,8 +12,12 @@
 
 $guzzle = new FakeGuzzle();
 
-return new Client(
+$client = new Client(
     $config,
     null,
     $guzzle
 );
+
+$client->registerDefaultCallbacks();
+
+return $client;
diff --git a/tests/phpt/handler_can_be_manually_called_multiple_times.phpt b/tests/phpt/handler_can_be_manually_called_multiple_times.phpt
@@ -17,7 +17,7 @@ $handler->exceptionHandler(new LogicException('terrible things'));
 --EXPECTF--
 array(1) {
   [0]=>
-  object(Exception)#15 (7) {
+  object(Exception)#%d (7) {
     ["message":protected]=>
     string(10) "bad things"
     ["string":"Exception":private]=>

diff --git a/tests/phpt/handler_should_call_the_previous_exception_handler.phpt b/tests/phpt/handler_should_call_the_previous_exception_handler.phpt
@@ -15,7 +15,7 @@ throw new RuntimeException('abc xyz');
 var_dump('I should not be reached');
 ?>
 --EXPECTF--
-object(RuntimeException)#15 (7) {
+object(RuntimeException)#%d (7) {
   ["message":protected]=>
   string(7) "abc xyz"
   ["string":"Exception":private]=>

diff --git a/tests/phpt/handler_should_handle_all_throwables.phpt b/tests/phpt/handler_should_handle_all_throwables.phpt
@@ -21,7 +21,7 @@ if (PHP_MAJOR_VERSION < 7) {
 }
 ?>
 --EXPECTF--
-object(DivisionByZeroError)#15 (7) {
+object(DivisionByZeroError)#%d (7) {
   ["message":protected]=>
   string(12) "22 / 0 = ???"
   ["string":"Error":private]=>

diff --git a/tests/phpt/handler_should_handle_all_throwables_being_reraised.phpt b/tests/phpt/handler_should_handle_all_throwables_being_reraised.phpt
@@ -22,7 +22,7 @@ if (PHP_MAJOR_VERSION < 7) {
 }
 ?>
 --EXPECTF--
-object(DivisionByZeroError)#15 (7) {
+object(DivisionByZeroError)#%d (7) {
   ["message":protected]=>
   string(12) "22 / 0 = ???"
   ["string":"Error":private]=>

diff --git a/tests/phpt/handler_should_handle_exceptions_caused_by_previous_exception_handler.phpt b/tests/phpt/handler_should_handle_exceptions_caused_by_previous_exception_handler.phpt
@@ -16,7 +16,7 @@ throw new RuntimeException('abc xyz');
 var_dump('I should not be reached');
 ?>
 --EXPECTF--
-object(RuntimeException)#15 (7) {
+object(RuntimeException)#%d (7) {
   ["message":protected]=>
   string(7) "abc xyz"
   ["string":"Exception":private]=>

diff --git a/tests/phpt/handler_should_handle_previous_exception_handler_reraising.phpt b/tests/phpt/handler_should_handle_previous_exception_handler_reraising.phpt
@@ -16,7 +16,7 @@ throw new RuntimeException('abc xyz');
 var_dump('I should not be reached');
 ?>
 --EXPECTF--
-object(RuntimeException)#15 (7) {
+object(RuntimeException)#%d (7) {
   ["message":protected]=>
   string(7) "abc xyz"
   ["string":"Exception":private]=>

diff --git a/tests/phpt/handler_should_handle_throwables_caused_by_previous_exception_handler.phpt b/tests/phpt/handler_should_handle_throwables_caused_by_previous_exception_handler.phpt
@@ -22,7 +22,7 @@ if (PHP_MAJOR_VERSION < 7) {
 }
 ?>
 --EXPECTF--
-object(RuntimeException)#15 (7) {
+object(RuntimeException)#%d (7) {
   ["message":protected]=>
   string(7) "abc xyz"
   ["string":"Exception":private]=>

diff --git a/tests/phpt/php7/handler_should_report_parse_errors_with_previous_handler.phpt b/tests/phpt/php7/handler_should_report_parse_errors_with_previous_handler.phpt
@@ -22,7 +22,7 @@ if (PHP_MAJOR_VERSION !== 7) {
 }
 ?>
 --EXPECTF--
-object(ParseError)#15 (7) {
+object(ParseError)#%d (7) {
   ["message":protected]=>
   string(28) "syntax error, unexpected '{'"
   ["string":"Error":private]=>

diff --git a/tests/phpt/php8/handler_should_report_parse_errors_with_previous_handler.phpt b/tests/phpt/php8/handler_should_report_parse_errors_with_previous_handler.phpt
@@ -22,7 +22,7 @@ if (PHP_MAJOR_VERSION !== 8) {
 }
 ?>
 --EXPECTF--
-object(ParseError)#15 (7) {
+object(ParseError)#%d (7) {
   ["message":protected]=>
   string(34) "syntax error, unexpected token "}""
   ["string":"Error":private]=>