Skip to content

Commit 7ba1559

Browse files
ste93cryste93cry
authored
Fix failing unit tests after recent Symfony release (#461)
1 parent 187d364 commit 7ba1559

File tree

2 files changed

+49
-55
lines changed

2 files changed

+49
-55
lines changed

‎composer.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
"jean85/pretty-package-versions": "^1.5 || ^2.0",
2424
"php-http/discovery": "^1.11",
2525
"sentry/sdk": "^3.1",
26-
"symfony/config": "^3.4.44||^4.4.12||^5.0.11",
27-
"symfony/console": "^3.4.44||^4.4.12||^5.0.11",
28-
"symfony/dependency-injection": "^3.4.44||^4.4.12||^5.0.11",
29-
"symfony/event-dispatcher": "^3.4.44||^4.4.12||^5.0.11",
30-
"symfony/http-kernel": "^3.4.44||^4.4.12||^5.0.11",
26+
"symfony/config": "^3.4.44||^4.4.20||^5.0.11",
27+
"symfony/console": "^3.4.44||^4.4.20||^5.0.11",
28+
"symfony/dependency-injection": "^3.4.44||^4.4.20||^5.0.11",
29+
"symfony/event-dispatcher": "^3.4.44||^4.4.20||^5.0.11",
30+
"symfony/http-kernel": "^3.4.44||^4.4.20||^5.0.11",
3131
"symfony/polyfill-php80": "^1.22",
3232
"symfony/psr-http-message-bridge": "^2.0",
33-
"symfony/security-core": "^3.4.44||^4.4.12||^5.0.11"
33+
"symfony/security-core": "^3.4.44||^4.4.20||^5.0.11"
3434
},
3535
"require-dev": {
3636
"doctrine/dbal": "^2.10||^3.0",
@@ -44,14 +44,14 @@
4444
"phpstan/phpstan": "^0.12",
4545
"phpstan/phpstan-phpunit": "^0.12",
4646
"phpunit/phpunit": "^8.5||^9.0",
47-
"symfony/browser-kit": "^3.4.44||^4.4.12||^5.0.11",
48-
"symfony/dom-crawler": "^3.4.44||^4.4.12||^5.0.11",
49-
"symfony/framework-bundle": "^3.4.44||^4.4.12||^5.0.11",
50-
"symfony/messenger": "^4.4.12||^5.0.11",
47+
"symfony/browser-kit": "^3.4.44||^4.4.20||^5.0.11",
48+
"symfony/dom-crawler": "^3.4.44||^4.4.20||^5.0.11",
49+
"symfony/framework-bundle": "^3.4.44||^4.4.20||^5.0.11",
50+
"symfony/messenger": "^4.4.20||^5.0.11",
5151
"symfony/monolog-bundle": "^3.4",
52-
"symfony/phpunit-bridge": "^5.0",
53-
"symfony/twig-bundle": "^3.4.44||^4.4.12||^5.0.11",
54-
"symfony/yaml": "^3.4.44||^4.4.12||^5.0.11",
52+
"symfony/phpunit-bridge": "^5.2.6",
53+
"symfony/twig-bundle": "^3.4.44||^4.4.20||^5.0.11",
54+
"symfony/yaml": "^3.4.44||^4.4.20||^5.0.11",
5555
"vimeo/psalm": "^4.3"
5656
},
5757
"suggest": {

‎tests/EventListener/TracingRequestListenerTest.php

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,18 @@ public function handleKernelRequestEventDataProvider(): \Generator
100100
'net.host.name' => 'www.example.com',
101101
]);
102102

103-
yield 'request.server.sentry-trace EXISTS' => [
104-
new Options(['send_default_pii' => false]),
103+
yield 'request.headers.sentry-trace EXISTS' => [
104+
new Options(),
105105
Request::create(
106106
'http://www.example.com',
107107
'GET',
108108
[],
109109
[],
110110
[],
111-
['HTTP_sentry-trace' => '566e3688a61d4bc888951642d6f14a19-566e3688a61d4bc8-1']
111+
[
112+
'REQUEST_TIME_FLOAT' => 1613493597.010275,
113+
'HTTP_sentry-trace' => '566e3688a61d4bc888951642d6f14a19-566e3688a61d4bc8-1',
114+
]
112115
),
113116
$transactionContext,
114117
];
@@ -126,58 +129,43 @@ public function handleKernelRequestEventDataProvider(): \Generator
126129
'net.host.name' => 'www.example.com',
127130
]);
128131

132+
$request = Request::create('http://www.example.com');
133+
$request->server->remove('REQUEST_TIME_FLOAT');
134+
129135
yield 'request.server.REQUEST_TIME_FLOAT NOT EXISTS' => [
130-
new Options(['send_default_pii' => false]),
131-
Request::create('http://www.example.com'),
136+
new Options(),
137+
$request,
132138
$transactionContext,
133139
];
134140

135141
$transactionContext = new TransactionContext();
136-
$transactionContext->setName('GET http://www.example.com/');
142+
$transactionContext->setName('GET http://127.0.0.1/');
137143
$transactionContext->setOp('http.server');
138-
$transactionContext->setStartTimestamp(1613493597.010819);
144+
$transactionContext->setStartTimestamp(1613493597.010275);
139145
$transactionContext->setTags([
140146
'net.host.port' => '80',
141147
'http.method' => 'GET',
142-
'http.url' => 'http://www.example.com/',
148+
'http.url' => 'http://127.0.0.1/',
143149
'http.flavor' => '1.1',
144150
'route' => '<unknown>',
145-
'net.host.name' => 'www.example.com',
151+
'net.host.ip' => '127.0.0.1',
146152
]);
147153

