Skip to content

Commit 84c3cb7

Browse files
LitarnusLitarnus
committed
lints and tests
1 parent 1a9ff70 commit 84c3cb7

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

‎phpstan-baseline.neon‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,3 +424,8 @@ parameters:
424424
message: "#^Parameter \\#2 \\$responses of static method Sentry\\\\SentryBundle\\\\Tracing\\\\HttpClient\\\\AbstractTraceableResponse\\:\\:stream\\(\\) expects iterable\\<Sentry\\\\SentryBundle\\\\Tracing\\\\HttpClient\\\\AbstractTraceableResponse\\>, array\\<int, stdClass\\> given\\.$#"
425425
count: 1
426426
path: tests/Tracing/HttpClient/TraceableResponseTest.php
427+
428+
-
429+
message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertCount\\(\\) with 1 and array\\{\\} will always evaluate to false\\.$#"
430+
count: 2
431+
path: tests/End2End/TracingCacheEnd2EndTest.php

‎src/Tracing/Cache/TraceableTagAwareCacheAdapterForV3.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ final class TraceableTagAwareCacheAdapterForV3 implements TagAwareAdapterInterfa
2424
use TraceableCacheAdapterTrait;
2525

2626
/**
27-
* @param HubInterface $hub The current hub
27+
* @param HubInterface $hub The current hub
2828
* @param TagAwareAdapterInterface $decoratedAdapter The decorated cache adapter
2929
*/
3030
public function __construct(HubInterface $hub, TagAwareAdapterInterface $decoratedAdapter)

‎tests/End2End/App/Controller/TracingCacheController.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ public function populateCacheWithString()
3838
public function populateCacheWithInteger()
3939
{
4040
$this->cache->get('numeric', function () {
41-
if ($this->connection) {
42-
$this->connection->executeQuery('SELECT 1');
43-
}
44-
4541
return 1234;
4642
});
4743

‎tests/End2End/TracingCacheEnd2EndTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ protected function setUp(): void
2222
StubTransport::$events = [];
2323
}
2424

25-
public function testPopulateStringCache()
25+
public function testPopulateStringCache(): void
2626
{
2727
$client = static::createClient(['debug' => false]);
2828

@@ -48,7 +48,7 @@ public function testPopulateStringCache()
4848
$this->assertEquals($getSpan->getParentSpanId(), $putSpan->getParentSpanId());
4949
}
5050

51-
public function testCacheHit()
51+
public function testCacheHit(): void
5252
{
5353
$client = static::createClient(['debug' => false]);
5454

@@ -73,7 +73,7 @@ public function testCacheHit()
7373
$this->assertTrue($span->getData('cache.hit'));
7474
}
7575

76-
public function testNonStringItemSize()
76+
public function testNonStringItemSize(): void
7777
{
7878
$client = static::createClient(['debug' => false]);
7979

@@ -89,7 +89,7 @@ public function testNonStringItemSize()
8989
$this->assertNull($span->getData('cache.item_size'));
9090
}
9191

92-
public function testDeleteCacheSpan()
92+
public function testDeleteCacheSpan(): void
9393
{
9494
$client = static::createClient(['debug' => false]);
9595

@@ -106,7 +106,7 @@ public function testDeleteCacheSpan()
106106
$this->assertNull($span->getData('cache.item_size'));
107107
}
108108

109-
public function testGetWithDbSpan()
109+
public function testGetWithDbSpan(): void
110110
{
111111
$client = static::createClient(['debug' => false]);
112112

@@ -133,7 +133,7 @@ public function testGetWithDbSpan()
133133
$this->assertEquals($getSpan->getParentSpanId(), $putSpan->getParentSpanId());
134134
}
135135

136-
public function testPsrCachePopulateString()
136+
public function testPsrCachePopulateString(): void
137137
{
138138
$client = static::createClient(['debug' => false]);
139139

@@ -153,7 +153,7 @@ public function testPsrCachePopulateString()
153153
$this->assertEquals('cache.put', $putSpan->getOp());
154154
}
155155

