Merge pull request #682 from bugsnag/php85support

Updated tests for PHP 8.5

Author: agrzegorzewski

.github/workflows/test-package.yml

@@ -25,9 +25,10 @@ jobs:
           guzzle-version: '^7.0'
         - php-version: '8.3'
           guzzle-version: '^7.0'
-        # PHP 8.4 skipped pending PLAT-14402
-        #- php-version: '8.4'
-        #  guzzle-version: '^7.9'
+        - php-version: '8.4'
+          guzzle-version: '^7.9'
+        - php-version: '8.5'
+          guzzle-version: '^7.10'
 
     steps:
     - uses: actions/checkout@v2

tests/RequestTest.php

@@ -200,7 +200,9 @@ public function testGetCurrentUrl()
 
         $method = (new ReflectionClass($request))->getMethod('getCurrentUrl');
 
-        $method->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) { // No effect since 8.1, deprecated in 8.5
+            $method->setAccessible(true);
+        }
 
         $this->assertSame('http://example.com/blah/blah.php?some=param', $method->invoke($request));
     }
@@ -211,7 +213,9 @@ public function testRequestIp()
 
         $method = (new ReflectionClass($request))->getMethod('getRequestIp');
 
-        $method->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) { // No effect since 8.1, deprecated in 8.5
+            $method->setAccessible(true);
+        }
 
         $this->assertSame('123.45.67.8', $method->invoke($request));
     }

tests/phpt/handler_should_increase_memory_limit_by_configured_amount_on_oom.phpt

@@ -18,6 +18,12 @@ $a = str_repeat('a', 2147483647);
 
 echo "No OOM!\n";
 ?>
+--SKIPIF--
+<?php
+if (PHP_VERSION_ID >= 80500) {
+    echo 'SKIP — this test has a different output in PHP 8.5+';
+}
+?>
 --EXPECTF--
 string(7) "5242880"
 

tests/phpt/handler_should_not_increase_memory_limit_when_memory_limit_increase_is_disabled.phpt

@@ -20,6 +20,12 @@ $a = str_repeat('a', 2147483647);
 
 echo "No OOM!\n";
 ?>
+--SKIPIF--
+<?php
+if (PHP_VERSION_ID >= 80500) {
+    echo 'SKIP — this test has a different output in PHP 8.5+';
+}
+?>
 --EXPECTF--
 string(2) "5M"
 

tests/phpt/handler_should_report_compile_errors.phpt

@@ -17,6 +17,9 @@ var_dump('I should not be reached');
 if (PHP_MAJOR_VERSION < 7) {
     echo 'SKIP — this is a different error in PHP 5';
 }
+if (PHP_VERSION_ID >= 80500) {
+    echo 'SKIP — this test has a different output in PHP 8.5+';
+}
 ?>
 --EXPECTF--
 Fatal error: A class constant must not be called 'class'; it is reserved for class name fetching in %s/compile_error.php on line 9

tests/phpt/handler_should_report_oom_from_large_allocation.phpt

@@ -12,6 +12,12 @@ $a = str_repeat('a', 2147483647);
 
 echo "No OOM!\n";
 ?>
+--SKIPIF--
+<?php
+if (PHP_VERSION_ID >= 80500) {
+    echo 'SKIP — this test has a different output in PHP 8.5+';
+}
+?>
 --EXPECTF--
 Fatal error: Allowed memory size of %d bytes exhausted (tried to allocate %d bytes) in %s on line 8
 Guzzle request made (1 event)!

tests/phpt/handler_should_report_oom_from_small_allocations.phpt

@@ -25,6 +25,9 @@ echo "No OOM!\n";
 if (PHP_MAJOR_VERSION < 7) {
     echo "SKIP - PHP 5 does not run OOM in this test";
 }
+if (PHP_VERSION_ID >= 80500) {
+    echo 'SKIP — this test has a different output in PHP 8.5+';
+}
 ?>
 --EXPECTF--
 Fatal error: Allowed memory size of %d bytes exhausted (tried to allocate %d bytes) in %s on line %d

