Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"require": {
"php": "^8.1",
"gedmo/doctrine-extensions": "^3.21.0",
"symfony/cache": "^6.4 || ^7.0",
"symfony/config": "^6.4 || ^7.0",
"symfony/dependency-injection": "^6.4 || ^7.0",
"symfony/event-dispatcher": "^6.4 || ^7.0",
"symfony/http-kernel": "^6.4 || ^7.0",
"symfony/cache": "^6.4 || ^7.0 || ^8.0",
"symfony/config": "^6.4 || ^7.0 || ^8.0",
"symfony/dependency-injection": "^6.4 || ^7.0 || ^8.0",
"symfony/event-dispatcher": "^6.4 || ^7.0 || ^8.0",
"symfony/http-kernel": "^6.4 || ^7.0 || ^8.0",
"symfony/translation-contracts": "^2.5 || ^3.5"
},
"require-dev": {
Expand All @@ -27,9 +27,9 @@
"phpstan/phpstan-phpunit": "^2.0",
"phpstan/phpstan-strict-rules": "^2.0",
"phpstan/phpstan-symfony": "^2.0",
"symfony/mime": "^6.4 || ^7.0",
"symfony/phpunit-bridge": "^v6.4.1 || ^7.0.1",
"symfony/security-core": "^6.4 || ^7.0"
"symfony/mime": "^6.4 || ^7.0 || ^8.0",
"symfony/phpunit-bridge": "^v6.4.1 || ^7.0.1 || ^8.0",
"symfony/security-core": "^6.4 || ^7.0 || ^8.0"
},
"suggest": {
"doctrine/doctrine-bundle": "to use the ORM extensions",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ValidateExtensionConfigurationPass implements CompilerPassInterface
*
* @return void
*/
public function process(ContainerBuilder $container)
public function process(ContainerBuilder $container): void
{
$extension = $container->getExtension('stof_doctrine_extensions');
\assert($extension instanceof StofDoctrineExtensionsExtension);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class StofDoctrineExtensionsExtension extends Extension
/**
* @return void
*/
public function load(array $configs, ContainerBuilder $container)
public function load(array $configs, ContainerBuilder $container): void
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

the class is already marked as @internal and sowe can add the required return type without breaking any bc promises.

{
$processor = new Processor();
$configuration = new Configuration();
Expand Down
2 changes: 1 addition & 1 deletion src/EventListener/BlameListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function onKernelRequest(RequestEvent $event): void
/**
* @return array<string, string>
*/
public static function getSubscribedEvents()
public static function getSubscribedEvents(): array
{
return array(
KernelEvents::REQUEST => 'onKernelRequest',
Expand Down
2 changes: 1 addition & 1 deletion src/EventListener/LocaleListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function onKernelRequest(RequestEvent $event): void
/**
* @return array<string, string>
*/
public static function getSubscribedEvents()
public static function getSubscribedEvents(): array
{
return array(
KernelEvents::REQUEST => 'onKernelRequest',
Expand Down
2 changes: 1 addition & 1 deletion src/EventListener/LoggerListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function onKernelRequest(RequestEvent $event): void
/**
* @return array<string, string>
*/
public static function getSubscribedEvents()
public static function getSubscribedEvents(): array
{
return array(
KernelEvents::REQUEST => 'onKernelRequest',
Expand Down
2 changes: 1 addition & 1 deletion src/StofDoctrineExtensionsBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class StofDoctrineExtensionsBundle extends Bundle
*
* @return void
*/
public function build(ContainerBuilder $container)
public function build(ContainerBuilder $container): void
{
$container->addCompilerPass(new ValidateExtensionConfigurationPass());
$container->addCompilerPass(new ReaderPass());
Expand Down
20 changes: 20 additions & 0 deletions tests/DependencyInjection/Compiler/ReaderPassTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace Stof\DoctrineExtensionsBundle\Tests\DependencyInjection\Compiler;

use PHPUnit\Framework\TestCase;
use Stof\DoctrineExtensionsBundle\DependencyInjection\Compiler\ReaderPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;

class ReaderPassTest extends TestCase
{
public function testProcess(): void
{
$readerPass = new ReaderPass();
$container = new ContainerBuilder();

$readerPass->process($container);

self::assertTrue($container->has('.stof_doctrine_extensions.reader'));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php

namespace Stof\DoctrineExtensionsBundle\Tests\DependencyInjection\Compiler;

use PHPUnit\Framework\TestCase;
use Stof\DoctrineExtensionsBundle\DependencyInjection\Compiler\ValidateExtensionConfigurationPass;
use Stof\DoctrineExtensionsBundle\DependencyInjection\StofDoctrineExtensionsExtension;
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
use Symfony\Component\DependencyInjection\ContainerBuilder;

class ValidateExtensionConfigurationPassTest extends TestCase
{
public function testProcessInvalidConfigurationExceptionEntityManagerNotFound(): void
{
$this->expectException(InvalidConfigurationException::class);

$readerPass = new ValidateExtensionConfigurationPass();
$extension = new StofDoctrineExtensionsExtension();
$container = new ContainerBuilder();
$container->registerExtension($extension);

$extension->load([
'orm' => ['default' => []],
], $container);

$readerPass->process($container);
}

public function testProcessInvalidConfigurationExceptionDocumentManagerNotFound(): void
{
$this->expectException(InvalidConfigurationException::class);

$readerPass = new ValidateExtensionConfigurationPass();
$extension = new StofDoctrineExtensionsExtension();
$container = new ContainerBuilder();
$container->registerExtension($extension);

$extension->load([
'mongodb' => ['default' => []],
], $container);

$readerPass->process($container);
}
}