Skip to content

Commit cb23241

Browse files
twometrestevetwometresteve
authored
Merge pull request #684 from bugsnag/release/v3.30.1
Release v3.30.1
2 parents 5a5810e + ec2cba8 commit cb23241

16 files changed

+238
-24
lines changed

‎.github/workflows/test-package.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ jobs:
2525
guzzle-version: '^7.0'
2626
- php-version: '8.3'
2727
guzzle-version: '^7.0'
28-
# PHP 8.4 skipped pending PLAT-14402
29-
#- php-version: '8.4'
30-
# guzzle-version: '^7.9'
28+
- php-version: '8.4'
29+
guzzle-version: '^7.9'
30+
- php-version: '8.5'
31+
guzzle-version: '^7.10'
3132

3233
steps:
3334
- uses: actions/checkout@v2

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ vendor
66
.phpunit.result.cache
77
decisions.yml
88
phpstan.neon
9+
bugsnag-php.iml
10+
bugsnag.phar

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
=========
33

4+
## 3.30.1 (2026-01-22)
5+
6+
### Changes
7+
8+
* Amend secondary instance URL to bugsnag.smartbear.com.
9+
[#681](https://github.com/bugsnag/bugsnag-php/pull/681)
10+
411
## 3.30.0 (2025-07-08)
512

613
### Enhancements

‎src/Configuration.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ class Configuration implements FeatureDataStore
2323
const BUILD_ENDPOINT = 'https://build.bugsnag.com';
2424

2525
/**
26-
* The default endpoint for event notifications with InsightHub.
26+
* The secondary instance endpoint for event notifications.
2727
*/
28-
const HUB_NOTIFY_ENDPOINT = 'https://notify.insighthub.smartbear.com';
28+
const SECONDARY_NOTIFY_ENDPOINT = 'https://notify.bugsnag.smartbear.com';
2929

3030
/**
31-
* The default endpoint for session tracking with InsightHub.
31+
* The secondary instance endpoint for session tracking.
3232
*/
33-
const HUB_SESSION_ENDPOINT = 'https://sessions.insighthub.smartbear.com';
33+
const SECONDARY_SESSION_ENDPOINT = 'https://sessions.bugsnag.smartbear.com';
3434

3535
/**
36-
* The default endpoint for build notifications with InsightHub.
36+
* The secondary instance endpoint for build notifications.
3737
*/
38-
const HUB_BUILD_ENDPOINT = 'https://build.insighthub.smartbear.com';
38+
const SECONDARY_BUILD_ENDPOINT = 'https://build.bugsnag.smartbear.com';
3939

4040
/**
4141
* @var string
@@ -100,7 +100,7 @@ class Configuration implements FeatureDataStore
100100
*/
101101
protected $notifier = [
102102
'name' => 'Bugsnag PHP (Official)',
103-
'version' => '3.30.0',
103+
'version' => '3.30.1',
104104
'url' => 'https://bugsnag.com',
105105
];
106106

@@ -218,10 +218,10 @@ public function __construct($apiKey)
218218
}
219219
$this->apiKey = $apiKey;
220220

