Fix bundle extension

Author: Geekimo

DependencyInjection/Configuration.php

@@ -4,14 +4,13 @@
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
-class Configuration implements ConfigurationInterface
+final readonly class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('rethink_db');
-        $rootNode = $treeBuilder->getRootNode();
 
-        $rootNode
+        $treeBuilder->getRootNode()
             ->children()
                 ->scalarNode('hostname')
                     ->defaultValue('127.0.0.1')

DependencyInjection/RethinkDBExtension.php

@@ -4,12 +4,12 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-class RethinkDBExtension extends Extension
+final class RethinkDBExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);

Entity/ModelBase.php

@@ -5,16 +5,17 @@
 use Geekimo\Bundle\RethinkDBBundle\Service\Connection;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class ModelBase
+abstract class ModelBase
 {
-    protected $connection;
+    protected ContainerInterface $container;
+    protected Connection $connection;
 
-    public function setConnection(Connection $connection)
+    public function setConnection(Connection $connection): void
     {
         $this->connection = $connection;
     }
 
-    public function setContainer(ContainerInterface $container)
+    public function setContainer(ContainerInterface $container): void
     {
         $this->container = $container;
     }

Service/Connection.php

@@ -5,7 +5,7 @@
 use Geekimo\Bundle\RethinkDBBundle\Exception\QueryException;
 use r;
 
-class Connection {
+final readonly class Connection {
     private r\Connection $connection;
 
     public function __construct($parameters)

Service/Factory.php

@@ -2,7 +2,7 @@
 
 namespace Geekimo\Bundle\RethinkDBBundle\Service;
 
-class Factory
+final readonly class Factory
 {
     static public function getConnection($parameters) : Connection
     {

Service/Repository.php

@@ -6,15 +6,16 @@
 use Geekimo\Bundle\RethinkDBBundle\Exception\RepositoryErrorException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class Repository
+final readonly class Repository
 {
     public function __construct(
         private Connection $connection,
         private ContainerInterface $container,
     ) {
     }
 
-    public function get(string $model) {
+    public function get(string $model): ModelBase
+    {
         $model = new $model;
 
         if(!($model instanceof ModelBase)) {
@@ -25,7 +26,6 @@ public function get(string $model) {
             ));
         }
 
-        // some DI
         $model->setConnection($this->connection);
         $model->setContainer($this->container);