Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Use static methods inside data providers #48625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2022
Merged

Use static methods inside data providers #48625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/HttpCodeActivationStrategyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,19 @@ public function isActivatedProvider(): array
{
return [
['/test', ['level' => Logger::ERROR], true],
['/400', ['level' => Logger::ERROR, 'context' => $this->getContextException(400)], true],
['/400/a', ['level' => Logger::ERROR, 'context' => $this->getContextException(400)], false],
['/400/b', ['level' => Logger::ERROR, 'context' => $this->getContextException(400)], false],
['/400/c', ['level' => Logger::ERROR, 'context' => $this->getContextException(400)], true],
['/401', ['level' => Logger::ERROR, 'context' => $this->getContextException(401)], true],
['/403', ['level' => Logger::ERROR, 'context' => $this->getContextException(403)], false],
['/404', ['level' => Logger::ERROR, 'context' => $this->getContextException(404)], false],
['/405', ['level' => Logger::ERROR, 'context' => $this->getContextException(405)], false],
['/500', ['level' => Logger::ERROR, 'context' => $this->getContextException(500)], true],
['/400', ['level' => Logger::ERROR, 'context' => self::getContextException(400)], true],
['/400/a', ['level' => Logger::ERROR, 'context' => self::getContextException(400)], false],
['/400/b', ['level' => Logger::ERROR, 'context' => self::getContextException(400)], false],
['/400/c', ['level' => Logger::ERROR, 'context' => self::getContextException(400)], true],
['/401', ['level' => Logger::ERROR, 'context' => self::getContextException(401)], true],
['/403', ['level' => Logger::ERROR, 'context' => self::getContextException(403)], false],
['/404', ['level' => Logger::ERROR, 'context' => self::getContextException(404)], false],
['/405', ['level' => Logger::ERROR, 'context' => self::getContextException(405)], false],
['/500', ['level' => Logger::ERROR, 'context' => self::getContextException(500)], true],
];
}

private function getContextException(int $code): array
private static function getContextException(int $code): array
{
return ['exception' => new HttpException($code)];
}
Expand Down
14 changes: 7 additions & 7 deletions src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/NotFoundActivationStrategyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,18 @@ public function isActivatedProvider(): array
{
return [
['/test', ['level' => Logger::DEBUG], false],
['/foo', ['level' => Logger::DEBUG, 'context' => $this->getContextException(404)], false],
['/baz/bar', ['level' => Logger::ERROR, 'context' => $this->getContextException(404)], false],
['/foo', ['level' => Logger::ERROR, 'context' => $this->getContextException(404)], false],
['/foo', ['level' => Logger::ERROR, 'context' => $this->getContextException(500)], true],
['/foo', ['level' => Logger::DEBUG, 'context' => self::getContextException(404)], false],
['/baz/bar', ['level' => Logger::ERROR, 'context' => self::getContextException(404)], false],
['/foo', ['level' => Logger::ERROR, 'context' => self::getContextException(404)], false],
['/foo', ['level' => Logger::ERROR, 'context' => self::getContextException(500)], true],

['/test', ['level' => Logger::ERROR], true],
['/baz', ['level' => Logger::ERROR, 'context' => $this->getContextException(404)], true],
['/baz', ['level' => Logger::ERROR, 'context' => $this->getContextException(500)], true],
['/baz', ['level' => Logger::ERROR, 'context' => self::getContextException(404)], true],
['/baz', ['level' => Logger::ERROR, 'context' => self::getContextException(500)], true],
];
}

protected function getContextException(int $code): array
protected static function getContextException(int $code): array
{
return ['exception' => new HttpException($code)];
}
Expand Down
18 changes: 9 additions & 9 deletions src/Symfony/Bridge/Monolog/Tests/Processor/DebugProcessorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function testDatetimeFormat(array $record, $expectedTimestamp)

