Merge branch 'develop' into chore/add-mit-license

Author: alekseytupichenkov

README.md

@@ -23,10 +23,10 @@ Enable the bundle by adding it to the list of registered bundles in ```config/bu
 <?php
 
 return [
-            Macpaw\SchemaContextBundle\SchemaContextBundle::class => ['all' => true],
-            Macpaw\SchemaContextBundle\PostgresSchemaBundle::class => ['all' => true],
-        // ...
-    ];
+    // ...
+    Macpaw\SchemaContextBundle\SchemaContextBundle::class => ['all' => true],
+    Macpaw\PostgresSchemaBundle\PostgresSchemaBundle::class => ['all' => true],
+];
 ```
 
 ## Configuration
@@ -41,6 +41,33 @@ doctrine:
             default:
                 wrapper_class: Macpaw\PostgresSchemaBundle\Doctrine\SchemaConnection
 ```
+
+Set `BaggageSchemaResolver` to `SchemaConnection` at kernel boot
+```php
+# src/Kernel.php
+
+use Macpaw\PostgresSchemaBundle\Doctrine\SchemaConnection;
+use Macpaw\SchemaContextBundle\Service\BaggageSchemaResolver;
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+
+class Kernel extends BaseKernel
+{
+    use MicroKernelTrait;
+
+    public function boot(): void
+    {
+        parent::boot();
+    
+        SchemaConnection::setSchemaResolver(
+            $this->getContainer()->get(BaggageSchemaResolver::class),
+        );
+    }
+
+    // ...
+}
+```
+
 Make sure you configure the context bundle properly:
 
 See https://github.com/MacPaw/schema-context-bundle/blob/develop/README.md

composer.json

@@ -18,7 +18,7 @@
         "doctrine/orm": "^2.17 || ^3.0",
         "symfony/doctrine-bridge": "^6.4 || ^7.0",
         "doctrine/dbal": "^3.4",
-        "macpaw/schema-context-bundle": "^1.0"
+        "macpaw/schema-context-bundle": "^1.1"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.10",

src/Doctrine/SchemaConnection.php

@@ -7,13 +7,13 @@
 use Doctrine\DBAL\Connection as DBALConnection;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Macpaw\PostgresSchemaBundle\Exception\UnsupportedPlatformException;
-use Macpaw\SchemaContextBundle\Service\SchemaResolver;
+use Macpaw\SchemaContextBundle\Service\BaggageSchemaResolver;
 
 class SchemaConnection extends DBALConnection
 {
-    private static ?SchemaResolver $schemaResolver = null;
+    private static ?BaggageSchemaResolver $schemaResolver = null;
 
-    public static function setSchemaResolver(SchemaResolver $resolver): void
+    public static function setSchemaResolver(BaggageSchemaResolver $resolver): void
     {
         self::$schemaResolver = $resolver;
     }

tests/Doctrine/SchemaConnectionTest.php

@@ -13,7 +13,7 @@
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Macpaw\PostgresSchemaBundle\Doctrine\SchemaConnection;
 use Macpaw\PostgresSchemaBundle\Exception\UnsupportedPlatformException;
-use Macpaw\SchemaContextBundle\Service\SchemaResolver;
+use Macpaw\SchemaContextBundle\Service\BaggageSchemaResolver;
 use PHPUnit\Framework\TestCase;
 
 class SchemaConnectionTest extends TestCase
@@ -39,7 +39,7 @@ public function testConnectSetsSearchPath(): void
         $connection->method('getDatabasePlatform')->willReturn($platform);
         $connection->method('fetchOne')->willReturn(true);
 
-        $resolver = new SchemaResolver();
+        $resolver = new BaggageSchemaResolver();
 
         $resolver->setSchema('test_schema');
 
@@ -59,7 +59,7 @@ public function testConnectSkipsWhenNoSchema(): void
         $driver->method('connect')->willReturn($driverConnection);
 
         $connection = new SchemaConnection([], $driver, new Configuration());
-        $resolver = new SchemaResolver();
+        $resolver = new BaggageSchemaResolver();
 
         SchemaConnection::setSchemaResolver($resolver);
 
@@ -83,7 +83,7 @@ public function testThrowsForUnsupportedPlatform(): void
 
         $connection->method('getDatabasePlatform')->willReturn($platform);
 
-        $resolver = new SchemaResolver();
+        $resolver = new BaggageSchemaResolver();
 
         $resolver->setSchema('test_schema');