Skip to content

Fix call function on null #596

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
Spomky merged 2 commits into from
Dec 12, 2024
Merged

Fix call function on null #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b60ecb4
Add failing tests for JWECollector without compression
Dec 5, 2024
a3f43c9
Fix call function on null error
Dec 5, 2024
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
6 changes: 3 additions & 3 deletions src/Bundle/DataCollector/JWECollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ private function collectSupportedJWEBuilders(array &$data): void
'content_encryption_algorithms' => $jweBuilder->getContentEncryptionAlgorithmManager()
->list(),
'compression_methods' => $jweBuilder->getCompressionMethodManager()
->list(),
?->list(),
];
}
}
Expand All @@ -187,7 +187,7 @@ private function collectSupportedJWEDecrypters(array &$data): void
'content_encryption_algorithms' => $jweDecrypter->getContentEncryptionAlgorithmManager()
->list(),
'compression_methods' => $jweDecrypter->getCompressionMethodManager()
->list(),
?->list(),
];
}
}
Expand All @@ -210,7 +210,7 @@ private function collectSupportedJWELoaders(array &$data): void
->list(),
'compression_methods' => $jweLoader->getJweDecrypter()
->getCompressionMethodManager()
->list(),
?->list(),
];
}
}
Expand Down
100 changes: 100 additions & 0 deletions tests/Bundle/JoseFramework/Functional/Encryption/JWECollectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?php

declare(strict_types=1);

namespace Jose\Tests\Bundle\JoseFramework\Functional\Encryption;

use PHPUnit\Framework\Attributes\Test;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Jose\Bundle\JoseFramework\DataCollector\JWECollector;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Jose\Bundle\JoseFramework\Services\JWELoaderFactory as JWELoaderFactoryAlias;
use Jose\Bundle\JoseFramework\Services\JWEBuilderFactory as JWEBuilderFactoryService;
use Jose\Bundle\JoseFramework\Services\JWEDecrypterFactory as JWEDecrypterFactoryService;

/**
* @internal
*/
final class JWECollectorTest extends WebTestCase
{
#[Test]
public function aJWEBuilderCanBeCollectedWithoutACompressionMethodManager(): void
{
static::ensureKernelShutdown();
$client = static::createClient();
$container = $client->getContainer();
static::assertInstanceOf(ContainerInterface::class, $container);

$jweFactory = $container->get(JWEBuilderFactoryService::class);
static::assertInstanceOf(JWEBuilderFactoryService::class, $jweFactory);

$jweBuilder = $jweFactory->create(['RSA1_5', 'A256GCM']);

$jweCollector = new JWECollector();
$jweCollector->addJWEBuilder('builder2', $jweBuilder);

$data = [];
$jweCollector->collect($data, new Request(), new Response());

static::assertArrayHasKey('jwe', $data);
static::assertArrayHasKey('compression_methods', $data['jwe']);
static::assertSame([], $data['jwe']['compression_methods']);
static::assertArrayHasKey('jwe_builders', $data['jwe']);
static::assertArrayHasKey('builder2', $data['jwe']['jwe_builders']);
}


#[Test]
public function aJWEDecrypterCanBeCollectedWithoutACompressionMethodManager(): void
{
static::ensureKernelShutdown();
$client = static::createClient();
$container = $client->getContainer();
static::assertInstanceOf(ContainerInterface::class, $container);

$jweDecrypterFactory = $container->get(JWEDecrypterFactoryService::class);
static::assertInstanceOf(JWEDecrypterFactoryService::class, $jweDecrypterFactory);

$jweDecrypter = $jweDecrypterFactory->create(['RSA1_5', 'A256GCM']);

$jweCollector = new JWECollector();
$jweCollector->addJWEDecrypter('decrypter2', $jweDecrypter);

$data = [];
$jweCollector->collect($data, new Request(), new Response());

static::assertArrayHasKey('jwe', $data);
static::assertArrayHasKey('compression_methods', $data['jwe']);
static::assertSame([], $data['jwe']['compression_methods']);
static::assertArrayHasKey('jwe_decrypters', $data['jwe']);
static::assertArrayHasKey('decrypter2', $data['jwe']['jwe_decrypters']);
}

#[Test]
public function aJWELoaderCanBeCollectedWithoutACompressionMethodManager(): void
{
static::ensureKernelShutdown();
$client = static::createClient();
$container = $client->getContainer();
static::assertInstanceOf(ContainerInterface::class, $container);

$jweLoaderFactory = $container->get(JWELoaderFactoryAlias::class);
static::assertInstanceOf(JWELoaderFactoryAlias::class, $jweLoaderFactory);

$jweLoader = $jweLoaderFactory->create(['jwe_compact'], ['RSA1_5'], ['A256GCM']);

$jweCollector = new JWECollector();
$jweCollector->addJWELoader('loader2', $jweLoader);

$data = [];
$jweCollector->collect($data, new Request(), new Response());

static::assertArrayHasKey('jwe', $data);
static::assertArrayHasKey('compression_methods', $data['jwe']);
static::assertSame([], $data['jwe']['compression_methods']);
static::assertArrayHasKey('jwe_loaders', $data['jwe']);
static::assertArrayHasKey('loader2', $data['jwe']['jwe_loaders']);
}
}