148-
yield 'request.server.REQUEST_TIME_FLOAT EXISTS' => [
149-
new Options(['send_default_pii' => false]),
154+
yield 'request.server.HOST IS IPV4' => [
155+
new Options(),
150156
Request::create(
151-
'http://www.example.com',
157+
'http://127.0.0.1',
152158
'GET',
153159
[],
154160
[],
155161
[],
156-
['REQUEST_TIME_FLOAT' => 1613493597.010819]
162+
['REQUEST_TIME_FLOAT' => 1613493597.010275]
157163
),
158164
$transactionContext,
159165
];
160166

161-
$transactionContext = new TransactionContext();
162-
$transactionContext->setName('GET http://127.0.0.1/');
163-
$transactionContext->setOp('http.server');
164-
$transactionContext->setStartTimestamp(1613493597.010275);
165-
$transactionContext->setTags([
166-
'net.host.port' => '80',
167-
'http.method' => 'GET',
168-
'http.url' => 'http://127.0.0.1/',
169-
'http.flavor' => '1.1',
170-
'route' => '<unknown>',
171-
'net.host.ip' => '127.0.0.1',
172-
]);
173-
174-
yield 'request.server.HOST IS IPV4' => [
175-
new Options(['send_default_pii' => false]),
176-
Request::create('http://127.0.0.1'),
177-
$transactionContext,
178-
];
179-
180167
$request = Request::create('http://www.example.com/path');
168+
$request->server->set('REQUEST_TIME_FLOAT', 1613493597.010275);
181169
$request->attributes->set('_route', 'app_homepage');
182170

183171
$transactionContext = new TransactionContext();
@@ -194,12 +182,13 @@ public function handleKernelRequestEventDataProvider(): \Generator
194182
]);
195183

196184
yield 'request.attributes.route IS STRING' => [
197-
new Options(['send_default_pii' => false]),
185+
new Options(),
198186
$request,
199187
$transactionContext,
200188
];
201189

202190
$request = Request::create('http://www.example.com/path');
191+
$request->server->set('REQUEST_TIME_FLOAT', 1613493597.010275);
203192
$request->attributes->set('_route', new Route('/path'));
204193

205194
$transactionContext = new TransactionContext();
@@ -216,12 +205,13 @@ public function handleKernelRequestEventDataProvider(): \Generator
216205
]);
217206

218207
yield 'request.attributes.route IS INSTANCEOF Symfony\Component\Routing\Route' => [
219-
new Options(['send_default_pii' => false]),
208+
new Options(),
220209
$request,
221210
$transactionContext,
222211
];
223212

224213
$request = Request::create('http://www.example.com/');
214+
$request->server->set('REQUEST_TIME_FLOAT', 1613493597.010275);
225215
$request->attributes->set('_controller', 'App\\Controller::indexAction');
226216

227217
$transactionContext = new TransactionContext();
@@ -237,13 +227,14 @@ public function handleKernelRequestEventDataProvider(): \Generator
237227
'net.host.name' => 'www.example.com',
238228
]);
239229

240-
yield 'request.attributes.controller IS STRING' => [
241-
new Options(['send_default_pii' => false]),
230+
yield 'request.attributes._controller IS STRING' => [
231+
new Options(),
242232
$request,
243233
$transactionContext,
244234
];
245235

246236
$request = Request::create('http://www.example.com/');
237+
$request->server->set('REQUEST_TIME_FLOAT', 1613493597.010275);
247238
$request->attributes->set('_controller', ['App\\Controller', 'indexAction']);
248239

249240
$transactionContext = new TransactionContext();
@@ -259,13 +250,14 @@ public function handleKernelRequestEventDataProvider(): \Generator
259250
'net.host.name' => 'www.example.com',
260251
]);
261252

262-
yield 'request.attributes.controller IS CALLABLE (1)' => [
263-
new Options(['send_default_pii' => false]),
253+
yield 'request.attributes._controller IS CALLABLE (1)' => [
254+
new Options(),
264255
$request,
265256
$transactionContext,
266257
];
267258

268259
$request = Request::create('http://www.example.com/');
260+
$request->server->set('REQUEST_TIME_FLOAT', 1613493597.010275);
269261
$request->attributes->set('_controller', [new class() {}, 'indexAction']);
270262

271263
$transactionContext = new TransactionContext();
@@ -281,13 +273,14 @@ public function handleKernelRequestEventDataProvider(): \Generator
281273
'net.host.name' => 'www.example.com',
282274
]);
283275

284-
yield 'request.attributes.controller IS CALLABLE (2)' => [
285-
new Options(['send_default_pii' => false]),
276+
yield 'request.attributes._controller IS CALLABLE (2)' => [
277+
new Options(),
286278
$request,
287279
$transactionContext,
288280
];
289281

290282
$request = Request::create('http://www.example.com/');
283+
$request->server->set('REQUEST_TIME_FLOAT', 1613493597.010275);
291284
$request->attributes->set('_controller', [10]);
292285

293286
$transactionContext = new TransactionContext();
@@ -303,13 +296,14 @@ public function handleKernelRequestEventDataProvider(): \Generator
303296
'net.host.name' => 'www.example.com',
304297
]);
305298

306-
yield 'request.attributes.controller IS ARRAY and NOT VALID CALLABLE' => [
307-
new Options(['send_default_pii' => false]),
299+
yield 'request.attributes._controller IS ARRAY and NOT VALID CALLABLE' => [
300+
new Options(),
308301
$request,
309302
$transactionContext,
310303
];
311304

312305
$request = Request::create('http://www.example.com/');
306+
$request->server->set('REQUEST_TIME_FLOAT', 1613493597.010275);
313307
$request->attributes->set('_controller', [10]);
314308

315309
$transactionContext = new TransactionContext();

0 commit comments

Comments
 (0)