Skip to content

Commit 233fa35

Browse files
vidarlvidarl
committed
Changed $this->assert* to self::assert* in related tests
1 parent 10e7174 commit 233fa35

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

‎tests/bundle/Core/Fragment/DirectFragmentRendererTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ public function testSubRequestBuilding(): void
3131
$controllerResolver
3232
->expects($this->any())
3333
->method('getController')
34-
->with($this->callback(function (Request $request) {
35-
$this->assertEquals('/_fragment', $request->getPathInfo());
36-
$this->assertEquals('some::controller', $request->attributes->get('_controller'));
37-
$this->assertEquals('attribute_value', $request->attributes->get('some'));
38-
$this->assertEquals('else', $request->attributes->get('something'));
39-
$this->assertInstanceOf(SiteAccess::class, $request->attributes->get('siteaccess'));
40-
$this->assertEquals('test', $request->attributes->get('siteaccess')->name);
34+
->with($this->callback(static function (Request $request) {
35+
self::assertEquals('/_fragment', $request->getPathInfo());
36+
self::assertEquals('some::controller', $request->attributes->get('_controller'));
37+
self::assertEquals('attribute_value', $request->attributes->get('some'));
38+
self::assertEquals('else', $request->attributes->get('something'));
39+
self::assertInstanceOf(SiteAccess::class, $request->attributes->get('siteaccess'));
40+
self::assertEquals('test', $request->attributes->get('siteaccess')->name);
4141

4242
return true;
4343
}))
@@ -65,8 +65,8 @@ public function testSubRequestBuilding(): void
6565
$directFragmentRenderer = $this->getDirectFragmentRenderer($controllerResolver);
6666
$response = $directFragmentRenderer->render($controllerReference, $request);
6767

68-
$this->assertInstanceOf(Response::class, $response);
69-
$this->assertSame('rendered_response', $response->getContent());
68+
self::assertInstanceOf(Response::class, $response);
69+
self::assertSame('rendered_response', $response->getContent());
7070
}
7171

7272
public function testControllerResponse(): void
@@ -82,8 +82,8 @@ public function testControllerResponse(): void
8282
$directFragmentRenderer = $this->getDirectFragmentRenderer($controllerResolver);
8383
$response = $directFragmentRenderer->render('', new Request(), []);
8484

85-
$this->assertInstanceOf(Response::class, $response);
86-
$this->assertSame('response_body', $response->getContent());
85+
self::assertInstanceOf(Response::class, $response);
86+
self::assertSame('response_body', $response->getContent());
8787
}
8888

8989
/**
@@ -165,8 +165,8 @@ public function testControllerStringResponse(): void
165165
$directFragmentRenderer = $this->getDirectFragmentRenderer($controllerResolver);
166166
$response = $directFragmentRenderer->render('', new Request(), []);
167167

168-
$this->assertInstanceOf(Response::class, $response);
169-
$this->assertSame('some_prerendered_response', $response->getContent());
168+
self::assertInstanceOf(Response::class, $response);
169+
self::assertSame('some_prerendered_response', $response->getContent());
170170
}
171171

172172
public function testControllerUnhandledStringResponse(): void

‎tests/bundle/Core/Fragment/FragmentRendererBaseTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@ public function testRendererControllerReferenceWithCompoundMatcher(): Controller
4343
->will($this->returnValue($expectedReturn));
4444

4545
$renderer = $this->getRenderer();
46-
$this->assertSame($expectedReturn, $renderer->render($reference, $request, $options));
47-
$this->assertArrayHasKey('serialized_siteaccess', $reference->attributes);
46+
self::assertSame($expectedReturn, $renderer->render($reference, $request, $options));
47+
self::assertArrayHasKey('serialized_siteaccess', $reference->attributes);
4848
$serializedSiteAccess = json_encode($siteAccess);
49-
$this->assertSame($serializedSiteAccess, $reference->attributes['serialized_siteaccess']);
50-
$this->assertArrayHasKey('serialized_siteaccess_matcher', $reference->attributes);
51-
$this->assertSame(
49+
self::assertSame($serializedSiteAccess, $reference->attributes['serialized_siteaccess']);
50+
self::assertArrayHasKey('serialized_siteaccess_matcher', $reference->attributes);
51+
self::assertSame(
5252
$this->getSerializer()->serialize(
5353
$siteAccess->matcher,
5454
'json',
5555
[AbstractNormalizer::IGNORED_ATTRIBUTES => ['request', 'container', 'matcherBuilder']]
5656
),
5757
$reference->attributes['serialized_siteaccess_matcher']
5858
);
59-
$this->assertArrayHasKey('serialized_siteaccess_sub_matchers', $reference->attributes);
59+
self::assertArrayHasKey('serialized_siteaccess_sub_matchers', $reference->attributes);
6060
foreach ($siteAccess->matcher->getSubMatchers() as $subMatcher) {
61-
$this->assertSame(
61+
self::assertSame(
6262
$this->getSerializer()->serialize(
6363
$subMatcher,
6464
'json',

‎tests/bundle/Core/Fragment/InlineFragmentRendererTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ public function testRendererControllerReferenceWithCompoundMatcher(): Controller
9999
{
100100
$reference = parent::testRendererControllerReferenceWithCompoundMatcher();
101101

102-
$this->assertArrayHasKey('semanticPathinfo', $reference->attributes);
103-
$this->assertSame('/foo/bar', $reference->attributes['semanticPathinfo']);
104-
$this->assertArrayHasKey('viewParametersString', $reference->attributes);
105-
$this->assertSame('/(foo)/bar', $reference->attributes['viewParametersString']);
102+
self::assertArrayHasKey('semanticPathinfo', $reference->attributes);
103+
self::assertSame('/foo/bar', $reference->attributes['semanticPathinfo']);
104+
self::assertArrayHasKey('viewParametersString', $reference->attributes);
105+
self::assertSame('/(foo)/bar', $reference->attributes['viewParametersString']);
106106

107107
return $reference;
108108
}

‎tests/lib/MVC/Symfony/Templating/RenderContentStrategyTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testUnsupportedValueObject(): void
3333

3434
$valueObject = new class() extends ValueObject {
3535
};
36-
$this->assertFalse($renderContentStrategy->supports($valueObject));
36+
self::assertFalse($renderContentStrategy->supports($valueObject));
3737

3838
$this->expectException(InvalidArgumentException::class);
3939
$renderContentStrategy->render($valueObject, new RenderOptions());
@@ -50,9 +50,9 @@ public function testDefaultFragmentRenderer(): void
5050
);
5151

5252
$contentMock = $this->createMock(Content::class);
53-
$this->assertTrue($renderContentStrategy->supports($contentMock));
53+
self::assertTrue($renderContentStrategy->supports($contentMock));
5454

55-
$this->assertSame(
55+
self::assertSame(
5656
'inline_rendered',
5757
$renderContentStrategy->render($contentMock, new RenderOptions())
5858
);
@@ -66,7 +66,7 @@ public function testUnknownFragmentRenderer(): void
6666
);
6767

6868
$contentMock = $this->createMock(Content::class);
69-
$this->assertTrue($renderContentStrategy->supports($contentMock));
69+
self::assertTrue($renderContentStrategy->supports($contentMock));
7070

7171
$this->expectException(InvalidArgumentException::class);
7272
$renderContentStrategy->render($contentMock, new RenderOptions());
@@ -84,9 +84,9 @@ public function testMultipleFragmentRenderers(): void
8484
);
8585

8686
$contentMock = $this->createMock(Content::class);
87-
$this->assertTrue($renderContentStrategy->supports($contentMock));
87+
self::assertTrue($renderContentStrategy->supports($contentMock));
8888

89-
$this->assertSame(
89+
self::assertSame(
9090
'method_b_rendered',
9191
$renderContentStrategy->render($contentMock, new RenderOptions([
9292
'method' => 'method_b',
@@ -181,19 +181,19 @@ public function testExpectedMethodRenderArgumentsFormat(): void
181181
->method('getName')
182182
->willReturn('method_b');
183183

184-
$controllerReferenceCallback = $this->callback(function (ControllerReference $controllerReference) {
185-
$this->assertInstanceOf(ControllerReference::class, $controllerReference);
186-
$this->assertEquals('ibexa_content::viewAction', $controllerReference->controller);
187-
$this->assertSame([
184+
$controllerReferenceCallback = $this->callback(static function (ControllerReference $controllerReference) {
185+
self::assertInstanceOf(ControllerReference::class, $controllerReference);
186+
self::assertEquals('ibexa_content::viewAction', $controllerReference->controller);
187+
self::assertSame([
188188
'contentId' => 123,
189189
'viewType' => 'awesome',
190190
], $controllerReference->attributes);
191191

192192
return true;
193193
});
194194

195-
$requestCallback = $this->callback(function (Request $request) use ($siteAccess, $content): bool {
196-
$this->assertSame('TEST/1.0', $request->headers->get('Surrogate-Capability'));
195+
$requestCallback = $this->callback(static function (Request $request) use ($siteAccess, $content): bool {
196+
self::assertSame('TEST/1.0', $request->headers->get('Surrogate-Capability'));
197197

198198
return true;
199199
});
@@ -216,7 +216,7 @@ public function testExpectedMethodRenderArgumentsFormat(): void
216216
$request
217217
);
218218

219-
$this->assertSame('some_rendered_content', $renderContentStrategy->render(
219+
self::assertSame('some_rendered_content', $renderContentStrategy->render(
220220
$content,
221221
new RenderOptions([
222222
'method' => 'method_b',

0 commit comments

Comments
 (0)