tests/phpt/php8.5/handler_should_increase_memory_limit_by_configured_amount_on_oom.phpt

@@ -0,0 +1,39 @@
+--TEST--
+Bugsnag\Handler should increase the memory limit by the configured amount when an OOM happens
+--FILE--
+<?php
+$client = require __DIR__ . '/../_prelude.php';
+$client->setMemoryLimitIncrease(1024 * 1024 * 10);
+
+Bugsnag\Handler::register($client);
+
+ini_set('memory_limit', 1024 * 1024 * 5);
+var_dump(ini_get('memory_limit'));
+
+$client->registerCallback(function () {
+    var_dump(ini_get('memory_limit'));
+});
+
+$a = str_repeat('a', 2147483647);
+
+echo "No OOM!\n";
+?>
+--SKIPIF--
+<?php
+if (PHP_VERSION_ID < 80500) {
+    echo 'SKIP — this case is already tested in PHP <8.5';
+}
+?>
+--EXPECTF--
+string(7) "5242880"
+
+Fatal error: Allowed memory size of %d bytes exhausted (tried to allocate %d bytes) in %s on line 14
+Stack trace:
+#0 Standard input code(14): str_repeat('a', 2147483647)
+#1 {main}
+string(8) "15728640"
+Guzzle request made (1 event)!
+* Method: 'POST'
+* URI: 'http://localhost/notify'
+* Events:
+    - Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)

tests/phpt/php8.5/handler_should_not_increase_memory_limit_when_memory_limit_increase_is_disabled.phpt

@@ -0,0 +1,41 @@
+--TEST--
+Bugsnag\Handler should not increase the memory limit when memoryLimitIncrease is disabled
+--FILE--
+<?php
+$client = require __DIR__ . '/../_prelude.php';
+$client->setMemoryLimitIncrease(null);
+
+ini_set('memory_limit', '5M');
+var_dump(ini_get('memory_limit'));
+
+$client->registerCallback(function () {
+    // This should be the same as the first var_dump, because we should not have
+    // increase the memory limit
+    var_dump(ini_get('memory_limit'));
+});
+
+Bugsnag\Handler::register($client);
+
+$a = str_repeat('a', 2147483647);
+
+echo "No OOM!\n";
+?>
+--SKIPIF--
+<?php
+if (PHP_VERSION_ID < 80500) {
+    echo 'SKIP — this case is already tested in PHP <8.5';
+}
+?>
+--EXPECTF--
+string(2) "5M"
+
+Fatal error: Allowed memory size of %d bytes exhausted (tried to allocate %d bytes) in %s on line 16
+Stack trace:
+#0 Standard input code(16): str_repeat('a', 2147483647)
+#1 {main}
+string(2) "5M"
+Guzzle request made (1 event)!
+* Method: 'POST'
+* URI: 'http://localhost/notify'
+* Events:
+    - Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)

tests/phpt/php8.5/handler_should_report_compile_errors.phpt

@@ -0,0 +1,29 @@
+--TEST--
+Bugsnag\Handler should report compile errors
+
+https://github.com/php/php-src/blob/2772751b58ee579a8f1288a0949e5e1fcb554877/Zend/zend_API.c#L3965-L3968
+--FILE--
+<?php
+$client = require __DIR__ . '/../_prelude.php';
+
+Bugsnag\Handler::register($client);
+
+include __DIR__ . '/../fixtures/compile_error.php';
+
+var_dump('I should not be reached');
+?>
+--SKIPIF--
+<?php
+if (PHP_VERSION_ID < 80500) {
+    echo 'SKIP — this case is already tested in PHP <8.5';
+}
+?>
+--EXPECTF--
+Fatal error: A class constant must not be called 'class'; it is reserved for class name fetching in %s/compile_error.php on line 9
+Stack trace:
+#0 {main}
+Guzzle request made (1 event)!
+* Method: 'POST'
+* URI: 'http://localhost/notify'
+* Events:
+    - A class constant must not be called 'class'; it is reserved for class name fetching