221-
if ($this->isHubApiKey()) {
222-
$this->notifyEndpoint = self::HUB_NOTIFY_ENDPOINT;
223-
$this->sessionEndpoint = self::HUB_SESSION_ENDPOINT;
224-
$this->buildEndpoint = self::HUB_BUILD_ENDPOINT;
221+
if ($this->isSecondaryApiKey()) {
222+
$this->notifyEndpoint = self::SECONDARY_NOTIFY_ENDPOINT;
223+
$this->sessionEndpoint = self::SECONDARY_SESSION_ENDPOINT;
224+
$this->buildEndpoint = self::SECONDARY_BUILD_ENDPOINT;
225225
} else {
226226
$this->notifyEndpoint = self::NOTIFY_ENDPOINT;
227227
$this->sessionEndpoint = self::SESSION_ENDPOINT;
@@ -236,11 +236,11 @@ public function __construct($apiKey)
236236
}
237237

238238
/**
239-
* Checks if the API Key is associated with the InsightHub instance.
239+
* Checks if the API Key is associated with the secondary instance.
240240
*
241241
* @return bool
242242
*/
243-
public function isHubApiKey()
243+
public function isSecondaryApiKey()
244244
{
245245
// Does the API key start with 00000
246246
return strpos($this->apiKey, '00000') === 0;

‎tests/ConfigurationTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,9 @@ public function testTheNotifyEndpointHasASensibleDefault()
305305
$this->assertSame($expected, $this->config->getNotifyEndpoint());
306306
}
307307

308-
public function testTheNotifyEndpointForHubHasASensibleDefault()
308+
public function testTheSecondaryNotifyEndpointHasASensibleDefault()
309309
{
310-
$expected = 'https://notify.insighthub.smartbear.com';
310+
$expected = 'https://notify.bugsnag.smartbear.com';
311311
$this->config = new Configuration('00000123123123123');
312312

313313
$this->assertSame($expected, $this->config->getNotifyEndpoint());
@@ -320,9 +320,9 @@ public function testTheSessionEndpointHasASensibleDefault()
320320
$this->assertSame($expected, $this->config->getSessionEndpoint());
321321
}
322322

323-
public function testTheSessionEndpointForHubHasASensibleDefault()
323+
public function testTheSecondarySessionEndpointHasASensibleDefault()
324324
{
325-
$expected = 'https://sessions.insighthub.smartbear.com';
325+
$expected = 'https://sessions.bugsnag.smartbear.com';
326326
$this->config = new Configuration('00000123123123123');
327327

328328
$this->assertSame($expected, $this->config->getSessionEndpoint());
@@ -335,9 +335,9 @@ public function testTheBuildEndpointHasASensibleDefault()
335335
$this->assertSame($expected, $this->config->getBuildEndpoint());
336336
}
337337

338-
public function testTheBuildEndpointForHubHasASensibleDefault()
338+
public function testTheSecondaryBuildEndpointHasASensibleDefault()
339339
{
340-
$expected = 'https://build.insighthub.smartbear.com';
340+
$expected = 'https://build.bugsnag.smartbear.com';
341341
$this->config = new Configuration('00000123123123123');
342342

343343
$this->assertSame($expected, $this->config->getBuildEndpoint());

‎tests/RequestTest.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,9 @@ public function testGetCurrentUrl()
200200

201201
$method = (new ReflectionClass($request))->getMethod('getCurrentUrl');
202202

203-
$method->setAccessible(true);
203+
if (PHP_VERSION_ID < 80100) { // No effect since 8.1, deprecated in 8.5
204+
$method->setAccessible(true);
205+
}
204206

205207
$this->assertSame('http://example.com/blah/blah.php?some=param', $method->invoke($request));
206208
}
@@ -211,7 +213,9 @@ public function testRequestIp()
211213

212214
$method = (new ReflectionClass($request))->getMethod('getRequestIp');
213215

214-
$method->setAccessible(true);
216+
if (PHP_VERSION_ID < 80100) { // No effect since 8.1, deprecated in 8.5
217+
$method->setAccessible(true);
218+
}
215219

216220
$this->assertSame('123.45.67.8', $method->invoke($request));
217221
}

‎tests/phpt/handler_should_increase_memory_limit_by_configured_amount_on_oom.phpt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ $a = str_repeat('a', 2147483647);
1818

1919
echo "No OOM!\n";
2020
?>
21+
--SKIPIF--
22+
<?php
23+
if (PHP_VERSION_ID >= 80500) {
24+
echo 'SKIP — this test has a different output in PHP 8.5+';
25+
}
26+
?>
2127
--EXPECTF--
2228
string(7) "5242880"
2329

‎tests/phpt/handler_should_not_increase_memory_limit_when_memory_limit_increase_is_disabled.phpt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ $a = str_repeat('a', 2147483647);
2020

2121
echo "No OOM!\n";
2222
?>
23+
--SKIPIF--
24+
<?php
25+
if (PHP_VERSION_ID >= 80500) {
26+
echo 'SKIP — this test has a different output in PHP 8.5+';
27+
}
28+
?>
2329
--EXPECTF--
2430
string(2) "5M"
2531

‎tests/phpt/handler_should_report_compile_errors.phpt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ var_dump('I should not be reached');
1717
if (PHP_MAJOR_VERSION < 7) {
1818
echo 'SKIP — this is a different error in PHP 5';
1919
}
20+
if (PHP_VERSION_ID >= 80500) {
21+
echo 'SKIP — this test has a different output in PHP 8.5+';
22+
}
2023
?>
2124
--EXPECTF--
2225
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‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ $a = str_repeat('a', 2147483647);
1212

1313
echo "No OOM!\n";
1414
?>
15+
--SKIPIF--
16+
<?php
17+
if (PHP_VERSION_ID >= 80500) {
18+
echo 'SKIP — this test has a different output in PHP 8.5+';
19+
}
20+
?>
1521
--EXPECTF--
1622
Fatal error: Allowed memory size of %d bytes exhausted (tried to allocate %d bytes) in %s on line 8
1723
Guzzle request made (1 event)!

0 commit comments

Comments
 (0)