156-
public function testPsrCacheHit()
156+
public function testPsrCacheHit(): void
157157
{
158158
$client = static::createClient(['debug' => false]);
159159

@@ -177,7 +177,7 @@ public function testPsrCacheHit()
177177
$this->assertTrue($span->getData('cache.hit'));
178178
}
179179

180-
public function testPsrCacheDelete()
180+
public function testPsrCacheDelete(): void
181181
{
182182
$client = static::createClient(['debug' => false]);
183183

‎tests/Tracing/Cache/AbstractTraceableCacheAdapterTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testGetItem(): void
6363
$spans = $transaction->getSpanRecorder()->getSpans();
6464

6565
$this->assertCount(2, $spans);
66-
$this->assertSame('cache.get_item', $spans[1]->getOp());
66+
$this->assertSame('cache.get', $spans[1]->getOp());
6767
$this->assertSame('foo', $spans[1]->getDescription());
6868
$this->assertNotNull($spans[1]->getEndTimestamp());
6969
}
@@ -92,7 +92,7 @@ public function testGetItems(): void
9292
$spans = $transaction->getSpanRecorder()->getSpans();
9393

9494
$this->assertCount(2, $spans);
95-
$this->assertSame('cache.get_items', $spans[1]->getOp());
95+
$this->assertSame('cache.get', $spans[1]->getOp());
9696
$this->assertNotNull($spans[1]->getEndTimestamp());
9797
}
9898

@@ -119,7 +119,7 @@ public function testClear(): void
119119
$spans = $transaction->getSpanRecorder()->getSpans();
120120

121121
$this->assertCount(2, $spans);
122-
$this->assertSame('cache.clear', $spans[1]->getOp());
122+
$this->assertSame('cache.flush', $spans[1]->getOp());
123123
$this->assertSame('foo', $spans[1]->getDescription());
124124
$this->assertNotNull($spans[1]->getEndTimestamp());
125125
}
@@ -189,7 +189,7 @@ public function testDelete(): void
189189
$spans = $transaction->getSpanRecorder()->getSpans();
190190

191191
$this->assertCount(2, $spans);
192-
$this->assertSame('cache.delete', $spans[1]->getOp());
192+
$this->assertSame('cache.remove', $spans[1]->getOp());
193193
$this->assertSame('foo', $spans[1]->getDescription());
194194
$this->assertNotNull($spans[1]->getEndTimestamp());
195195
}
@@ -255,7 +255,7 @@ public function testDeleteItem(): void
255255
$spans = $transaction->getSpanRecorder()->getSpans();
256256

257257
$this->assertCount(2, $spans);
258-
$this->assertSame('cache.delete_item', $spans[1]->getOp());
258+
$this->assertSame('cache.remove', $spans[1]->getOp());
259259
$this->assertSame('foo', $spans[1]->getDescription());
260260
$this->assertNotNull($spans[1]->getEndTimestamp());
261261
}
@@ -283,7 +283,7 @@ public function testDeleteItems(): void
283283
$spans = $transaction->getSpanRecorder()->getSpans();
284284

285285
$this->assertCount(2, $spans);
286-
$this->assertSame('cache.delete_items', $spans[1]->getOp());
286+
$this->assertSame('cache.remove', $spans[1]->getOp());
287287
$this->assertNotNull($spans[1]->getEndTimestamp());
288288
}
289289

@@ -311,7 +311,7 @@ public function testSave(): void
311311
$spans = $transaction->getSpanRecorder()->getSpans();
312312

313313
$this->assertCount(2, $spans);
314-
$this->assertSame('cache.save', $spans[1]->getOp());
314+
$this->assertSame('cache.put', $spans[1]->getOp());
315315
$this->assertNotNull($spans[1]->getEndTimestamp());
316316
}
317317

@@ -339,7 +339,7 @@ public function testSaveDeferred(): void
339339
$spans = $transaction->getSpanRecorder()->getSpans();
340340

341341
$this->assertCount(2, $spans);
342-
$this->assertSame('cache.save_deferred', $spans[1]->getOp());
342+
$this->assertSame('cache.put', $spans[1]->getOp());
343343
$this->assertNotNull($spans[1]->getEndTimestamp());
344344
}
345345

0 commit comments

Comments
 (0)