From fddf6146a4a9c8156a6df55d34ef5f98f171bb78 Mon Sep 17 00:00:00 2001 From: core23 Date: Wed, 1 Dec 2021 13:55:03 +0100 Subject: [PATCH] Fix symfony deprecations --- .../Symfony/Bundle/NucleosDoctrineBundle.php | 4 +-- .../DependencyInjection/Configuration.php | 2 +- src/EventListener/ORM/ConfirmableListener.php | 2 +- src/EventListener/ORM/DeletableListener.php | 2 +- .../ORM/LifecycleDateListener.php | 2 +- src/EventListener/ORM/SortableListener.php | 2 +- .../ORM/UniqueActiveListener.php | 2 +- tests/Bridge/Symfony/App/AppKernel.php | 26 ++++++++++++++----- 8 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/Bridge/Symfony/Bundle/NucleosDoctrineBundle.php b/src/Bridge/Symfony/Bundle/NucleosDoctrineBundle.php index e848d8d9..3807bc4b 100644 --- a/src/Bridge/Symfony/Bundle/NucleosDoctrineBundle.php +++ b/src/Bridge/Symfony/Bundle/NucleosDoctrineBundle.php @@ -16,12 +16,12 @@ final class NucleosDoctrineBundle extends Bundle { - public function getPath() + public function getPath(): string { return __DIR__.'/..'; } - protected function getContainerExtensionClass() + protected function getContainerExtensionClass(): string { return NucleosDoctrineExtension::class; } diff --git a/src/Bridge/Symfony/DependencyInjection/Configuration.php b/src/Bridge/Symfony/DependencyInjection/Configuration.php index a3ac7c65..0c21a375 100644 --- a/src/Bridge/Symfony/DependencyInjection/Configuration.php +++ b/src/Bridge/Symfony/DependencyInjection/Configuration.php @@ -17,7 +17,7 @@ final class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder() + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('nucleos_doctrine'); diff --git a/src/EventListener/ORM/ConfirmableListener.php b/src/EventListener/ORM/ConfirmableListener.php index 96a8974b..fd5eb063 100644 --- a/src/EventListener/ORM/ConfirmableListener.php +++ b/src/EventListener/ORM/ConfirmableListener.php @@ -18,7 +18,7 @@ final class ConfirmableListener extends AbstractListener { - public function getSubscribedEvents() + public function getSubscribedEvents(): array { return [ Events::loadClassMetadata, diff --git a/src/EventListener/ORM/DeletableListener.php b/src/EventListener/ORM/DeletableListener.php index 6d5a1753..9752fbdf 100644 --- a/src/EventListener/ORM/DeletableListener.php +++ b/src/EventListener/ORM/DeletableListener.php @@ -18,7 +18,7 @@ final class DeletableListener extends AbstractListener { - public function getSubscribedEvents() + public function getSubscribedEvents(): array { return [ Events::loadClassMetadata, diff --git a/src/EventListener/ORM/LifecycleDateListener.php b/src/EventListener/ORM/LifecycleDateListener.php index 5b5c6512..61358d62 100644 --- a/src/EventListener/ORM/LifecycleDateListener.php +++ b/src/EventListener/ORM/LifecycleDateListener.php @@ -20,7 +20,7 @@ final class LifecycleDateListener extends AbstractListener { - public function getSubscribedEvents() + public function getSubscribedEvents(): array { return [ Events::prePersist, diff --git a/src/EventListener/ORM/SortableListener.php b/src/EventListener/ORM/SortableListener.php index 3738d687..e29c880b 100644 --- a/src/EventListener/ORM/SortableListener.php +++ b/src/EventListener/ORM/SortableListener.php @@ -44,7 +44,7 @@ public function __construct(PropertyAccessor $propertyAccessor = null) $this->propertyAccessor = $propertyAccessor; } - public function getSubscribedEvents() + public function getSubscribedEvents(): array { return [ Events::prePersist, diff --git a/src/EventListener/ORM/UniqueActiveListener.php b/src/EventListener/ORM/UniqueActiveListener.php index 2006b641..63fcb602 100644 --- a/src/EventListener/ORM/UniqueActiveListener.php +++ b/src/EventListener/ORM/UniqueActiveListener.php @@ -41,7 +41,7 @@ public function __construct(PropertyAccessor $propertyAccessor = null) $this->propertyAccessor = $propertyAccessor; } - public function getSubscribedEvents() + public function getSubscribedEvents(): array { return [ Events::prePersist, diff --git a/tests/Bridge/Symfony/App/AppKernel.php b/tests/Bridge/Symfony/App/AppKernel.php index f5345ee3..cd1d11ab 100644 --- a/tests/Bridge/Symfony/App/AppKernel.php +++ b/tests/Bridge/Symfony/App/AppKernel.php @@ -16,10 +16,9 @@ use Nucleos\Doctrine\Tests\Bridge\Symfony\App\Controller\SampleTestController; use Symfony\Bundle\FrameworkBundle\FrameworkBundle; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; -use Symfony\Component\Config\Loader\LoaderInterface; -use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Symfony\Component\HttpKernel\Kernel; -use Symfony\Component\Routing\RouteCollectionBuilder; +use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator; final class AppKernel extends Kernel { @@ -30,7 +29,7 @@ public function __construct() parent::__construct('test', false); } - public function registerBundles() + public function registerBundles(): iterable { yield new FrameworkBundle(); yield new DoctrineBundle(); @@ -52,13 +51,28 @@ public function getProjectDir(): string return __DIR__; } - protected function configureRoutes(RouteCollectionBuilder $routes): void + protected function configureRoutes($routes): void { + if ($routes instanceof RoutingConfigurator) { + $routes + ->add('sample', '/test') + ->controller(SampleTestController::class) + ; + + return; + } + $routes->add('/test', SampleTestController::class); } - protected function configureContainer(ContainerBuilder $containerBuilder, LoaderInterface $loader): void + protected function configureContainer($container, $loader): void { + if ($container instanceof ContainerConfigurator) { + $container->import(__DIR__.'/config/config.yaml'); + + return; + } + $loader->load(__DIR__.'/config/config.yaml'); }