Skip to content

feat: Compatibility with Symfony 8 (#FRAM-225) #10

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

Open
vincent4vx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Compatibility with Symfony 8 (#FRAM-225) #10

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
2 changes: 1 addition & 1 deletion BdfQueueBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
class BdfQueueBundle extends Bundle
{
public function build(ContainerBuilder $container)
public function build(ContainerBuilder $container): void
{
$container->addCompilerPass(new DriverFactoryPass());
$container->addCompilerPass(new RegisterFailerDriverPass());
Expand Down
3 changes: 2 additions & 1 deletion Consumption/Receiver/ResetServices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Bdf\Queue\Consumer\DelegateHelper;
use Bdf\Queue\Consumer\ReceiverInterface;
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetterInterface;

/**
* Reset all services registered on "kernel.reset".
Expand All @@ -14,7 +15,7 @@ class ResetServices implements ReceiverInterface
{
use DelegateHelper;

public function __construct(private ServicesResetter $servicesResetter)
public function __construct(private ServicesResetter|ServicesResetterInterface|\Symfony\Component\DependencyInjection\ServicesResetter $servicesResetter)
{
}

Expand Down
3 changes: 2 additions & 1 deletion Consumption/Receiver/ResetServicesFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Bdf\Queue\Consumer\ReceiverInterface;
use Bdf\QueueBundle\Consumption\ReceiverFactoryInterface;
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetterInterface;

class ResetServicesFactory implements ReceiverFactoryInterface
{
Expand All @@ -16,7 +17,7 @@ public function getReceiverNames(): array

public function create(ReceiverFactory $factory, ...$arguments): ReceiverInterface
{
if (!isset($arguments[0]) || !($arguments[0] instanceof ServicesResetter)) {
if (!isset($arguments[0]) || !($arguments[0] instanceof ServicesResetter || $arguments[0] instanceof ServicesResetterInterface || $arguments[0] instanceof \Symfony\Component\DependencyInjection\ServicesResetter)) {
throw new \LogicException(sprintf('First argument of %s should be an instance of %s.', ResetServices::class, ServicesResetter::class));
}

Expand Down
2 changes: 1 addition & 1 deletion DependencyInjection/BdfQueueExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/
class BdfQueueExtension extends Extension
{
public function load(array $configs, ContainerBuilder $container)
public function load(array $configs, ContainerBuilder $container): void
{
$configuration = $this->getConfiguration($configs, $container);
$config = $this->processConfiguration($configuration, $configs);
Expand Down
2 changes: 1 addition & 1 deletion DependencyInjection/Compiler/DriverFactoryPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ final class DriverFactoryPass implements CompilerPassInterface
{
public const CONFIGURATOR_TAG_NAME = 'bdf_queue.driver_configurator';

public function process(ContainerBuilder $container)
public function process(ContainerBuilder $container): void
{
$factory = $container->getDefinition(ConnectionDriverFactory::class);

Expand Down
2 changes: 1 addition & 1 deletion DependencyInjection/Compiler/RegisterFailerDriverPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ final class RegisterFailerDriverPass implements CompilerPassInterface
{
public const CONFIGURATOR_TAG_NAME = 'bdf_queue.failer.driver_configurator';

public function process(ContainerBuilder $container)
public function process(ContainerBuilder $container): void
{
$dsn = Dsn::parse($container->getParameter('bdf_queue.failer_dsn'));
$scheme = $dsn->getScheme();
Expand Down
2 changes: 1 addition & 1 deletion DependencyInjection/Compiler/RegisterReceiverFactoryPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ final class RegisterReceiverFactoryPass implements CompilerPassInterface
{
public const CONFIGURATOR_TAG_NAME = 'bdf_queue.receiver_factory';

public function process(ContainerBuilder $container)
public function process(ContainerBuilder $container): void
{
$factory = $container->getDefinition(ReceiverFactory::class);

Expand Down
3 changes: 2 additions & 1 deletion Tests/Consumption/Receiver/ResetServicesFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
use Bdf\QueueBundle\Consumption\Receiver\ResetServicesFactory;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetterInterface;

class ResetServicesFactoryTest extends TestCase
{
public function testServiceInstantiation()
{
$receiverFactory = $this->createMock(ReceiverFactory::class);
$resetter = $this->createMock(ServicesResetter::class);
$resetter = $this->createMock(\interface_exists(ServicesResetterInterface::class) ? ServicesResetterInterface::class : ServicesResetter::class);

$factory = new ResetServicesFactory();

Expand Down
3 changes: 2 additions & 1 deletion Tests/Consumption/Receiver/ResetServicesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
use Bdf\QueueBundle\Consumption\Receiver\ResetServices;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetterInterface;

class ResetServicesTest extends TestCase
{
public function testReceiveResetServices()
{
$message = new \stdClass();

$resetter = $this->createMock(ServicesResetter::class);
$resetter = $this->createMock(\interface_exists(ServicesResetterInterface::class) ? ServicesResetterInterface::class : ServicesResetter::class);
$resetter->expects($this->once())->method('reset');

$next = $this->createMock(NextInterface::class);
Expand Down
5 changes: 3 additions & 2 deletions Tests/Consumption/ReceiverLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use PHPUnit\Framework\TestCase;
use Psr\Container\ContainerInterface;
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetterInterface;

class ReceiverLoaderTest extends TestCase
{
Expand Down Expand Up @@ -111,7 +112,7 @@ public function testWithoutServiceResetterConfig()

public function testDefaultConfig()
{
$this->container->set('services_resetter', $this->createMock(ServicesResetter::class));
$this->container->set('services_resetter', $this->createMock(\interface_exists(ServicesResetterInterface::class) ? ServicesResetterInterface::class : ServicesResetter::class));

$loader = $this->getLoader([
'foo' => [
Expand All @@ -126,7 +127,7 @@ public function testDefaultConfig()

public function testFullOrderConfig()
{
$this->container->set('services_resetter', $this->createMock(ServicesResetter::class));
$this->container->set('services_resetter', $this->createMock(\interface_exists(ServicesResetterInterface::class) ? ServicesResetterInterface::class : ServicesResetter::class));

$loader = $this->getLoader([
'foo' => [
Expand Down
16 changes: 8 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
"b2pweb/bdf-queue": "~1.4",
"symfony/config": "^6.0|~7.0",
"symfony/dependency-injection": "^6.0|~7.0",
"symfony/expression-language": "^6.0|~7.0",
"symfony/framework-bundle": "^6.0|~7.0"
"symfony/config": "^6.0|~7.0|~8.0",
"symfony/dependency-injection": "^6.0|~7.0|~8.0",
"symfony/expression-language": "^6.0|~7.0|~8.0",
"symfony/framework-bundle": "^6.0|~7.|~8.0"
},
"require-dev": {
"phpunit/phpunit": "~9.0",
"symfony/phpunit-bridge": "^6.0|~7.0",
"symfony/yaml": "^6.0|~7.0",
"symfony/console": "^6.0|~7.0",
"b2pweb/bdf-prime-bundle": "~1.2",
"symfony/phpunit-bridge": "^6.0|~7.0|~8.0",
"symfony/yaml": "^6.0|~7.0|~8.0",
"symfony/console": "^6.0|~7.0|~8.0",
"b2pweb/bdf-prime-bundle": "dev-feature-FRAM-233-prime-v3 as 1.11.0",
"friendsofphp/php-cs-fixer": "~3.0"
},
"conflict": {
Expand Down
Loading