Skip to content

[Security] use PHPUnit attributes instead of annotations #62013

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
xabbuh merged 1 commit into from
Oct 9, 2025
Merged

[Security] use PHPUnit attributes instead of annotations #62013

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
13 changes: 6 additions & 7 deletions src/Symfony/Component/Security/Http/Command/OidcTokenGenerateCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ protected function configure(): void
;
}


Copy link
Member Author

@xabbuh xabbuh Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#60660 (comment)

/**
* @params array<string, list<string>> $algorithms
* @params array<string, list<string>> $issuers
Expand Down Expand Up @@ -80,19 +79,19 @@ protected function execute(InputInterface $input, OutputInterface $output): int

private function getGenerator(?string $firewall): OidcTokenGenerator
{
if (0 === count($this->generators)) {
if (0 === \count($this->generators)) {
throw new \InvalidArgumentException('No OIDC token generator configured.');
}

if ($firewall) {
return $this->generators[$firewall] ?? throw new \InvalidArgumentException(sprintf('Invalid firewall. Available firewalls: "%s".', implode('", "', array_keys($this->generators))));
return $this->generators[$firewall] ?? throw new \InvalidArgumentException(\sprintf('Invalid firewall. Available firewalls: "%s".', implode('", "', array_keys($this->generators))));
}

if (1 === count($this->generators)) {
if (1 === \count($this->generators)) {
return end($this->generators);
}

throw new \InvalidArgumentException(sprintf('Please choose an firewall. Available firewalls: "%s".', implode('", "', array_keys($this->generators))));
throw new \InvalidArgumentException(\sprintf('Please choose an firewall. Available firewalls: "%s".', implode('", "', array_keys($this->generators))));
}

public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
Expand All @@ -103,13 +102,13 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti

if ($input->mustSuggestOptionValuesFor('algorithm')) {
foreach ($this->algorithms as $algorithm => $firewalls) {
$suggestions->suggestValue(new Suggestion($algorithm, sprintf('Available firewalls: "%s".', implode('", "', $firewalls))));
$suggestions->suggestValue(new Suggestion($algorithm, \sprintf('Available firewalls: "%s".', implode('", "', $firewalls))));
}
}

if ($input->mustSuggestOptionValuesFor('issuer')) {
foreach ($this->issuers as $issuer => $firewalls) {
$suggestions->suggestValue(new Suggestion($issuer, sprintf('Available firewalls: "%s".', implode('", "', $firewalls))));
$suggestions->suggestValue(new Suggestion($issuer, \sprintf('Available firewalls: "%s".', implode('", "', $firewalls))));
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcTokenGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,21 @@
* file that was distributed with this source code.
*/

namespace AccessToken\Oidc;
namespace Symfony\Component\Security\Http\Tests\AccessToken\Oidc;

use Jose\Component\Core\AlgorithmManager;
use Jose\Component\Core\JWK;
use Jose\Component\Core\JWKSet;
use Jose\Component\Signature\Algorithm\ES256;
use Jose\Component\Signature\Algorithm\ES512;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Clock\MockClock;
use Symfony\Component\Security\Http\AccessToken\Oidc\OidcTokenGenerator;
use Symfony\Component\Security\Http\AccessToken\Oidc\OidcTokenHandler;

/**
* @requires extension openssl
*/
#[RequiresPhpExtension('openssl')]
class OidcTokenGeneratorTest extends TestCase
{
public function testGenerate()
Expand Down