Remove the decorator and split implementation.

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.0'
 services:
     php-static-resolver-bundle:
         image: pimcore/pimcore:php8.2-debug-dev

src/Db/Contracts/DbResolverContract.php

@@ -17,31 +17,27 @@
 namespace Pimcore\Bundle\StaticResolverBundle\Db\Contracts;
 
 use Doctrine\DBAL\Connection;
-use Pimcore\Bundle\StaticResolverBundle\Db\DbResolverInterface;
+use Pimcore\Db;
 
 class DbResolverContract implements DbResolverContractInterface
 {
-    public function __construct(private readonly DbResolverInterface $dbResolver)
-    {
-    }
-
     public function getConnection(): Connection
     {
-        return $this->dbResolver->getConnection();
+        return Db::getConnection();
     }
 
     public function reset(): Connection
     {
-        return $this->dbResolver->reset();
+        return Db::reset();
     }
 
     public function get(): Connection
     {
-        return $this->dbResolver->get();
+        return Db::get();
     }
 
     public function close(): void
     {
-        $this->dbResolver->close();
+        Db::close();
     }
 }

src/Db/DbResolver.php

@@ -16,29 +16,10 @@
 
 namespace Pimcore\Bundle\StaticResolverBundle\Db;
 
-use Doctrine\DBAL\Connection;
-use Pimcore\Db;
+use Pimcore\Bundle\StaticResolverBundle\Db\Contracts\DbResolverContract;
 
 // @internal
-final class DbResolver implements DbResolverInterface
+final class DbResolver extends DbResolverContract implements DbResolverInterface
 {
-    public function getConnection(): Connection
-    {
-        return Db::getConnection();
-    }
-
-    public function reset(): Connection
-    {
-        return Db::reset();
-    }
-
-    public function get(): Connection
-    {
-        return Db::get();
-    }
-
-    public function close(): void
-    {
-        Db::close();
-    }
+    //Add new methods here
 }

src/Db/DbResolverInterface.php

@@ -16,16 +16,10 @@
 
 namespace Pimcore\Bundle\StaticResolverBundle\Db;
 
-use Doctrine\DBAL\Connection;
+use Pimcore\Bundle\StaticResolverBundle\Db\Contracts\DbResolverContractInterface;
 
 // @internal
-interface DbResolverInterface
+interface DbResolverInterface extends DbResolverContractInterface
 {
-    public function getConnection(): Connection;
-
-    public function reset(): Connection;
-
-    public function get(): Connection;
-
-    public function close(): void;
+    //Add new methods here
 }