Merge pull request #2188 from doctrine/3.2.x-merge-up-into-3.3.x_NQsfNMjD

Merge release 3.2.1 into 3.3.x

Author: greg0ire

.doctrine-project.json

@@ -10,17 +10,22 @@
       "slug": "latest",
       "upcoming": true
     },
+    {
+      "name": "3.3",
+      "branchName": "3.3.x",
+      "slug": "3.3",
+      "upcoming": true
+    },
     {
       "name": "3.2",
       "branchName": "3.2.x",
       "slug": "3.2",
-      "upcoming": true
+      "current": true
     },
     {
       "name": "3.1",
-      "branchName": "3.1.x",
       "slug": "3.1",
-      "current": true
+      "maintained": false
     },
     {
       "name": "3.0",

.gitignore

@@ -5,3 +5,6 @@ phpunit.xml
 /.phpunit.result.cache
 /phpcs.xml
 /.phpcs-cache
+
+# created by phpstan-symfony
+/var/

.symfony.bundle.yaml

@@ -13,13 +13,14 @@ branches:
     - "3.0.x"
     - "3.1.x"
     - "3.2.x"
+    - "3.3.x"
     - "4.0.x"
 maintained_branches:
     - "2.18.x"
     - "2.19.x"
-    - "3.1.x"
     - "3.2.x"
+    - "3.3.x"
     - "4.0.x"
 doc_dir: "docs/en/"
-current_branch: "3.1.x"
-dev_branch: "3.2.x"
+current_branch: "3.2.x"
+dev_branch: "3.3.x"

src/DependencyInjection/DoctrineExtension.php

@@ -60,6 +60,7 @@
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransportFactory;
 use Symfony\Component\Messenger\MessageBusInterface;