public function providerDatetimeFormatTests(): array
{
$record = $this->getRecord();
$record = self::getRecord();

return [
[array_merge($record, ['datetime' => new \DateTime('2019-01-01T00:01:00+00:00')]), 1546300860],
Expand All @@ -58,7 +58,7 @@ public function testDatetimeRfc3339Format(array $record, $expectedTimestamp)

public function providerDatetimeRfc3339FormatTests(): array
{
$record = $this->getRecord();
$record = self::getRecord();

return [
[array_merge($record, ['datetime' => new \DateTime('2019-01-01T00:01:00+00:00')]), '2019-01-01T00:01:00.000+00:00'],
Expand All @@ -70,8 +70,8 @@ public function providerDatetimeRfc3339FormatTests(): array
public function testDebugProcessor()
{
$processor = new DebugProcessor();
$processor($this->getRecord());
$processor($this->getRecord(Logger::ERROR));
$processor(self::getRecord());
$processor(self::getRecord(Logger::ERROR));

$this->assertCount(2, $processor->getLogs());
$this->assertSame(1, $processor->countErrors());
Expand All @@ -89,17 +89,17 @@ public function testWithRequestStack()
{
$stack = new RequestStack();
$processor = new DebugProcessor($stack);
$processor($this->getRecord());
$processor($this->getRecord(Logger::ERROR));
$processor(self::getRecord());
$processor(self::getRecord(Logger::ERROR));

$this->assertCount(2, $processor->getLogs());
$this->assertSame(1, $processor->countErrors());

$request = new Request();
$stack->push($request);

$processor($this->getRecord());
$processor($this->getRecord(Logger::ERROR));
$processor(self::getRecord());
$processor(self::getRecord(Logger::ERROR));

$this->assertCount(4, $processor->getLogs());
$this->assertSame(2, $processor->countErrors());
Expand All @@ -123,7 +123,7 @@ public function testInheritedClassCallCountErrorsWithoutArgument()
$this->assertEquals(0, $debugProcessorChild->countErrors());
}

private function getRecord($level = Logger::WARNING, $message = 'test'): array
private static function getRecord($level = Logger::WARNING, $message = 'test'): array
{
return [
'message' => $message,
Expand Down
68 changes: 34 additions & 34 deletions src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ public function provideRequestAndResponses()
];

return [
[$nonce, ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce], $this->createRequest(), $this->createResponse()],
[$nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce], $this->createRequest($requestNonceHeaders), $this->createResponse($responseNonceHeaders)],
[$nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce], $this->createRequest($requestNonceHeaders), $this->createResponse()],
[$nonce, ['csp_script_nonce' => $responseScriptNonce, 'csp_style_nonce' => $responseStyleNonce], $this->createRequest(), $this->createResponse($responseNonceHeaders)],
[$nonce, ['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce], self::createRequest(), self::createResponse()],
[$nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce], self::createRequest($requestNonceHeaders), self::createResponse($responseNonceHeaders)],
[$nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce], self::createRequest($requestNonceHeaders), self::createResponse()],
[$nonce, ['csp_script_nonce' => $responseScriptNonce, 'csp_style_nonce' => $responseStyleNonce], self::createRequest(), self::createResponse($responseNonceHeaders)],
];
}

Expand All @@ -96,112 +96,112 @@ public function provideRequestAndResponsesForOnKernelResponse()
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(),
self::createRequest(),
self::createResponse(),
['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
],
[
$nonce, ['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce],
$this->createRequest($requestNonceHeaders),
$this->createResponse($responseNonceHeaders),
self::createRequest($requestNonceHeaders),
self::createResponse($responseNonceHeaders),
['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $requestScriptNonce, 'csp_style_nonce' => $requestStyleNonce],
$this->createRequest($requestNonceHeaders),
$this->createResponse(),
self::createRequest($requestNonceHeaders),
self::createResponse(),
['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $responseScriptNonce, 'csp_style_nonce' => $responseStyleNonce],
$this->createRequest(),
$this->createResponse($responseNonceHeaders),
self::createRequest(),
self::createResponse($responseNonceHeaders),
['Content-Security-Policy' => null, 'Content-Security-Policy-Report-Only' => null, 'X-Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(['Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:', 'Content-Security-Policy-Report-Only' => 'frame-ancestors http: ; form-action: http:']),
self::createRequest(),
self::createResponse(['Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:', 'Content-Security-Policy-Report-Only' => 'frame-ancestors http: ; form-action: http:']),
['Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:', 'Content-Security-Policy-Report-Only' => 'frame-ancestors http: ; form-action: http:', 'X-Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(['Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'']),
self::createRequest(),
self::createResponse(['Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'']),
['Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'; style-src \'self\' domain.com \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'; style-src \'self\' domain-report-only.com \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(['Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'; script-src-elem \'self\'; style-src \'self\' \'unsafe-inline\'; style-src-elem \'self\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'; script-src-elem \'self\'; style-src \'self\' \'unsafe-inline\'; style-src-elem \'self\'']),
self::createRequest(),
self::createResponse(['Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'; script-src-elem \'self\'; style-src \'self\' \'unsafe-inline\'; style-src-elem \'self\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'; script-src-elem \'self\'; style-src \'self\' \'unsafe-inline\'; style-src-elem \'self\'']),
['Content-Security-Policy' => 'default-src \'self\' domain.com; script-src \'self\' \'unsafe-inline\'; script-src-elem \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'self\' \'unsafe-inline\'; style-src-elem \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy-Report-Only' => 'default-src \'self\' domain-report-only.com; script-src \'self\' \'unsafe-inline\'; script-src-elem \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'self\' \'unsafe-inline\'; style-src-elem \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(['Content-Security-Policy' => 'default-src \'none\'', 'Content-Security-Policy-Report-Only' => 'default-src \'none\'']),
self::createRequest(),
self::createResponse(['Content-Security-Policy' => 'default-src \'none\'', 'Content-Security-Policy-Report-Only' => 'default-src \'none\'']),
['Content-Security-Policy' => 'default-src \'none\'; script-src \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy-Report-Only' => 'default-src \'none\'; script-src \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'']),
self::createRequest(),
self::createResponse(['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'']),
['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'', 'X-Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(['Content-Security-Policy' => 'script-src \'self\'; style-src \'self\'']),
self::createRequest(),
self::createResponse(['Content-Security-Policy' => 'script-src \'self\'; style-src \'self\'']),
['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'']),
self::createRequest(),
self::createResponse(['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'']),
['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'', 'Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(['X-Content-Security-Policy' => 'script-src \'self\'']),
self::createRequest(),
self::createResponse(['X-Content-Security-Policy' => 'script-src \'self\'']),
['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\'']),
self::createRequest(),
self::createResponse(['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\'']),
['X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null],
],
[
$nonce,
['csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce],
$this->createRequest(),
$this->createResponse(['Content-Security-Policy' => 'script-src \'self\'; style-src \'self\'', 'X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'self\'']),
self::createRequest(),
self::createResponse(['Content-Security-Policy' => 'script-src \'self\'; style-src \'self\'', 'X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'self\'']),
['Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\''],
],
];
}

private function createRequest(array $headers = [])
private static function createRequest(array $headers = [])
{
$request = new Request();
$request->headers->add($headers);

return $request;
}

private function createResponse(array $headers = [])
private static function createResponse(array $headers = [])
{
$response = new Response();
$response->headers->add($headers);
Expand Down
Loading