Merge remote-tracking branch 'upstream/5.4.x' into fix-kms-xsd-docs-alignment

Author: GromNaN

.github/dependabot.yml

@@ -6,4 +6,3 @@ updates:
       interval: "weekly"
     labels:
       - "CI"
-    target-branch: "5.1.x"

.github/workflows/coding-standards.yml

@@ -11,4 +11,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.1.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.3.0"

.github/workflows/composer-lint.yml

@@ -15,4 +15,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@7.1.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@7.3.0"

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.1.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.3.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -15,4 +15,4 @@ on:
 
 jobs:
   static-analysis:
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.1.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.3.0"

docs/config.rst

@@ -49,9 +49,9 @@ Sample Configuration
 
     .. code-block:: php
 
+        use Symfony\Config\DoctrineMongodbConfig;
         use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
         use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
-        use Symfony\Config\DoctrineMongodbConfig;
 
         return static function (DoctrineMongodbConfig $config): void {
             $config->connection('default')
@@ -142,9 +142,9 @@ If you wish to use memcached to cache your metadata, you need to configure the
 
     .. code-block:: php
 
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
         use Symfony\Component\Cache\Adapter\MemcachedAdapter;
         use Symfony\Config\DoctrineMongodbConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 
         return static function (DoctrineMongodbConfig $config): void {
             $config->defaultDatabase('hello_' . param('kernel.environment'));
@@ -260,8 +260,8 @@ The following configuration shows a bunch of mapping examples:
 
     .. code-block:: php
 
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
         use Symfony\Config\DoctrineMongodbConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 
         return static function (DoctrineMongodbConfig $config): void {
             $config->documentManager('default')
@@ -475,8 +475,8 @@ following syntax:
 
     .. code-block:: php
 
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
         use Symfony\Config\DoctrineMongodbConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 
         return static function (DoctrineMongodbConfig $config): void {
             $config->defaultDatabase('hello_' . param('kernel.environment'));
@@ -624,15 +624,6 @@ Otherwise you will get a *auth failed* exception.
                 ]);
         };
 
-Specifying a context service
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The MongoDB driver supports receiving a stream context to set SSL and logging options. This can be used to authenticate using SSL certificates.
-
-.. seealso::
-
-    For full documentation and configuration examples for Client-Side Field-Level Encryption (CSFLE) and Queryable Encryption (QE), see :doc:`csfle_qe`
-
 Full Default Configuration
 --------------------------
 
@@ -917,6 +908,11 @@ Full Default Configuration
                 ])
         };
 
+.. seealso::
+
+    For full documentation and configuration examples for Client-Side Field-Level
+    Encryption (CSFLE) and Queryable Encryption (QE), see :doc:`csfle_qe`
+
 .. _`Custom types`: https://www.doctrine-project.org/projects/doctrine-mongodb-odm/en/current/reference/custom-mapping-types.html
 .. _`define it as an environment variable`: https://symfony.com/doc/current/configuration.html#configuration-based-on-environment-variables
 .. _`connection string`: https://docs.mongodb.com/manual/reference/connection-string/#urioption.authSource

src/DependencyInjection/Configuration.php

@@ -333,7 +333,9 @@ private function addConnectionsSection(ArrayNodeDefinition $rootNode): void
                             ->arrayNode('driver_options')
                                 ->performNoDeepMerging()
                                 ->children()
-                                    ->scalarNode('context')->defaultNull()->end()
+                                    ->scalarNode('context')
+                                        ->defaultNull()
+                                        ->setDeprecated('doctrine/mongodb-odm-bundle', '5.4', 'The "context" driver option is deprecated and will be removed in 3.0. This option is ignored by the MongoDB driver version 2.')
                                     ->arrayNode('autoEncryption')
                                         ->children()
                                             ->booleanNode('bypassAutoEncryption')->end()

tests/DependencyInjection/ConfigurationTest.php

@@ -61,9 +61,14 @@ public function testDefaults(): void
         $this->assertEquals($defaults, $options);
     }
 
-    /** @dataProvider provideFullConfiguration */
+    /**
+     * @dataProvider provideFullConfiguration
+     * @group legacy
+     */
     public function testFullConfiguration(array $config): void
     {
+        self::expectDeprecation('Since doctrine/mongodb-odm-bundle 5.4: The "context" driver option is deprecated and will be removed in 3.0. This option is ignored by the MongoDB driver version 2.');
+
         $processor     = new Processor();
         $configuration = new Configuration();
         $options       = $processor->processConfiguration($configuration, [$config]);