Skip to content

Commit 5066f0a

Browse files
CawllecCawllec
authored
Merge pull request #558 from bugsnag/next
v2.29.0 Release
2 parents 9c34a06 + 36e5480 commit 5066f0a

File tree

96 files changed

+3677
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3677
-64
lines changed

‎.github/workflows/maze-runner-tests.yml‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131
laravel-fixture: laravel11
3232
- php-version: '8.4'
3333
laravel-fixture: laravel11
34+
- php-version: '8.3'
35+
laravel-fixture: laravel12
36+
- php-version: '8.4'
37+
laravel-fixture: laravel12
3438
- php-version: '8.0'
3539
laravel-fixture: lumen8
3640

@@ -49,8 +53,40 @@ jobs:
4953
ruby-version: '3.1'
5054
bundler-cache: true
5155

52-
- run: bundle exec maze-runner --no-source
56+
- run: bundle exec maze-runner --no-source --exclude=features/octane
5357
env:
5458
PHP_VERSION: ${{ matrix.php-version }}
5559
LARAVEL_FIXTURE: ${{ matrix.laravel-fixture }}
5660
COMPOSER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
62+
test_octane:
63+
runs-on: ubuntu-latest
64+
strategy:
65+
fail-fast: false
66+
matrix:
67+
include:
68+
- php-version: '8.4'
69+
laravel-fixture: laravel11
70+
- php-version: '8.4'
71+
laravel-fixture: laravel12
72+
73+
steps:
74+
- uses: actions/checkout@v2
75+
76+
- name: Install libcurl4-openssl-dev and net-tools
77+
run: |
78+
sudo apt-get update
79+
sudo apt-get install libcurl4-openssl-dev
80+
sudo apt-get install net-tools
81+
82+
- name: install Ruby
83+
uses: ruby/setup-ruby@v1
84+
with:
85+
ruby-version: '3.1'
86+
bundler-cache: true
87+
88+
- run: bundle exec maze-runner --no-source ./features/octane
89+
env:
90+
PHP_VERSION: ${{ matrix.php-version }}
91+
LARAVEL_FIXTURE: ${{ matrix.laravel-fixture }}
92+
COMPOSER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/unit-tests.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,18 @@ jobs:
110110
laravel-version: '10.*'
111111
- php-version: '8.2'
112112
laravel-version: '10.*'
113+
- php-version: '8.2'
114+
laravel-version: '11.*'
113115
- php-version: '8.3'
114116
laravel-version: '11.*'
115117
- php-version: '8.4'
116118
laravel-version: '11.*'
119+
- php-version: '8.2'
120+
laravel-version: '12.*'
121+
- php-version: '8.3'
122+
laravel-version: '12.*'
123+
- php-version: '8.4'
124+
laravel-version: '12.*'
117125

