Fix symfony deprecations

nucleos · Dec 4, 2021 · fddf614 · fddf614
1 parent 2ea2acb
commit fddf614
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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');
     }