118126
steps:
119127
- uses: actions/checkout@v2

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/.idea
66
Gemfile.lock
77
maze_output
8+
maze-runner.log
89
.phpunit.result.cache
910
/features/fixtures/*/bugsnag-laravel
1011
/features/fixtures/laravel-latest/*

‎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+
## v2.29.0 (2025-02-26)
5+
6+
* Adds support for laravel 12 [#553](https://github.com/bugsnag/bugsnag-laravel/pull/553)
7+
* Adds support for running laravel using octane:
8+
- [#551](https://github.com/bugsnag/bugsnag-laravel/pull/551)
9+
- [#552](https://github.com/bugsnag/bugsnag-laravel/pull/552)
10+
411
## v2.28.1 (2025-01-13)
512

613
This release should ensure compatibility with PHP 8.4 by removing the usage of certain

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source 'https://rubygems.org'
22

3-
gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.18.0'
3+
gem "bugsnag-maze-runner", "~> 9.14"

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"php": ">=5.5",
1515
"bugsnag/bugsnag": "^3.29.0",
1616
"bugsnag/bugsnag-psr-logger": "^1.4|^2.0",
17-
"illuminate/contracts": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
18-
"illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
17+
"illuminate/contracts": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
18+
"illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
1919
"monolog/monolog": "^1.12|^2.0|^3.0"
2020
},
2121
"require-dev": {
22-
"orchestra/testbench": "^3.1|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0",
23-
"phpunit/phpunit": "^4.8.36|^6.3.1|^7.5.15|^8.3.5|^9.3.10|^10.0"
22+
"orchestra/testbench": "^3.1|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
23+
"phpunit/phpunit": "^4.8.36|^6.3.1|^7.5.15|^8.3.5|^9.3.10|^10.0|^11.0"
2424
},
2525
"autoload": {
2626
"psr-4": {

‎config/bugsnag.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,18 @@
191191

192192
'bindings' => env('BUGSNAG_QUERY_BINDINGS', false),
193193

194+
/*
195+
|--------------------------------------------------------------------------
196+
| Octane breadcrumbs
197+
|--------------------------------------------------------------------------
198+
|
199+
| Enable this if you'd like us to automatically record breadcrumbs from
200+
| octane events.
201+
|
202+
*/
203+
204+
'octane_breadcrumbs' => env('BUGSNAG_OCTANE_BREADCRUMBS', true),
205+
194206
/*
195207
|--------------------------------------------------------------------------
196208
| Release Stage

‎features/discard_classes.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ Scenario: Exceptions can be discarded by name
44
Given I set environment variable "BUGSNAG_DISCARD_CLASSES" to "Exception"
55
And I start the laravel fixture
66
When I navigate to the route "/unhandled_controller_exception"
7-
Then I should receive no requests
7+
Then I should receive no error
88

99
Scenario: Exceptions can be discarded by regex
1010
Given I set environment variable "BUGSNAG_DISCARD_CLASSES" to "/Exception$/"
1111
And I start the laravel fixture
1212
When I navigate to the route "/unhandled_controller_exception"
13-
Then I should receive no requests
13+
Then I should receive no error
1414

1515
Scenario: Exceptions will be delivered when discard classes does not match
1616
Given I set environment variable "BUGSNAG_DISCARD_CLASSES" to "DifferentException,/^NotThatException$/"

‎features/fixtures/docker-compose.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,89 @@ services:
161161
- target: 8000
162162
published: 61311
163163

164+
laravelrr:
165+
build:
166+
context: ${LARAVEL_FIXTURE} # Set to the base test fixture e.g. laravel11
167+
dockerfile: Dockerfile-roadrunner
168+
args:
169+
- PHP_VERSION
170+
environment:
171+
- BUGSNAG_API_KEY
172+
- BUGSNAG_ENDPOINT
173+
- BUGSNAG_SESSION_ENDPOINT
174+
- BUGSNAG_CAPTURE_SESSIONS
175+
- BUGSNAG_USE_CUSTOM_GUZZLE
176+
- BUGSNAG_REGISTER_OOM_BOOTSTRAPPER
177+
- BUGSNAG_DISCARD_CLASSES
178+
- BUGSNAG_REDACTED_KEYS
179+
- BUGSNAG_QUERY
180+
restart: "no"
181+
ports:
182+
- target: 8000
183+
published: ${LARAVEL_FIXTURE_PORT} # Set to the published port of the base test fixture
184+
185+
laravelfp:
186+
build:
187+
context: ${LARAVEL_FIXTURE} # Set to the base test fixture e.g. laravel11
188+
dockerfile: Dockerfile-frankenphp
189+
args:
190+
- PHP_VERSION
191+
environment:
192+
- BUGSNAG_API_KEY
193+
- BUGSNAG_ENDPOINT
194+
- BUGSNAG_SESSION_ENDPOINT
195+
- BUGSNAG_CAPTURE_SESSIONS
196+
- BUGSNAG_USE_CUSTOM_GUZZLE
197+
- BUGSNAG_REGISTER_OOM_BOOTSTRAPPER
198+
- BUGSNAG_DISCARD_CLASSES
199+
- BUGSNAG_REDACTED_KEYS
200+
- BUGSNAG_QUERY
201+
restart: "no"
202+
ports:
203+
- target: 8000
204+
published: ${LARAVEL_FIXTURE_PORT} # Set to the published port of the base test fixture
205+
206+
laravelsw:
207+
build:
208+
context: ${LARAVEL_FIXTURE} # Set to the base test fixture e.g. laravel11
209+
dockerfile: Dockerfile-swoole
210+
args:
211+
- PHP_VERSION
212+
environment:
213+
- BUGSNAG_API_KEY
214+
- BUGSNAG_ENDPOINT
215+
- BUGSNAG_SESSION_ENDPOINT
216+
- BUGSNAG_CAPTURE_SESSIONS
217+
- BUGSNAG_USE_CUSTOM_GUZZLE
218+
- BUGSNAG_REGISTER_OOM_BOOTSTRAPPER
219+
- BUGSNAG_DISCARD_CLASSES
220+
- BUGSNAG_REDACTED_KEYS
221+
- BUGSNAG_QUERY
222+
restart: "no"
223+
ports:
224+
- target: 8000
225+
published: ${LARAVEL_FIXTURE_PORT} # Set to the published port of the base test fixture
226+
227+
laravel12:
228+
build:
229+
context: laravel12
230+
args:
231+
- PHP_VERSION
232+
environment:
233+
- BUGSNAG_API_KEY
234+
- BUGSNAG_ENDPOINT
235+
- BUGSNAG_SESSION_ENDPOINT
236+
- BUGSNAG_CAPTURE_SESSIONS
237+
- BUGSNAG_USE_CUSTOM_GUZZLE
238+
- BUGSNAG_REGISTER_OOM_BOOTSTRAPPER
239+
- BUGSNAG_DISCARD_CLASSES
240+
- BUGSNAG_REDACTED_KEYS
241+
- BUGSNAG_QUERY
242+
restart: "no"
243+
ports:
244+
- target: 8000
245+
published: 61312
246+
164247
laravel-latest:
165248
build:
166249
context: laravel-latest

‎features/fixtures/laravel11/Dockerfile-frankenphp‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
ARG PHP_VERSION
2+
FROM php:$PHP_VERSION
3+
4+
RUN apt-get update && \
5+
apt-get install -y --no-install-recommends \
6+
git \
7+
unzip \
8+
wget \
9+
zip
10+
11+
WORKDIR /app
12+
13+
COPY . .
14+
COPY --from=composer /usr/bin/composer /usr/local/bin/composer
15+
16+
RUN curl https://frankenphp.dev/install.sh | sh
17+
RUN mv frankenphp /usr/local/bin/
18+
19+
RUN cp .env.example .env
20+
RUN docker-php-ext-install sockets pcntl posix
21+
RUN composer install --no-dev
22+
RUN composer require laravel/octane
23+
RUN php artisan key:generate
24+
RUN php artisan octane:install --server=frankenphp
25+
26+
# create database & apply migrations
27+
RUN touch database/database.sqlite && php artisan migrate --no-interaction
28+
29+
CMD php -d variables_order=EGPCS artisan octane:start --server=frankenphp --host=0.0.0.0 --admin-port=2019 --port=8000

0 commit comments

Comments
 (0)