Merge pull request #11201 from mpdude/merge-up-217-218

Merge 2.17.x up into 2.18.x
Merge remote-tracking branch 'origin/2.17.x' into 2.18.x
2026-04-24 06:58:19 +02:00 · 2024-01-31 16:53:12 +01:00 · 2024-01-31 15:41:59 +01:00 · 2024-01-31 08:50:41 +01:00 · 2024-01-30 15:39:35 -06:00 · 2024-01-30 11:26:54 +01:00
1596 changed files with 1259 additions and 1225 deletions
@@ -8,7 +8,7 @@ on:
      - .github/workflows/coding-standards.yml
      - bin/**
      - composer.*
-      - lib/**
+      - src/**
      - phpcs.xml.dist
      - tests/**
  push:
@@ -18,7 +18,7 @@ on:
      - .github/workflows/coding-standards.yml
      - bin/**
      - composer.*
-      - lib/**
+      - src/**
      - phpcs.xml.dist
      - tests/**

@@ -8,7 +8,7 @@ on:
      - .github/workflows/continuous-integration.yml
      - ci/**
      - composer.*
-      - lib/**
+      - src/**
      - phpunit.xml.dist
      - tests/**
  push:
@@ -18,7 +18,7 @@ on:
      - .github/workflows/continuous-integration.yml
      - ci/**
      - composer.*
-      - lib/**
+      - src/**
      - phpunit.xml.dist
      - tests/**

@@ -8,7 +8,7 @@ on:
    paths:
      - .github/workflows/phpbench.yml
      - composer.*
-      - lib/**
+      - src/**
      - phpbench.json
      - tests/**
  push:
@@ -17,7 +17,7 @@ on:
    paths:
      - .github/workflows/phpbench.yml
      - composer.*
-      - lib/**
+      - src/**
      - phpbench.json
      - tests/**

@@ -7,7 +7,7 @@ on:
    paths:
      - .github/workflows/static-analysis.yml
      - composer.*
-      - lib/**
+      - src/**
      - phpstan*
      - psalm*
      - tests/Doctrine/StaticAnalysis/**
@@ -17,7 +17,7 @@ on:
    paths:
      - .github/workflows/static-analysis.yml
      - composer.*
-      - lib/**
+      - src/**
      - phpstan*
      - psalm*
      - tests/Doctrine/StaticAnalysis/**
@@ -3,9 +3,6 @@ logs/
 reports/
 dist/
 download/
-lib/api/
-lib/Doctrine/Common
-lib/Doctrine/DBAL
 /.settings/
 .buildpath
 .project
@@ -1,6 +0,0 @@
-[submodule "docs/en/_theme"]
-    path = docs/en/_theme
-    url = git://github.com/doctrine/doctrine-sphinx-theme.git
-[submodule "lib/vendor/doctrine-build-common"]
-    path = lib/vendor/doctrine-build-common
-    url = git://github.com/doctrine/doctrine-build-common.git
@@ -23,7 +23,7 @@ You may fix many some of the issues with `vendor/bin/phpcbf`.
 Please try to add a test for your pull-request.

 * If you want to fix a bug or provide a reproduce case, create a test file in
-  ``tests/Doctrine/Tests/ORM/Functional/Ticket`` with the name of the ticket,
+  ``tests/Tests/ORM/Functional/Ticket`` with the name of the ticket,
  ``DDC1234Test.php`` for example.
 * If you want to contribute new functionality add unit- or functional tests
  depending on the scope of the feature.
@@ -57,7 +57,7 @@ sqlite database.
 Tips for creating unit tests:

 1. If you put a test into the `Ticket` namespace as described above, put the testcase and all entities into the same class.
-   See `https://github.com/doctrine/orm/tree/2.8.x/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php` for an
+   See `https://github.com/doctrine/orm/tree/2.8.x/tests/Tests/ORM/Functional/Ticket/DDC2306Test.php` for an
   example.

 ## Getting merged
@@ -1,7 +1,7 @@
-| [3.0.x][3.0] | [2.16.x][2.16] | [2.15.x][2.15] |
+| [3.0.x][3.0] | [2.18.x][2.18] | [2.17.x][2.17] |
 |:----------------:|:----------------:|:----------:|
-| [![Build status][3.0 image]][3.0] | [![Build status][2.16 image]][2.16] | [![Build status][2.15 image]][2.15] |
-| [![Coverage Status][3.0 coverage image]][3.0 coverage]| [![Coverage Status][2.16 coverage image]][2.16 coverage] | [![Coverage Status][2.15 coverage image]][2.15 coverage]  |
+| [![Build status][3.0 image]][3.0] | [![Build status][2.18 image]][2.18] | [![Build status][2.17 image]][2.17] |
+| [![Coverage Status][3.0 coverage image]][3.0 coverage]| [![Coverage Status][2.18 coverage image]][2.18 coverage] | [![Coverage Status][2.17 coverage image]][2.17 coverage]  |

 [<h1 align="center">🇺🇦 UKRAINE NEEDS YOUR HELP NOW!</h1>](https://www.doctrine-project.org/stop-war.html)

@@ -22,11 +22,11 @@ without requiring unnecessary code duplication.
  [3.0]: https://github.com/doctrine/orm/tree/3.0.x
  [3.0 coverage image]: https://codecov.io/gh/doctrine/orm/branch/3.0.x/graph/badge.svg
  [3.0 coverage]: https://codecov.io/gh/doctrine/orm/branch/3.0.x
-  [2.16 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.16.x
-  [2.16]: https://github.com/doctrine/orm/tree/2.16.x
-  [2.16 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.16.x/graph/badge.svg
-  [2.16 coverage]: https://codecov.io/gh/doctrine/orm/branch/2.16.x
-  [2.15 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.15.x
-  [2.15]: https://github.com/doctrine/orm/tree/2.15.x
-  [2.15 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.15.x/graph/badge.svg
-  [2.15 coverage]: https://codecov.io/gh/doctrine/orm/branch/2.15.x
+  [2.18 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.18.x
+  [2.18]: https://github.com/doctrine/orm/tree/2.18.x
+  [2.18 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.18.x/graph/badge.svg
+  [2.18 coverage]: https://codecov.io/gh/doctrine/orm/branch/2.18.x
+  [2.17 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.17.x
+  [2.17]: https://github.com/doctrine/orm/tree/2.17.x
+  [2.17 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.17.x/graph/badge.svg
+  [2.17 coverage]: https://codecov.io/gh/doctrine/orm/branch/2.17.x
@@ -13,6 +13,5 @@ understand the assumptions we make.
 - [DBAL Security Page](https://www.doctrine-project.org/projects/doctrine-dbal/en/stable/reference/security.html)
 - [ORM Security Page](https://www.doctrine-project.org/projects/doctrine-orm/en/stable/reference/security.html)

-If you find a Security bug in Doctrine, please report it on Jira and change the
-Security Level to "Security Issues". It will be visible to Doctrine Core
-developers and you only.
+If you find a Security bug in Doctrine, please follow our
+[Security reporting guidelines](https://www.doctrine-project.org/policies/security.html#reporting).
@@ -1235,7 +1235,7 @@ The EntityRepository now has an interface Doctrine\Persistence\ObjectRepository.
 The annotation reader was heavily refactored between 2.0 and 2.1-RC1. In theory the operation of the new reader should be backwards compatible, but it has to be setup differently to work that way:

    // new call to the AnnotationRegistry
-    \Doctrine\Common\Annotations\AnnotationRegistry::registerFile('/doctrine-src/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
+    \Doctrine\Common\Annotations\AnnotationRegistry::registerFile('/doctrine-src/src/Mapping/Driver/DoctrineAnnotations.php');

    $reader = new \Doctrine\Common\Annotations\AnnotationReader();
    $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\');
@@ -27,7 +27,7 @@

    <filter>
        <whitelist>
-            <directory suffix=".php">../../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../src</directory>
        </whitelist>
    </filter>

@@ -27,7 +27,7 @@

    <filter>
        <whitelist>
-            <directory suffix=".php">../../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../src</directory>
        </whitelist>
    </filter>

@@ -27,7 +27,7 @@

    <filter>
        <whitelist>
-            <directory suffix=".php">../../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../src</directory>
        </whitelist>
    </filter>

@@ -25,7 +25,7 @@

    <filter>
        <whitelist>
-            <directory suffix=".php">../../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../src</directory>
        </whitelist>
    </filter>

@@ -27,7 +27,7 @@

    <filter>
        <whitelist>
-            <directory suffix=".php">../../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../src</directory>
        </whitelist>
    </filter>

@@ -25,7 +25,7 @@

    <filter>
        <whitelist>
-            <directory suffix=".php">../../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../src</directory>
        </whitelist>
    </filter>

@@ -31,7 +31,7 @@
        "doctrine/event-manager": "^1.2 || ^2",
        "doctrine/inflector": "^1.4 || ^2.0",
        "doctrine/instantiator": "^1.3 || ^2",
-        "doctrine/lexer": "^2",
+        "doctrine/lexer": "^2 || ^3",
        "doctrine/persistence": "^2.4 || ^3",
        "psr/cache": "^1 || ^2 || ^3",
        "symfony/console": "^4.2 || ^5.0 || ^6.0 || ^7.0",
@@ -60,13 +60,13 @@
        "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
    },
    "autoload": {
-        "psr-4": { "Doctrine\\ORM\\": "lib/Doctrine/ORM" }
+        "psr-4": { "Doctrine\\ORM\\": "src" }
    },
    "autoload-dev": {
        "psr-4": {
-            "Doctrine\\Tests\\": "tests/Doctrine/Tests",
-            "Doctrine\\StaticAnalysis\\": "tests/Doctrine/StaticAnalysis",
-            "Doctrine\\Performance\\": "tests/Doctrine/Performance"
+            "Doctrine\\Tests\\": "tests/Tests",
+            "Doctrine\\StaticAnalysis\\": "tests/StaticAnalysis",
+            "Doctrine\\Performance\\": "tests/Performance"
        }
    },
    "bin": ["bin/doctrine"],
@@ -36,71 +36,50 @@ Our entities look like:
    namespace Bank\Entities;

    use Doctrine\ORM\Mapping as ORM;
-    
-    /**
-     * @ORM\Entity
-     */
+    use Doctrine\Common\Collections\ArrayCollection;
+    use Doctrine\Common\Collections\Collection;
+
+    #[ORM\Entity]
    class Account
    {
-        /**
-         * @ORM\Id
-         * @ORM\GeneratedValue
-         * @ORM\Column(type="integer")
-         */
+        #[ORM\Id]
+        #[ORM\GeneratedValue]
+        #[ORM\Column(type: 'integer')]
        private ?int $id;
-    
-        /**
-         * @ORM\Column(type="string", unique=true)
-         */
-        private string $no;
-    
-        /**
-         * @ORM\OneToMany(targetEntity="Entry", mappedBy="account", cascade={"persist"})
-         */
-        private array $entries;
-    
-        /**
-         * @ORM\Column(type="integer")
-         */
-        private int $maxCredit = 0;
-    
-        public function __construct(string $no, int $maxCredit = 0)
-        {
-            $this->no = $no;
-            $this->maxCredit = $maxCredit;
-            $this->entries = new \Doctrine\Common\Collections\ArrayCollection();
+
+        #[ORM\OneToMany(targetEntity: Entry::class, mappedBy: 'account', cascade: ['persist'])]
+        private Collection $entries;
+
+
+        public function __construct(
+            #[ORM\Column(type: 'string', unique: true)]
+            private string $no,
+
+            #[ORM\Column(type: 'integer')]
+            private int $maxCredit = 0,
+        ) {
+            $this->entries = new ArrayCollection();
        }
    }
-    
-    /**
-     * @ORM\Entity
-     */
+
+    #[ORM\Entity]
    class Entry
    {
-        /**
-         * @ORM\Id
-         * @ORM\GeneratedValue
-         * @ORM\Column(type="integer")
-         */
+        #[ORM\Id]
+        #[ORM\GeneratedValue]
+        #[ORM\Column(type: 'integer')]
        private ?int $id;
-    
-        /**
-         * @ORM\ManyToOne(targetEntity="Account", inversedBy="entries")
-         */
-        private Account $account;
-    
-        /**
-         * @ORM\Column(type="integer")
-         */
-        private int $amount;
-    
-        public function __construct(Account $account, int $amount)
-        {
-            $this->account = $account;
-            $this->amount = $amount;
+
+        public function __construct(
+            #[ORM\ManyToOne(targetEntity: Account::class, inversedBy: 'entries')]
+            private Account $account,
+
+            #[ORM\Column(type: 'integer')]
+            private int $amount,
+        ) {
            // more stuff here, from/to whom, stated reason, execution date and such
        }
-    
+
        public function getAmount(): Amount
        {
            return $this->amount;
@@ -193,9 +172,8 @@ relation with this method:
        public function addEntry(int $amount): void
        {
            $this->assertAcceptEntryAllowed($amount);
-    
-            $e = new Entry($this, $amount);
-            $this->entries[] = $e;
+
+            $this->entries[] = new Entry($this, $amount);
        }
    }

@@ -213,18 +191,18 @@ Now look at the following test-code for our entities:
        {
            $account = new Account("123456", maxCredit: 200);
            $this->assertEquals(0, $account->getBalance());
-    
+
            $account->addEntry(500);
            $this->assertEquals(500, $account->getBalance());
-    
+
            $account->addEntry(-700);
            $this->assertEquals(-200, $account->getBalance());
        }
-    
+
        public function testExceedMaxLimit()
        {
            $account = new Account("123456", maxCredit: 200);
-    
+
            $this->expectException(Exception::class);
            $account->addEntry(-1000);
        }
@@ -285,22 +263,19 @@ entries collection) we want to add an aggregate field called
    <?php
    class Account
    {
-        /**
-         * @ORM\Column(type="integer")
-         */
+        #[ORM\Column(type: 'integer')]
        private int $balance = 0;
-    
+
        public function getBalance(): int
        {
            return $this->balance;
        }
-    
+
        public function addEntry(int $amount): void
        {
            $this->assertAcceptEntryAllowed($amount);
-    
-            $e = new Entry($this, $amount);
-            $this->entries[] = $e;
+
+            $this->entries[] = new Entry($this, $amount);
            $this->balance += $amount;
        }
    }
@@ -331,13 +306,13 @@ potentially lead to inconsistent state. See this example:
    // The Account $accId has a balance of 0 and a max credit limit of 200:
    // request 1 account
    $account1 = $em->find(Account::class, $accId);
-    
+
    // request 2 account
    $account2 = $em->find(Account::class, $accId);
-    
+
    $account1->addEntry(-200);
    $account2->addEntry(-200);
-    
+
    // now request 1 and 2 both flush the changes.

 The aggregate field ``Account::$balance`` is now -200, however the
@@ -357,10 +332,8 @@ Optimistic locking is as easy as adding a version column:

    class Account
    {
-        /**
-         * @ORM\Column(type="integer")
-         * @ORM\Version
-         */
+        #[ORM\Column(type: 'integer')]
+        #[ORM\Version]
        private int $version;
    }

@@ -47,10 +47,8 @@ A Customer entity
    use Acme\CustomerModule\Entity\Customer as BaseCustomer;
    use Acme\InvoiceModule\Model\InvoiceSubjectInterface;

-    /**
-     * @ORM\Entity
-     * @ORM\Table(name="customer")
-     */
+    #[ORM\Entity]
+    #[ORM\Table(name: 'customer')]
    class Customer extends BaseCustomer implements InvoiceSubjectInterface
    {
        // In our example, any methods defined in the InvoiceSubjectInterface
@@ -69,19 +67,12 @@ An Invoice entity
    use Doctrine\ORM\Mapping AS ORM;
    use Acme\InvoiceModule\Model\InvoiceSubjectInterface;

-    /**
-     * Represents an Invoice.
-     *
-     * @ORM\Entity
-     * @ORM\Table(name="invoice")
-     */
+    #[ORM\Entity]
+    #[ORM\Table(name: 'invoice')]
    class Invoice
    {
-        /**
-         * @ORM\ManyToOne(targetEntity="Acme\InvoiceModule\Model\InvoiceSubjectInterface")
-         * @var InvoiceSubjectInterface
-         */
-        protected $subject;
+        #[ORM\ManyToOne(targetEntity: InvoiceSubjectInterface::class)]
+        protected InvoiceSubjectInterface $subject;
    }

 An InvoiceSubjectInterface
@@ -1143,16 +1143,16 @@ and the EntityManager.
        }
    }

-.. _PrePersistEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/PrePersistEventArgs.php
-.. _PreRemoveEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/PreRemoveEventArgs.php
-.. _PreUpdateEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/PreUpdateEventArgs.php
-.. _PostPersistEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/PostPersistEventArgs.php
-.. _PostRemoveEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/PostRemoveEventArgs.php
-.. _PostUpdateEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/PostUpdateEventArgs.php
-.. _PostLoadEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/PostLoadEventArgs.php
-.. _PreFlushEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/PreFlushEventArgs.php
-.. _PostFlushEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/PostFlushEventArgs.php
-.. _OnFlushEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/OnFlushEventArgs.php
-.. _OnClearEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/OnClearEventArgs.php
-.. _LoadClassMetadataEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/LoadClassMetadataEventArgs.php
-.. _OnClassMetadataNotFoundEventArgs: https://github.com/doctrine/orm/blob/HEAD/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php
+.. _PrePersistEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/PrePersistEventArgs.php
+.. _PreRemoveEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/PreRemoveEventArgs.php
+.. _PreUpdateEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/PreUpdateEventArgs.php
+.. _PostPersistEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/PostPersistEventArgs.php
+.. _PostRemoveEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/PostRemoveEventArgs.php
+.. _PostUpdateEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/PostUpdateEventArgs.php
+.. _PostLoadEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/PostLoadEventArgs.php
+.. _PreFlushEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/PreFlushEventArgs.php
+.. _PostFlushEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/PostFlushEventArgs.php
+.. _OnFlushEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/OnFlushEventArgs.php
+.. _OnClearEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/OnClearEventArgs.php
+.. _LoadClassMetadataEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/LoadClassMetadataEventArgs.php
+.. _OnClassMetadataNotFoundEventArgs: https://github.com/doctrine/orm/blob/HEAD/src/Event/OnClassMetadataNotFoundEventArgs.php
@@ -12,9 +12,8 @@ page only handles Security issues in the ORM.

 - `DBAL Security Page <https://www.doctrine-project.org/projects/doctrine-dbal/en/current/reference/security.html>`

-If you find a Security bug in Doctrine, please report it on Jira and change the
-Security Level to "Security Issues". It will be visible to Doctrine Core
-developers and you only.
+If you find a Security bug in Doctrine, please follow our
+`Security reporting guidelines <https://www.doctrine-project.org/policies/security.html#reporting>`_.

 User input and Doctrine ORM
 ---------------------------
@@ -1,6 +1,6 @@
 {
-    "runner.bootstrap": "tests/Doctrine/Tests/TestInit.php",
-    "runner.path": "tests/Doctrine/Performance",
+    "runner.bootstrap": "tests/Tests/TestInit.php",
+    "runner.path": "tests/Performance",
    "runner.file_pattern": "*Bench.php",

    "core.extensions": [
@@ -11,12 +11,12 @@

    <config name="php_version" value="70100"/>

-    <file>lib</file>
+    <file>src</file>
    <file>tests</file>

-    <exclude-pattern>*/lib/Doctrine/ORM/Mapping/InverseJoinColumn.php</exclude-pattern>
-    <exclude-pattern>*/tests/Doctrine/Tests/Proxies/__CG__*</exclude-pattern>
-    <exclude-pattern>*/tests/Doctrine/Tests/ORM/Tools/Export/export/*</exclude-pattern>
+    <exclude-pattern>*/src/Mapping/InverseJoinColumn.php</exclude-pattern>
+    <exclude-pattern>*/tests/Tests/Proxies/__CG__*</exclude-pattern>
+    <exclude-pattern>*/tests/Tests/ORM/Tools/Export/export/*</exclude-pattern>

    <rule ref="Doctrine">
        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint" />
@@ -34,119 +34,119 @@
    </rule>

    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint">
-        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/src/*</exclude-pattern>
        <!--
-            that class extends another one inside lib/ and can therefore not
+            that class extends another one inside src/ and can therefore not
            have more native typehints since its parent cannot have them: that
            would break signature compatibility.
        -->
-        <exclude-pattern>tests/Doctrine/Tests/Mocks/HydratorMockStatement.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Mocks/HydratorMockStatement.php</exclude-pattern>
    </rule>

    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
-        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/src/*</exclude-pattern>
    </rule>

    <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Driver/CompatibilityAnnotationDriver.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Console/CommandCompatibility.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Driver/CompatibilityAnnotationDriver.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Console/CommandCompatibility.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Console/Helper/EntityManagerHelper.php</exclude-pattern>
        <exclude-pattern>tests/*</exclude-pattern>
    </rule>

    <rule ref="Squiz.Classes.ClassFileName.NoMatch">
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Console/Helper/EntityManagerHelper.php</exclude-pattern>
        <exclude-pattern>tests/*</exclude-pattern>
    </rule>

    <rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Debug.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Tools/DebugTest.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Debug.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Tools/DebugTest.php</exclude-pattern>
    </rule>

    <rule ref="Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase">
-        <exclude-pattern>lib/Doctrine/ORM/Events.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/ToolEvents.php</exclude-pattern>
+        <exclude-pattern>src/Events.php</exclude-pattern>
+        <exclude-pattern>src/Tools/ToolEvents.php</exclude-pattern>
    </rule>

    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification">
        <!-- https://github.com/doctrine/annotations/issues/129 -->
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Column.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Index.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Table.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/UniqueConstraint.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Column.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Index.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Table.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/UniqueConstraint.php</exclude-pattern>
    </rule>

    <rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators.DisallowedNotEqualOperator">
-        <exclude-pattern>lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php</exclude-pattern>
+        <exclude-pattern>src/Internal/Hydration/AbstractHydrator.php</exclude-pattern>
    </rule>

    <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
-        <exclude-pattern>lib/Doctrine/ORM/Query/Parser.php</exclude-pattern>
+        <exclude-pattern>src/Query/Parser.php</exclude-pattern>
    </rule>

    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName">
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/AssociationOverride.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/AssociationOverrides.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/AttributeOverride.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/AttributeOverrides.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Cache.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/ChangeTrackingPolicy.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Column.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/ColumnResult.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/CustomIdGenerator.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/DiscriminatorColumn.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/DiscriminatorMap.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Embeddable.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Embedded.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Entity.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/EntityListeners.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/EntityResult.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/FieldResult.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/GeneratedValue.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/HasLifecycleCallbacks.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Id.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Index.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/InheritanceType.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/JoinColumn.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/JoinColumns.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/JoinTable.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/ManyToMany.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/ManyToOne.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/MappedSuperclass.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/NamedNativeQueries.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/NamedNativeQuery.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/NamedQueries.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/NamedQuery.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/OneToMany.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/OneToOne.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/OrderBy.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/PostLoad.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/PostPersist.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/PostRemove.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/PostUpdate.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/PreFlush.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/PrePersist.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/PreRemove.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/PreUpdate.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/SequenceGenerator.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/SqlResultSetMapping.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/SqlResultSetMappings.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Table.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/UniqueConstraint.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/Version.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/AssociationOverride.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/AssociationOverrides.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/AttributeOverride.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/AttributeOverrides.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Cache.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/ChangeTrackingPolicy.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Column.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/ColumnResult.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/CustomIdGenerator.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/DiscriminatorColumn.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/DiscriminatorMap.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Embeddable.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Embedded.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Entity.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/EntityListeners.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/EntityResult.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/FieldResult.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/GeneratedValue.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/HasLifecycleCallbacks.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Id.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Index.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/InheritanceType.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/JoinColumn.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/JoinColumns.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/JoinTable.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/ManyToMany.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/ManyToOne.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/MappedSuperclass.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/NamedNativeQueries.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/NamedNativeQuery.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/NamedQueries.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/NamedQuery.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/OneToMany.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/OneToOne.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/OrderBy.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/PostLoad.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/PostPersist.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/PostRemove.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/PostUpdate.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/PreFlush.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/PrePersist.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/PreRemove.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/PreUpdate.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/SequenceGenerator.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/SqlResultSetMapping.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/SqlResultSetMappings.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Table.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/UniqueConstraint.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/Version.php</exclude-pattern>
    </rule>

    <rule ref="SlevomatCodingStandard.Commenting.EmptyComment">
-        <exclude-pattern>lib/Doctrine/ORM/Cache/DefaultQueryCache.php</exclude-pattern>
+        <exclude-pattern>src/Cache/DefaultQueryCache.php</exclude-pattern>
    </rule>

    <rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming">
-        <exclude-pattern>lib/Doctrine/ORM/EntityManagerInterface.php</exclude-pattern>
+        <exclude-pattern>src/EntityManagerInterface.php</exclude-pattern>
    </rule>

    <rule ref="SlevomatCodingStandard.Classes.SuperfluousTraitNaming.SuperfluousSuffix">
-        <exclude-pattern>tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleTrait.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Models/DDC1872/DDC1872ExampleTrait.php</exclude-pattern>
    </rule>

    <rule name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint">
@@ -167,25 +167,25 @@

    <!-- intentionally without namespace -->
    <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace">
-        <exclude-pattern>tests/Doctrine/Tests/Models/Global/GlobalNamespaceModel.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/Models/DDC3231/DDC3231User1NoNamespace.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/Models/DDC3231/DDC3231User2NoNamespace.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Models/Global/GlobalNamespaceModel.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Models/DDC3231/DDC3231User1NoNamespace.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Models/DDC3231/DDC3231User2NoNamespace.php</exclude-pattern>
    </rule>

    <!-- file with multiple namespaces confuses the sniff -->
    <rule ref="PSR2.Namespaces.UseDeclaration.UseAfterNamespace">
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Functional/Ticket/DDC2084Test.php</exclude-pattern>
    </rule>

    <!-- file with multiple namespaces confuses the sniff -->
    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses.IncorrectlyOrderedUses">
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Functional/Ticket/DDC2084Test.php</exclude-pattern>
    </rule>

    <!-- intentionally empty blocks -->
    <rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedForeach">
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Functional/Ticket/DDC1301Test.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Functional/ExtraLazyCollectionTest.php</exclude-pattern>
    </rule>

    <!--
@@ -193,90 +193,90 @@
        different namespace. The use statement has to stay.
    -->
    <rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace.UseFromSameNamespace">
-        <exclude-pattern>tests/Doctrine/Tests/Models/DDC1590/DDC1590User.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Models/DDC1590/DDC1590User.php</exclude-pattern>
    </rule>

    <rule ref="SlevomatCodingStandard.Commenting.ForbiddenAnnotations.AnnotationForbidden">
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Functional/Ticket/DDC832Test.php</exclude-pattern>
    </rule>

    <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
        <!-- we need to test what happens with an stdClass proxy -->
-        <exclude-pattern>tests/Doctrine/Tests/Proxy/DefaultProxyClassNameResolverTest.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Proxy/DefaultProxyClassNameResolverTest.php</exclude-pattern>
    </rule>

    <rule ref="Squiz.Commenting.FunctionComment.WrongStyle">
        <!-- https://github.com/squizlabs/PHP_CodeSniffer/issues/1961 -->
-        <exclude-pattern>tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/Mocks/DriverMock.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/ORM/UnitOfWorkTest.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Mocks/DatabasePlatformMock.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Mocks/DriverMock.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/UnitOfWorkTest.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Query/DeleteSqlGenerationTest.php</exclude-pattern>
    </rule>
    <rule ref="Squiz.Commenting.FunctionComment.InvalidNoReturn">
        <!-- https://github.com/squizlabs/PHP_CodeSniffer/issues/2099 -->
-        <exclude-pattern>lib/Doctrine/ORM/Query/AST/Node.php</exclude-pattern>
+        <exclude-pattern>src/Query/AST/Node.php</exclude-pattern>
    </rule>

    <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.NoAssignment">
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests*</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Mapping/php/Doctrine.Tests*</exclude-pattern>
    </rule>

    <rule ref="PSR2.Methods.MethodDeclaration.Underscore">
-        <exclude-pattern>lib/Doctrine/ORM/AbstractQuery.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/NativeQuery.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Query.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Query/TreeWalkerAdapter.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php</exclude-pattern>
+        <exclude-pattern>src/AbstractQuery.php</exclude-pattern>
+        <exclude-pattern>src/Mapping/ClassMetadataInfo.php</exclude-pattern>
+        <exclude-pattern>src/NativeQuery.php</exclude-pattern>
+        <exclude-pattern>src/Query.php</exclude-pattern>
+        <exclude-pattern>src/Query/TreeWalkerAdapter.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Export/Driver/AbstractExporter.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Export/Driver/AnnotationExporter.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Export/Driver/PhpExporter.php</exclude-pattern>
        <!-- extending a class from another package -->
-        <exclude-pattern>tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/Mocks/SchemaManagerMock.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Mocks/DatabasePlatformMock.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/Mocks/SchemaManagerMock.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Functional/Ticket/DDC3634Test.php</exclude-pattern>
    </rule>

    <rule ref="Squiz.NamingConventions.ValidVariableName.PublicHasUnderscore">
-        <exclude-pattern>lib/Doctrine/ORM/AbstractQuery.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Configuration.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/EntityRepository.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Query/Exec/AbstractSqlExecutor.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Query/Exec/AbstractSqlExecutor.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Query/Printer.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php</exclude-pattern>
+        <exclude-pattern>src/AbstractQuery.php</exclude-pattern>
+        <exclude-pattern>src/Configuration.php</exclude-pattern>
+        <exclude-pattern>src/EntityRepository.php</exclude-pattern>
+        <exclude-pattern>src/Internal/Hydration/AbstractHydrator.php</exclude-pattern>
+        <exclude-pattern>src/Query/Exec/AbstractSqlExecutor.php</exclude-pattern>
+        <exclude-pattern>src/Query/Exec/AbstractSqlExecutor.php</exclude-pattern>
+        <exclude-pattern>src/Query/Printer.php</exclude-pattern>
+        <exclude-pattern>src/Tools/EntityRepositoryGenerator.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Console/Helper/EntityManagerHelper.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Export/Driver/AbstractExporter.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Export/Driver/AnnotationExporter.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Export/Driver/PhpExporter.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Export/Driver/XmlExporter.php</exclude-pattern>
+        <exclude-pattern>src/Tools/Export/Driver/YamlExporter.php</exclude-pattern>
        <!-- the impact of changing this would be too big -->
-        <exclude-pattern>tests/Doctrine/Tests/OrmFunctionalTestCase.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/OrmFunctionalTestCase.php</exclude-pattern>
    </rule>
    <rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
        <!-- Member variable "__isCloning" is not in valid camel caps format -->
-        <exclude-pattern>lib/Doctrine/ORM/Proxy/ProxyFactory.php</exclude-pattern>
+        <exclude-pattern>src/Proxy/ProxyFactory.php</exclude-pattern>
        <!-- accessing public property __isInitialized__ of a proxy -->
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php</exclude-pattern>
    </rule>

    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses.MismatchingCaseSensitivity">
        <!-- Using @group and Group entity in the same file -->
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Functional/Ticket/DDC1885Test.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/Functional/Ticket/DDC1843Test.php</exclude-pattern>
    </rule>

    <rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedElse">
        <!-- The missing code needs to be implemented someday -->
-        <exclude-pattern>lib/Doctrine/ORM/Id/TableGenerator.php</exclude-pattern>
+        <exclude-pattern>src/Id/TableGenerator.php</exclude-pattern>
    </rule>
    <rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIf">
        <!-- The missing code needs to be implemented someday -->
-        <exclude-pattern>lib/Doctrine/ORM/Id/TableGenerator.php</exclude-pattern>
+        <exclude-pattern>src/Id/TableGenerator.php</exclude-pattern>
    </rule>
    <rule ref="Squiz.Commenting.FunctionComment.ExtraParamComment">
        <!-- https://github.com/doctrine/orm/issues/8537 -->
-        <exclude-pattern>lib/Doctrine/ORM/QueryBuilder.php</exclude-pattern>
+        <exclude-pattern>src/QueryBuilder.php</exclude-pattern>
    </rule>
 </ruleset>
@@ -3,639 +3,639 @@ parameters:
 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Persisters\\\\Entity\\\\EntityPersister\\:\\:getCacheRegion\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php
+			path: src/Cache/DefaultEntityHydrator.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\ORM\\\\Cache\\\\CacheEntry\\:\\:\\$class\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Cache/DefaultQueryCache.php
+			path: src/Cache/DefaultQueryCache.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Cache\\\\CacheEntry\\:\\:resolveAssociationEntries\\(\\)\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Cache/DefaultQueryCache.php
+			path: src/Cache/DefaultQueryCache.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Persisters\\\\Entity\\\\EntityPersister\\:\\:getCacheRegion\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/DefaultQueryCache.php
+			path: src/Cache/DefaultQueryCache.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Persisters\\\\Entity\\\\EntityPersister\\:\\:storeEntityCache\\(\\)\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Cache/DefaultQueryCache.php
+			path: src/Cache/DefaultQueryCache.php

 		-
 			message: "#^Parameter \\#2 \\$key of method Doctrine\\\\ORM\\\\Cache\\\\Logging\\\\CacheLogger\\:\\:entityCacheHit\\(\\) expects Doctrine\\\\ORM\\\\Cache\\\\EntityCacheKey, Doctrine\\\\ORM\\\\Cache\\\\CacheKey given\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Cache/DefaultQueryCache.php
+			path: src/Cache/DefaultQueryCache.php

 		-
 			message: "#^Parameter \\#2 \\$key of method Doctrine\\\\ORM\\\\Cache\\\\Logging\\\\CacheLogger\\:\\:entityCacheMiss\\(\\) expects Doctrine\\\\ORM\\\\Cache\\\\EntityCacheKey, Doctrine\\\\ORM\\\\Cache\\\\CacheKey given\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Cache/DefaultQueryCache.php
+			path: src/Cache/DefaultQueryCache.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\ORM\\\\Cache\\\\CacheEntry\\:\\:\\$identifiers\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php
+			path: src/Cache/Persister/Collection/AbstractCollectionPersister.php

 		-
 			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php
+			path: src/Cache/Persister/Collection/AbstractCollectionPersister.php

 		-
 			message: "#^Parameter \\#2 \\$key of method Doctrine\\\\ORM\\\\Cache\\\\EntityHydrator\\:\\:buildCacheEntry\\(\\) expects Doctrine\\\\ORM\\\\Cache\\\\EntityCacheKey, Doctrine\\\\ORM\\\\Cache\\\\CacheKey given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php
+			path: src/Cache/Persister/Collection/AbstractCollectionPersister.php

 		-
 			message: "#^Parameter \\#3 \\$entry of method Doctrine\\\\ORM\\\\Cache\\\\CollectionHydrator\\:\\:loadCacheEntry\\(\\) expects Doctrine\\\\ORM\\\\Cache\\\\CollectionCacheEntry, Doctrine\\\\ORM\\\\Cache\\\\CacheEntry given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php
+			path: src/Cache/Persister/Collection/AbstractCollectionPersister.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Cache\\\\Region\\:\\:lock\\(\\)\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersister.php
+			path: src/Cache/Persister/Collection/ReadWriteCachedCollectionPersister.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\ORM\\\\Cache\\\\CacheEntry\\:\\:\\$class\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php
+			path: src/Cache/Persister/Entity/AbstractEntityPersister.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Cache\\\\Persister\\\\CachedPersister&Doctrine\\\\ORM\\\\Persisters\\\\Collection\\\\CollectionPersister\\:\\:loadCollectionCache\\(\\)\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php
+			path: src/Cache/Persister/Entity/AbstractEntityPersister.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Cache\\\\Persister\\\\CachedPersister&Doctrine\\\\ORM\\\\Persisters\\\\Collection\\\\CollectionPersister\\:\\:storeCollectionCache\\(\\)\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php
+			path: src/Cache/Persister/Entity/AbstractEntityPersister.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Persisters\\\\Entity\\\\EntityPersister\\:\\:storeEntityCache\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php
+			path: src/Cache/Persister/Entity/AbstractEntityPersister.php

 		-
 			message: "#^Parameter \\#3 \\$entry of method Doctrine\\\\ORM\\\\Cache\\\\EntityHydrator\\:\\:loadCacheEntry\\(\\) expects Doctrine\\\\ORM\\\\Cache\\\\EntityCacheEntry, Doctrine\\\\ORM\\\\Cache\\\\CacheEntry given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php
+			path: src/Cache/Persister/Entity/AbstractEntityPersister.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Cache\\\\Region\\:\\:lock\\(\\)\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php
+			path: src/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php

 		-
 			message: "#^If condition is always true\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php
+			path: src/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Cache\\\\Region\\\\DefaultRegion\\:\\:getCache\\(\\) should return Doctrine\\\\Common\\\\Cache\\\\CacheProvider but returns Doctrine\\\\Common\\\\Cache\\\\Cache\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/Region/DefaultRegion.php
+			path: src/Cache/Region/DefaultRegion.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\ORM\\\\Cache\\\\CacheEntry\\:\\:\\$time\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Cache/TimestampQueryCacheValidator.php
+			path: src/Cache/TimestampQueryCacheValidator.php

 		-
 			message: "#^Class Doctrine\\\\Common\\\\Cache\\\\ArrayCache not found\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Configuration.php
+			path: src/Configuration.php

 		-
 			message: "#^Method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:find\\(\\) invoked with 4 parameters, 2 required\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Decorator/EntityManagerDecorator.php
+			path: src/Decorator/EntityManagerDecorator.php

 		-
 			message: "#^Method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:flush\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Decorator/EntityManagerDecorator.php
+			path: src/Decorator/EntityManagerDecorator.php

 		-
 			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/EntityManager.php
+			path: src/EntityManager.php

 		-
 			message: "#^Result of && is always false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/EntityManager.php
+			path: src/EntityManager.php

 		-
 			message: "#^Return type \\(Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataFactory\\) of method Doctrine\\\\ORM\\\\EntityManager\\:\\:getMetadataFactory\\(\\) should be compatible with return type \\(Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadataFactory\\<Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\<object\\>\\>\\) of method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getMetadataFactory\\(\\)$#"
 			count: 2
-			path: lib/Doctrine/ORM/EntityManager.php
+			path: src/EntityManager.php

 		-
 			message: "#^Template type T of method Doctrine\\\\ORM\\\\EntityManagerInterface\\:\\:getClassMetadata\\(\\) is not referenced in a parameter\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/EntityManagerInterface.php
+			path: src/EntityManagerInterface.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\EntityRepository\\:\\:matching\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\AbstractLazyCollection\\<int, T of object\\>&Doctrine\\\\Common\\\\Collections\\\\Selectable\\<int, T of object\\> but returns Doctrine\\\\ORM\\\\LazyCriteriaCollection\\<\\(int\\|string\\), object\\>\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/EntityRepository.php
+			path: src/EntityRepository.php

 		-
 			message: "#^Method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:find\\(\\) invoked with 4 parameters, 2 required\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/EntityRepository.php
+			path: src/EntityRepository.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getTableHiLoCurrentValSql\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Id/TableGenerator.php
+			path: src/Id/TableGenerator.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getTableHiLoUpdateNextValSql\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Id/TableGenerator.php
+			path: src/Id/TableGenerator.php

 		-
 			message: "#^If condition is always true\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+			path: src/Mapping/ClassMetadataFactory.php

 		-
 			message: "#^Parameter \\#2 \\$class of method Doctrine\\\\ORM\\\\Mapping\\\\QuoteStrategy\\:\\:getSequenceName\\(\\) expects Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata, Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo given\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+			path: src/Mapping/ClassMetadataFactory.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo\\:\\:fullyQualifiedClassName\\(\\) should return class\\-string\\|null but returns string\\|null\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+			path: src/Mapping/ClassMetadataInfo.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Mapping\\\\NamingStrategy\\:\\:joinColumnName\\(\\) invoked with 2 parameters, 1 required\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+			path: src/Mapping/ClassMetadataInfo.php

 		-
 			message: "#^Negated boolean expression is always false\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+			path: src/Mapping/ClassMetadataInfo.php

 		-
 			message: "#^Result of && is always false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+			path: src/Mapping/ClassMetadataInfo.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapEmbedded\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+			path: src/Mapping/Driver/AnnotationDriver.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapManyToMany\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+			path: src/Mapping/Driver/AnnotationDriver.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapManyToOne\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+			path: src/Mapping/Driver/AnnotationDriver.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapOneToMany\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+			path: src/Mapping/Driver/AnnotationDriver.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:mapOneToOne\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+			path: src/Mapping/Driver/AnnotationDriver.php

 		-
 			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+			path: src/Mapping/Driver/AnnotationDriver.php

 		-
 			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php
+			path: src/Mapping/Driver/AttributeDriver.php

 		-
 			message: "#^Parameter \\#4 \\.\\.\\.\\$args of static method Doctrine\\\\Deprecations\\\\Deprecation\\:\\:trigger\\(\\) expects float\\|int\\|string, false given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
+			path: src/Mapping/Driver/DatabaseDriver.php

 		-
 			message: "#^Empty array passed to foreach\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
+			path: src/Mapping/Driver/XmlDriver.php

 		-
 			message: "#^Offset 'version' on \\*NEVER\\* in isset\\(\\) always exists and is always null\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
+			path: src/Mapping/Driver/XmlDriver.php

 		-
 			message: "#^Call to function is_int\\(\\) with string will always evaluate to false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/NativeQuery.php
+			path: src/NativeQuery.php

 		-
 			message: "#^Result of && is always false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/NativeQuery.php
+			path: src/NativeQuery.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Persisters\\\\Collection\\\\OneToManyPersister\\:\\:delete\\(\\) should return int\\|null but empty return statement found\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php
+			path: src/Persisters/Collection/OneToManyPersister.php

 		-
 			message: "#^Parameter \\#3 \\$hints of method Doctrine\\\\ORM\\\\Internal\\\\Hydration\\\\AbstractHydrator\\:\\:hydrateAll\\(\\) expects array\\<string, string\\>, array\\<string, Doctrine\\\\ORM\\\\PersistentCollection\\|true\\> given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
+			path: src/Persisters/Entity/BasicEntityPersister.php

 		-
 			message: "#^Parameter \\#3 \\$hints of method Doctrine\\\\ORM\\\\Internal\\\\Hydration\\\\AbstractHydrator\\:\\:hydrateAll\\(\\) expects array\\<string, string\\>, array\\<string, true\\> given\\.$#"
 			count: 4
-			path: lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
+			path: src/Persisters/Entity/BasicEntityPersister.php

 		-
 			message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
+			path: src/Persisters/Entity/BasicEntityPersister.php

 		-
 			message: "#^Property Doctrine\\\\ORM\\\\Persisters\\\\Entity\\\\CachedPersisterContext\\:\\:\\$class \\(Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata\\) does not accept Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Persisters/Entity/CachedPersisterContext.php
+			path: src/Persisters/Entity/CachedPersisterContext.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isEmbeddedClass\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Proxy/ProxyFactory.php
+			path: src/Proxy/ProxyFactory.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Proxy/ProxyFactory.php
+			path: src/Proxy/ProxyFactory.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Proxy\\\\Proxy\\:\\:__wakeup\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Proxy/ProxyFactory.php
+			path: src/Proxy/ProxyFactory.php

 		-
 			message: "#^Call to an undefined static method Doctrine\\\\ORM\\\\Proxy\\\\ProxyFactory\\:\\:createLazyGhost\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Proxy/ProxyFactory.php
+			path: src/Proxy/ProxyFactory.php

 		-
 			message: "#^Comparison operation \"\\<\" between 0\\|1\\|2\\|3\\|4 and 0 is always false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Proxy/ProxyFactory.php
+			path: src/Proxy/ProxyFactory.php

 		-
 			message: "#^Comparison operation \"\\>\" between 0\\|1\\|2\\|3\\|4 and 4 is always false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Proxy/ProxyFactory.php
+			path: src/Proxy/ProxyFactory.php

 		-
 			message: "#^Parameter \\#1 \\$class of method Doctrine\\\\ORM\\\\Utility\\\\IdentifierFlattener\\:\\:flattenIdentifier\\(\\) expects Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata, Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata given\\.$#"
 			count: 3
-			path: lib/Doctrine/ORM/Proxy/ProxyFactory.php
+			path: src/Proxy/ProxyFactory.php

 		-
 			message: "#^Result of \\|\\| is always false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Proxy/ProxyFactory.php
+			path: src/Proxy/ProxyFactory.php

 		-
 			message: "#^Parameter \\#2 \\$sqlParams of method Doctrine\\\\ORM\\\\Query\\:\\:evictResultSetCache\\(\\) expects array\\<string, mixed\\>, array\\<int, mixed\\> given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query.php
+			path: src/Query.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node\\:\\:\\$value\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php
+			path: src/Query/AST/Functions/DateAddFunction.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node\\:\\:\\$value\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php
+			path: src/Query/AST/Functions/DateSubFunction.php

 		-
 			message: "#^Parameter \\#1 \\$simpleArithmeticExpr of method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkSimpleArithmeticExpression\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\SimpleArithmeticExpression, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/Functions/LengthFunction.php
+			path: src/Query/AST/Functions/LengthFunction.php

 		-
 			message: "#^Parameter \\#1 \\$simpleArithmeticExpr of method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkSimpleArithmeticExpression\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\SimpleArithmeticExpression, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php
+			path: src/Query/AST/Functions/LowerFunction.php

 		-
 			message: "#^Parameter \\#1 \\$simpleArithmeticExpr of method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkSimpleArithmeticExpression\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\SimpleArithmeticExpression, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/Functions/UpperFunction.php
+			path: src/Query/AST/Functions/UpperFunction.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Query\\\\AST\\\\IndexBy\\:\\:dispatch\\(\\) should return string but returns void\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/IndexBy.php
+			path: src/Query/AST/IndexBy.php

 		-
 			message: "#^Result of method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkIndexBy\\(\\) \\(void\\) is used\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/IndexBy.php
+			path: src/Query/AST/IndexBy.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkJoinPathExpression\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/JoinClassPathExpression.php
+			path: src/Query/AST/JoinClassPathExpression.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkJoinVariableDeclaration\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/JoinVariableDeclaration.php
+			path: src/Query/AST/JoinVariableDeclaration.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkWhenClauseExpression\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/SimpleWhenClause.php
+			path: src/Query/AST/SimpleWhenClause.php

 		-
 			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkWhenClauseExpression\\(\\)\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/AST/WhenClause.php
+			path: src/Query/AST/WhenClause.php

 		-
 			message: "#^Property Doctrine\\\\ORM\\\\Query\\\\Exec\\\\AbstractSqlExecutor\\:\\:\\$queryCacheProfile \\(Doctrine\\\\DBAL\\\\Cache\\\\QueryCacheProfile\\) does not accept null\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/Exec/AbstractSqlExecutor.php
+			path: src/Query/Exec/AbstractSqlExecutor.php

 		-
 			message: "#^PHPDoc type array\\<string\\> of property Doctrine\\\\ORM\\\\Query\\\\Expr\\\\Andx\\:\\:\\$allowedClasses is not covariant with PHPDoc type array\\<int, class\\-string\\> of overridden property Doctrine\\\\ORM\\\\Query\\\\Expr\\\\Base\\:\\:\\$allowedClasses\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/Expr/Andx.php
+			path: src/Query/Expr/Andx.php

 		-
 			message: "#^PHPDoc type array\\<string\\> of property Doctrine\\\\ORM\\\\Query\\\\Expr\\\\Orx\\:\\:\\$allowedClasses is not covariant with PHPDoc type array\\<int, class\\-string\\> of overridden property Doctrine\\\\ORM\\\\Query\\\\Expr\\\\Base\\:\\:\\$allowedClasses\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/Expr/Orx.php
+			path: src/Query/Expr/Orx.php

 		-
 			message: "#^PHPDoc type array\\<string\\> of property Doctrine\\\\ORM\\\\Query\\\\Expr\\\\Select\\:\\:\\$allowedClasses is not covariant with PHPDoc type array\\<int, class\\-string\\> of overridden property Doctrine\\\\ORM\\\\Query\\\\Expr\\\\Base\\:\\:\\$allowedClasses\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/Expr/Select.php
+			path: src/Query/Expr/Select.php

 		-
 			message: "#^Comparison operation \"\\<\" between null and 102 is always true\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/Parser.php
+			path: src/Query/Parser.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:ArithmeticFactor\\(\\) should return Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticFactor but returns Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node\\|string\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/Parser.php
+			path: src/Query/Parser.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:ArithmeticTerm\\(\\) should return Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticTerm but returns Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticFactor\\|string\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/Parser.php
+			path: src/Query/Parser.php

 		-
 			message: "#^Parameter \\#2 \\$stringPattern of class Doctrine\\\\ORM\\\\Query\\\\AST\\\\LikeExpression constructor expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\Functions\\\\FunctionNode\\|Doctrine\\\\ORM\\\\Query\\\\AST\\\\InputParameter\\|Doctrine\\\\ORM\\\\Query\\\\AST\\\\Literal\\|Doctrine\\\\ORM\\\\Query\\\\AST\\\\PathExpression, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/Parser.php
+			path: src/Query/Parser.php

 		-
 			message: "#^Result of && is always true\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/Parser.php
+			path: src/Query/Parser.php

 		-
 			message: "#^Unreachable statement \\- code above always terminates\\.$#"
 			count: 4
-			path: lib/Doctrine/ORM/Query/Parser.php
+			path: src/Query/Parser.php

 		-
 			message: "#^Offset 'columns' on array\\{name\\: string, entities\\: array, columns\\: array\\} in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
+			path: src/Query/ResultSetMappingBuilder.php

 		-
 			message: "#^Offset 'entities' on array\\{name\\: string, entities\\: array, columns\\: array\\} in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
+			path: src/Query/ResultSetMappingBuilder.php

 		-
 			message: "#^Parameter \\#2 \\$class of static method Doctrine\\\\ORM\\\\Utility\\\\PersisterHelper\\:\\:getTypeOfColumn\\(\\) expects Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata, Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
+			path: src/Query/ResultSetMappingBuilder.php

 		-
 			message: "#^Call to function is_string\\(\\) with Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node will always evaluate to false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/SqlWalker.php
+			path: src/Query/SqlWalker.php

 		-
 			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/SqlWalker.php
+			path: src/Query/SqlWalker.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkConditionalPrimary\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/SqlWalker.php
+			path: src/Query/SqlWalker.php

 		-
 			message: "#^Parameter \\#1 \\$condTerm of method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkConditionalTerm\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\ConditionalFactor\\|Doctrine\\\\ORM\\\\Query\\\\AST\\\\ConditionalPrimary\\|Doctrine\\\\ORM\\\\Query\\\\AST\\\\ConditionalTerm, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Phase2OptimizableConditional given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/SqlWalker.php
+			path: src/Query/SqlWalker.php

 		-
 			message: "#^Result of && is always false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/SqlWalker.php
+			path: src/Query/SqlWalker.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Query\\\\TreeWalkerAdapter\\:\\:getExecutor\\(\\) should return Doctrine\\\\ORM\\\\Query\\\\Exec\\\\AbstractSqlExecutor but returns null\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/TreeWalkerAdapter.php
+			path: src/Query/TreeWalkerAdapter.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Query\\\\TreeWalkerChain\\:\\:getExecutor\\(\\) should return Doctrine\\\\ORM\\\\Query\\\\Exec\\\\AbstractSqlExecutor but returns null\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/TreeWalkerChain.php
+			path: src/Query/TreeWalkerChain.php

 		-
 			message: "#^Parameter \\#2 \\$value \\(string\\) of method Doctrine\\\\ORM\\\\Query\\\\TreeWalkerChainIterator\\:\\:offsetSet\\(\\) should be compatible with parameter \\$value \\(Doctrine\\\\ORM\\\\Query\\\\TreeWalker\\) of method ArrayAccess\\<int,Doctrine\\\\ORM\\\\Query\\\\TreeWalker\\>\\:\\:offsetSet\\(\\)$#"
 			count: 1
-			path: lib/Doctrine/ORM/Query/TreeWalkerChainIterator.php
+			path: src/Query/TreeWalkerChainIterator.php

 		-
 			message: "#^PHPDoc tag @param references unknown parameter\\: \\$where$#"
 			count: 2
-			path: lib/Doctrine/ORM/QueryBuilder.php
+			path: src/QueryBuilder.php

 		-
 			message: "#^Parameter \\#2 \\$dqlPart of method Doctrine\\\\ORM\\\\QueryBuilder\\:\\:add\\(\\) expects array\\<'join'\\|int, array\\<int\\|string, object\\>\\|string\\>\\|object\\|string, non\\-empty\\-array\\<string, Doctrine\\\\ORM\\\\Query\\\\Expr\\\\Join\\> given\\.$#"
 			count: 2
-			path: lib/Doctrine/ORM/QueryBuilder.php
+			path: src/QueryBuilder.php

 		-
 			message: "#^Class Doctrine\\\\Common\\\\Cache\\\\ApcCache not found\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php
+			path: src/Tools/Console/Command/ClearCache/QueryCommand.php

 		-
 			message: "#^Class Doctrine\\\\Common\\\\Cache\\\\XcacheCache not found\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php
+			path: src/Tools/Console/Command/ClearCache/QueryCommand.php

 		-
 			message: "#^Class Doctrine\\\\Common\\\\Cache\\\\ApcCache not found\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php
+			path: src/Tools/Console/Command/ClearCache/ResultCommand.php

 		-
 			message: "#^Class Doctrine\\\\Common\\\\Cache\\\\XcacheCache not found\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php
+			path: src/Tools/Console/Command/ClearCache/ResultCommand.php

 		-
 			message: "#^Parameter \\#1 \\$metadata of method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:setMetadata\\(\\) expects array\\<int, Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata\\>, array\\<int, Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo\\> given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php
+			path: src/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$name\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php
+			path: src/Tools/Console/Command/ConvertMappingCommand.php

 		-
 			message: "#^Parameter \\#1 \\$metadata of method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:setMetadata\\(\\) expects array\\<int, Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata\\>, array\\<Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\> given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php
+			path: src/Tools/Console/Command/ConvertMappingCommand.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$name\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php
+			path: src/Tools/Console/Command/GenerateEntitiesCommand.php

 		-
 			message: "#^Parameter \\#1 \\$metadatas of method Doctrine\\\\ORM\\\\Tools\\\\EntityGenerator\\:\\:generate\\(\\) expects array\\<int, Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo\\>, array\\<Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\> given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php
+			path: src/Tools/Console/Command/GenerateEntitiesCommand.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$name\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php
+			path: src/Tools/Console/Command/GenerateProxiesCommand.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$customRepositoryClassName\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php
+			path: src/Tools/Console/Command/GenerateRepositoriesCommand.php

 		-
 			message: "#^Parameter \\#1 \\$entityListeners of method Doctrine\\\\ORM\\\\Tools\\\\Console\\\\Command\\\\MappingDescribeCommand\\:\\:formatEntityListeners\\(\\) expects array\\<int, object\\>, array\\<string, array\\<int, array\\<string, string\\>\\>\\> given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php
+			path: src/Tools/Console/Command/MappingDescribeCommand.php

 		-
 			message: "#^Offset 'allocationSize' on array\\{sequenceName\\: string, allocationSize\\: string, initialValue\\: string, quoted\\?\\: mixed\\} in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/EntityGenerator.php
+			path: src/Tools/EntityGenerator.php

 		-
 			message: "#^Offset 'initialValue' on array\\{sequenceName\\: string, allocationSize\\: string, initialValue\\: string, quoted\\?\\: mixed\\} in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/EntityGenerator.php
+			path: src/Tools/EntityGenerator.php

 		-
 			message: "#^Offset 'name' on array\\{name\\: string, schema\\?\\: string, indexes\\?\\: array, uniqueConstraints\\?\\: array, options\\?\\: array\\<string, mixed\\>, quoted\\?\\: bool\\} in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/EntityGenerator.php
+			path: src/Tools/EntityGenerator.php

 		-
 			message: "#^Offset 'sequenceName' on array\\{sequenceName\\: string, allocationSize\\: string, initialValue\\: string, quoted\\?\\: mixed\\} in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/EntityGenerator.php
+			path: src/Tools/EntityGenerator.php

 		-
 			message: "#^Property Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo\\<object\\>\\:\\:\\$lifecycleCallbacks \\(array\\<string, array\\<int, string\\>\\>\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/EntityGenerator.php
+			path: src/Tools/EntityGenerator.php

 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getIdGeneratorTypeString\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
+			path: src/Tools/Export/Driver/AbstractExporter.php

 		-
 			message: "#^If condition is always true\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
+			path: src/Tools/Export/Driver/PhpExporter.php

 		-
 			message: "#^Offset 'name' on array\\{name\\: string, schema\\?\\: string, indexes\\?\\: array, uniqueConstraints\\?\\: array, options\\?\\: array\\<string, mixed\\>, quoted\\?\\: bool\\} in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
+			path: src/Tools/Export/Driver/XmlExporter.php

 		-
 			message: "#^Parameter \\#1 \\$policy of method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getChangeTrackingPolicyString\\(\\) expects 1\\|2\\|3, int given\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
+			path: src/Tools/Export/Driver/XmlExporter.php

 		-
 			message: "#^Property Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo\\<object\\>\\:\\:\\$lifecycleCallbacks \\(array\\<string, array\\<int, string\\>\\>\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
+			path: src/Tools/Export/Driver/XmlExporter.php

 		-
 			message: "#^Right side of && is always true\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
+			path: src/Tools/Export/Driver/XmlExporter.php

 		-
 			message: "#^Property Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo\\<object\\>\\:\\:\\$lifecycleCallbacks \\(array\\<string, array\\<int, string\\>\\>\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
+			path: src/Tools/Export/Driver/YamlExporter.php

 		-
 			message: "#^Property Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo\\<object\\>\\:\\:\\$table \\(array\\<string, array\\|bool\\|string\\>\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
+			path: src/Tools/Export/Driver/YamlExporter.php

 		-
 			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/SchemaTool.php
+			path: src/Tools/SchemaTool.php

 		-
 			message: "#^Negated boolean expression is always false\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Tools/SchemaTool.php
+			path: src/Tools/SchemaTool.php

 		-
 			message: "#^Parameter \\#3 \\$changeSet of class Doctrine\\\\ORM\\\\Event\\\\PreUpdateEventArgs constructor is passed by reference, so it expects variables only$#"
 			count: 1
-			path: lib/Doctrine/ORM/UnitOfWork.php
+			path: src/UnitOfWork.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$name\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Utility/HierarchyDiscriminatorResolver.php
+			path: src/Utility/HierarchyDiscriminatorResolver.php

 		-
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$subClasses\\.$#"
 			count: 1
-			path: lib/Doctrine/ORM/Utility/HierarchyDiscriminatorResolver.php
+			path: src/Utility/HierarchyDiscriminatorResolver.php
@@ -10,9 +10,11 @@ parameters:
        - '/Call to an undefined method Doctrine\\DBAL\\Connection::createSchemaManager\(\)\./'
        # Class name will change in DBAL 3.
        - '/^Class Doctrine\\DBAL\\Platforms\\PostgreSQLPlatform not found\.$/'
+        - '/^Class Doctrine\\DBAL\\Platforms\\AbstractMySQLPlatform not found\.$/'
+        - '/^Class Doctrine\\DBAL\\Platforms\\MySQLPlatform not found\.$/'
        -
            message: '/Doctrine\\DBAL\\Platforms\\MyS(ql|QL)Platform/'
-            path: lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+            path: src/Mapping/ClassMetadataFactory.php

        # Forward compatibility for DBAL 3.5
        - '/^Call to an undefined method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getAlterSchemaSQL\(\).$/'
@@ -20,44 +22,44 @@ parameters:
        # Forward compatibility for DBAL 3.4
        - '/^Call to an undefined method Doctrine\\DBAL\\Cache\\QueryCacheProfile::[gs]etResultCache\(\)\.$/'
        -
-        	message: '/^Call to an undefined static method Doctrine\\DBAL\\Configuration::[gs]etResultCache\(\)\.$/'
-        	path: lib/Doctrine/ORM/Configuration.php
+            message: '/^Call to an undefined static method Doctrine\\DBAL\\Configuration::[gs]etResultCache\(\)\.$/'
+            path: src/Configuration.php
        -
-        	message: '/^Parameter #3 \$resultCache of class Doctrine\\DBAL\\Cache\\QueryCacheProfile constructor/'
-        	path: lib/Doctrine/ORM/AbstractQuery.php
+            message: '/^Parameter #3 \$resultCache of class Doctrine\\DBAL\\Cache\\QueryCacheProfile constructor/'
+            path: src/AbstractQuery.php
        -
            message: '/^Parameter #2 \$\w+ of method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getDateAdd\w+Expression\(\) expects int, string given\.$/'
-            path: lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php
+            path: src/Query/AST/Functions/DateAddFunction.php
        -
            message: '/^Parameter #2 \$\w+ of method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getDateSub\w+Expression\(\) expects int, string given\.$/'
-            path: lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php
+            path: src/Query/AST/Functions/DateSubFunction.php

        # False positive
        -
            message: '/^Call to an undefined method Doctrine\\Common\\Cache\\Cache::deleteAll\(\)\.$/'
            count: 1
-            path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php
+            path: src/Tools/Console/Command/ClearCache/ResultCommand.php
        # See https://github.com/doctrine/dbal/pull/5129
        -
            message: '/^Parameter #3 \$startPos of method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getLocateExpression\(\) expects int\|false, string given\.$/'
            count: 1
-            path: lib/Doctrine/ORM/Query/AST/Functions/LocateFunction.php
+            path: src/Query/AST/Functions/LocateFunction.php

        # Won't get fixed in DBAL 2
        -
            message: "#^Parameter \\#2 \\$start of method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getSubstringExpression\\(\\) expects int, string given\\.$#"
            count: 1
-            path: lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php
+            path: src/Query/AST/Functions/SubstringFunction.php

        -
            message: "#^Parameter \\#3 \\$length of method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getSubstringExpression\\(\\) expects int\\|null, string\\|null given\\.$#"
            count: 1
-            path: lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php
+            path: src/Query/AST/Functions/SubstringFunction.php

        -
            message: '#^Class Doctrine\\DBAL\\Platforms\\MySQLPlatform not found\.$#'
            count: 2
-            path: lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+            path: src/Mapping/ClassMetadataFactory.php

        # Symfony cache supports passing a key prefix to the clear method.
        - '/^Method Psr\\Cache\\CacheItemPoolInterface\:\:clear\(\) invoked with 1 parameter, 0 required\.$/'
@@ -65,10 +67,10 @@ parameters:
        # Persistence 2 support
        -
            message: '/clear.*invoked with 1 parameter/'
-            path: lib/Doctrine/ORM/EntityRepository.php
+            path: src/EntityRepository.php
        -
            message: '#^Class Doctrine\\Persistence\\ObjectManagerAware not found\.$#'
-            path: lib/Doctrine/ORM/UnitOfWork.php
+            path: src/UnitOfWork.php
        -
            message: '#^Call to method injectObjectManager\(\) on an unknown class Doctrine\\Persistence\\ObjectManagerAware\.$#'
-            path: lib/Doctrine/ORM/UnitOfWork.php
+            path: src/UnitOfWork.php
@@ -1,10 +1,10 @@
 parameters:
    level: 5
    paths:
-        - lib
-        - tests/Doctrine/StaticAnalysis
+        - src
+        - tests/StaticAnalysis
    excludePaths:
-        - lib/Doctrine/ORM/Mapping/Driver/AttributeReader.php
+        - src/Mapping/Driver/AttributeReader.php
    earlyTerminatingMethodCalls:
        Doctrine\ORM\Query\Parser:
            - syntaxError
@@ -10,29 +10,32 @@ parameters:
        # Fallback logic for DBAL 2
        -
            message: '/Application::add\(\) expects Symfony\\Component\\Console\\Command\\Command/'
-            path: lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
+            path: src/Tools/Console/ConsoleRunner.php

        - '/^Class Doctrine\\DBAL\\Platforms\\SQLAnywherePlatform not found\.$/'
        - '/^Call to method \w+\(\) on an unknown class Doctrine\\DBAL\\Platforms\\SQLAnywherePlatform\.$/'

        -
-        	message: '/^Call to an undefined method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getSQLResultCasing\(\)\.$/'
-        	path: lib/Doctrine/ORM/Internal/SQLResultCasing.php
+            message: '/^Call to an undefined method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getSQLResultCasing\(\)\.$/'
+            path: src/Internal/SQLResultCasing.php
        -
-        	message: '/^Parameter \$stmt of method .* has invalid type Doctrine\\DBAL\\Driver\\ResultStatement\.$/'
-        	path: lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+            message: '/^Parameter \$stmt of method .* has invalid type Doctrine\\DBAL\\Driver\\ResultStatement\.$/'
+            path: src/Internal/Hydration/AbstractHydrator.php
        -
-        	message: '/^Class Doctrine\\DBAL\\Driver\\ResultStatement not found\.$/'
-        	path: lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+            message: '/^Class Doctrine\\DBAL\\Driver\\ResultStatement not found\.$/'
+            path: src/Internal/Hydration/AbstractHydrator.php
        -
-        	message: '/^Call to static method ensure\(\) on an unknown class Doctrine\\DBAL\\ForwardCompatibility\\Result\.$/'
-        	path: lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+            message: '/^Call to static method ensure\(\) on an unknown class Doctrine\\DBAL\\ForwardCompatibility\\Result\.$/'
+            path: src/Internal/Hydration/AbstractHydrator.php
+        -
+            message: '/^Instanceof between Doctrine\\DBAL\\Platforms\\AbstractPlatform and Doctrine\\DBAL\\Platforms\\MySQLPlatform will always evaluate to false\.$/'
+            path: src/Utility/LockSqlHelper.php

        # False positive
        -
            message: '/^Call to an undefined method Doctrine\\Common\\Cache\\Cache::deleteAll\(\)\.$/'
            count: 1
-            path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php
+            path: src/Tools/Console/Command/ClearCache/ResultCommand.php

        # Symfony cache supports passing a key prefix to the clear method.
        - '/^Method Psr\\Cache\\CacheItemPoolInterface\:\:clear\(\) invoked with 1 parameter, 0 required\.$/'
@@ -10,29 +10,32 @@ parameters:
        # Fallback logic for DBAL 2
        -
            message: '/Application::add\(\) expects Symfony\\Component\\Console\\Command\\Command/'
-            path: lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
+            path: src/Tools/Console/ConsoleRunner.php

        - '/^Class Doctrine\\DBAL\\Platforms\\SQLAnywherePlatform not found\.$/'
        - '/^Call to method \w+\(\) on an unknown class Doctrine\\DBAL\\Platforms\\SQLAnywherePlatform\.$/'

        -
-        	message: '/^Call to an undefined method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getSQLResultCasing\(\)\.$/'
-        	path: lib/Doctrine/ORM/Internal/SQLResultCasing.php
+            message: '/^Call to an undefined method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getSQLResultCasing\(\)\.$/'
+            path: src/Internal/SQLResultCasing.php
        -
-        	message: '/^Parameter \$stmt of method .* has invalid type Doctrine\\DBAL\\Driver\\ResultStatement\.$/'
-        	path: lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+            message: '/^Parameter \$stmt of method .* has invalid type Doctrine\\DBAL\\Driver\\ResultStatement\.$/'
+            path: src/Internal/Hydration/AbstractHydrator.php
        -
-        	message: '/^Class Doctrine\\DBAL\\Driver\\ResultStatement not found\.$/'
-        	path: lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+            message: '/^Class Doctrine\\DBAL\\Driver\\ResultStatement not found\.$/'
+            path: src/Internal/Hydration/AbstractHydrator.php
        -
-        	message: '/^Call to static method ensure\(\) on an unknown class Doctrine\\DBAL\\ForwardCompatibility\\Result\.$/'
-        	path: lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+            message: '/^Call to static method ensure\(\) on an unknown class Doctrine\\DBAL\\ForwardCompatibility\\Result\.$/'
+            path: src/Internal/Hydration/AbstractHydrator.php
+        -
+            message: '/^Instanceof between Doctrine\\DBAL\\Platforms\\AbstractPlatform and Doctrine\\DBAL\\Platforms\\MySQLPlatform will always evaluate to false\.$/'
+            path: src/Utility/LockSqlHelper.php

        # False positive
        -
            message: '/^Call to an undefined method Doctrine\\Common\\Cache\\Cache::deleteAll\(\)\.$/'
            count: 1
-            path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php
+            path: src/Tools/Console/Command/ClearCache/ResultCommand.php

        # Symfony cache supports passing a key prefix to the clear method.
        - '/^Method Psr\\Cache\\CacheItemPoolInterface\:\:clear\(\) invoked with 1 parameter, 0 required\.$/'
@@ -40,10 +43,10 @@ parameters:
        # Persistence 2 support
        -
            message: '/clear.*invoked with 1 parameter/'
-            path: lib/Doctrine/ORM/EntityRepository.php
+            path: src/EntityRepository.php
        -
            message: '#^Class Doctrine\\Persistence\\ObjectManagerAware not found\.$#'
-            path: lib/Doctrine/ORM/UnitOfWork.php
+            path: src/UnitOfWork.php
        -
            message: '#^Call to method injectObjectManager\(\) on an unknown class Doctrine\\Persistence\\ObjectManagerAware\.$#'
-            path: lib/Doctrine/ORM/UnitOfWork.php
+            path: src/UnitOfWork.php
@@ -17,11 +17,11 @@
         verbose="false"
         failOnRisky="true"
         convertDeprecationsToExceptions="true"
-         bootstrap="./tests/Doctrine/Tests/TestInit.php"
+         bootstrap="./tests/Tests/TestInit.php"
 >
    <testsuites>
        <testsuite name="Doctrine ORM Test Suite">
-            <directory>./tests/Doctrine/Tests/ORM</directory>
+            <directory>./tests/Tests/ORM</directory>
        </testsuite>
    </testsuites>

@@ -11,11 +11,11 @@
    errorBaseline="psalm-baseline.xml"
 >
    <projectFiles>
-        <directory name="lib/Doctrine/ORM" />
-        <directory name="tests/Doctrine/StaticAnalysis" />
+        <directory name="src" />
+        <directory name="tests/StaticAnalysis" />
        <ignoreFiles>
            <directory name="vendor" />
-            <file name="lib/Doctrine/ORM/Mapping/Driver/AttributeReader.php" />
+            <file name="src/Mapping/Driver/AttributeReader.php" />
        </ignoreFiles>
    </projectFiles>
    <enableExtensions>
@@ -54,15 +54,15 @@
        </DeprecatedClass>
        <DeprecatedConstant>
            <errorLevel type="suppress">
-                <file name="lib/Doctrine/ORM/Configuration.php"/>
-                <file name="lib/Doctrine/ORM/Query/Lexer.php"/>
-                <file name="lib/Doctrine/ORM/Query/Parser.php"/>
-                <file name="lib/Doctrine/ORM/QueryBuilder.php"/>
-                <file name="lib/Doctrine/ORM/Tools/EntityGenerator.php"/>
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php" />
-                <file name="lib/Doctrine/ORM/Tools/EntityGenerator.php" />
-                <file name="lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php" />
-                <file name="lib/Doctrine/ORM/Tools/SchemaTool.php" />
+                <file name="src/Configuration.php"/>
+                <file name="src/Query/Lexer.php"/>
+                <file name="src/Query/Parser.php"/>
+                <file name="src/QueryBuilder.php"/>
+                <file name="src/Tools/EntityGenerator.php"/>
+                <file name="src/Mapping/ClassMetadataInfo.php" />
+                <file name="src/Tools/EntityGenerator.php" />
+                <file name="src/Tools/Export/Driver/AbstractExporter.php" />
+                <file name="src/Tools/SchemaTool.php" />
            </errorLevel>
        </DeprecatedConstant>
        <DeprecatedInterface>
@@ -75,7 +75,7 @@
        <DeprecatedMethod>
            <errorLevel type="suppress">
                <!-- We're calling the deprecated method for BC here. -->
-                <file name="lib/Doctrine/ORM/Internal/SQLResultCasing.php"/>
+                <file name="src/Internal/SQLResultCasing.php"/>
                <referencedMethod name="Doctrine\DBAL\Platforms\AbstractPlatform::getIdentitySequenceName"/>
                <referencedMethod name="Doctrine\DBAL\Platforms\AbstractPlatform::usesSequenceEmulatedIdentityColumns"/>
                <!-- We need to keep the calls for DBAL 2.13 compatibility. -->
@@ -88,6 +88,8 @@
                <referencedMethod name="Doctrine\DBAL\Platforms\AbstractPlatform::supportsForeignKeyConstraints"/>
                <!-- Remove on 3.0.x -->
                <referencedMethod name="Doctrine\DBAL\Connection::getEventManager"/>
+                <referencedMethod name="Doctrine\DBAL\Platforms\AbstractPlatform::getReadLockSQL"/>
+                <referencedMethod name="Doctrine\DBAL\Platforms\AbstractPlatform::getWriteLockSQL"/>
                <referencedMethod name="Doctrine\DBAL\Schema\Schema::visit"/>
                <referencedMethod name="Doctrine\DBAL\Schema\SchemaDiff::toSaveSql"/>
                <referencedMethod name="Doctrine\DBAL\Schema\SchemaDiff::toSql"/>
@@ -102,7 +104,7 @@
                <referencedMethod name="Doctrine\ORM\Query\SqlWalker::walkInExpression"/>
                <referencedMethod name="Doctrine\ORM\Query\TreeWalkerAdapter::_getQueryComponents"/>
                <referencedMethod name="Doctrine\ORM\Mapping\ClassMetadataInfo::isInheritanceTypeTablePerClass"/>
-                <file name="lib/Doctrine/ORM/Query/TreeWalkerChain.php"/>
+                <file name="src/Query/TreeWalkerChain.php"/>
            </errorLevel>
        </DeprecatedMethod>
        <DeprecatedProperty>
@@ -114,24 +116,24 @@
        <DocblockTypeContradiction>
            <errorLevel type="suppress">
                <!-- We're catching invalid input here. -->
-                <file name="lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php"/>
+                <file name="src/Internal/Hydration/AbstractHydrator.php"/>

                <!-- DBAL 3.2 forward compatibility -->
-                <file name="lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php"/>
-                <file name="lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php"/>
+                <file name="src/Tools/Pagination/CountOutputWalker.php"/>
+                <file name="src/Tools/Pagination/LimitSubqueryOutputWalker.php"/>
                <!-- https://github.com/vimeo/psalm/issues/8520 -->
-                <file name="lib/Doctrine/ORM/PersistentCollection.php"/>
+                <file name="src/PersistentCollection.php"/>
            </errorLevel>
        </DocblockTypeContradiction>
        <DuplicateClass>
            <errorLevel type="suppress">
-                <file name="lib/Doctrine/ORM/Tools/Console/CommandCompatibility.php"/>
-                <file name="lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php"/>
+                <file name="src/Tools/Console/CommandCompatibility.php"/>
+                <file name="src/Tools/Console/Helper/EntityManagerHelper.php"/>
            </errorLevel>
        </DuplicateClass>
        <ForbiddenCode>
            <errorLevel type="suppress">
-                <file name="lib/Doctrine/ORM/Tools/Debug.php"/>
+                <file name="src/Tools/Debug.php"/>
            </errorLevel>
        </ForbiddenCode>
        <InvalidArgument>
@@ -145,66 +147,67 @@
        <InvalidArrayAccess>
            <errorLevel type="suppress">
                <!-- https://github.com/vimeo/psalm/issues/9160 -->
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Mapping/ClassMetadataFactory.php"/>
            </errorLevel>
        </InvalidArrayAccess>
        <InvalidArrayAssignment>
            <errorLevel type="suppress">
                <!-- https://github.com/vimeo/psalm/issues/9160 -->
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Mapping/ClassMetadataFactory.php"/>
            </errorLevel>
        </InvalidArrayAssignment>
        <InvalidClass>
            <errorLevel type="suppress">
                <!-- Class name changes in DBAL 3. -->
                <referencedClass name="Doctrine\DBAL\Platforms\PostgreSQLPlatform" />
+                <referencedClass name="Doctrine\DBAL\Platforms\MySQLPlatform" />
            </errorLevel>
        </InvalidClass>
        <InvalidParamDefault>
            <errorLevel type="suppress">
                <!-- Remove on 3.0.x -->
-                <file name="lib/Doctrine/ORM/Query/AST/InstanceOfExpression.php"/>
+                <file name="src/Query/AST/InstanceOfExpression.php"/>
            </errorLevel>
        </InvalidParamDefault>
        <InvalidPropertyAssignmentValue>
            <errorLevel type="suppress">
                <!-- https://github.com/vimeo/psalm/issues/9155 -->
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Mapping/ClassMetadataFactory.php"/>
            </errorLevel>
        </InvalidPropertyAssignmentValue>
        <MethodSignatureMismatch>
            <errorLevel type="suppress">
                <!-- See https://github.com/vimeo/psalm/issues/7357 -->
-                <file name="lib/Doctrine/ORM/Mapping/ReflectionReadonlyProperty.php"/>
+                <file name="src/Mapping/ReflectionReadonlyProperty.php"/>
            </errorLevel>
        </MethodSignatureMismatch>
        <MissingDependency>
            <errorLevel type="suppress">
                <!-- DBAL 3.2 forward compatibility -->
-                <file name="lib/Doctrine/ORM/Internal/SQLResultCasing.php"/>
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
-                <file name="lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php"/>
+                <file name="src/Internal/SQLResultCasing.php"/>
+                <file name="src/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Tools/Pagination/LimitSubqueryOutputWalker.php"/>
            </errorLevel>
        </MissingDependency>
        <MissingParamType>
            <errorLevel type="suppress">
                <!-- Persistence 2 compatibility -->
-                <file name="lib/Doctrine/ORM/EntityManager.php"/>
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php"/>
+                <file name="src/EntityManager.php"/>
+                <file name="src/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Mapping/ClassMetadataInfo.php"/>
            </errorLevel>
        </MissingParamType>
        <NonInvariantDocblockPropertyType>
            <errorLevel type="suppress">
                <!-- Remove on 3.0.x -->
-                <file name="lib/Doctrine/ORM/Query/AST/InListExpression.php"/>
-                <file name="lib/Doctrine/ORM/Query/AST/InSubselectExpression.php"/>
+                <file name="src/Query/AST/InListExpression.php"/>
+                <file name="src/Query/AST/InSubselectExpression.php"/>
            </errorLevel>
        </NonInvariantDocblockPropertyType>
        <PossiblyInvalidArgument>
            <errorLevel type="suppress">
                <!-- https://github.com/vimeo/psalm/issues/9155 -->
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Mapping/ClassMetadataFactory.php"/>
            </errorLevel>
        </PossiblyInvalidArgument>
        <PropertyNotSetInConstructor>
@@ -213,31 +216,31 @@
                <referencedProperty name="Doctrine\ORM\Cache\CacheKey::$hash"/>
            </errorLevel>
            <errorLevel type="suppress">
-                <directory name="lib/Doctrine/ORM/Query/AST" />
+                <directory name="src/Query/AST" />
            </errorLevel>
        </PropertyNotSetInConstructor>
        <PropertyTypeCoercion>
            <errorLevel type="suppress">
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php"/>
+                <file name="src/Mapping/ClassMetadataInfo.php"/>
            </errorLevel>
        </PropertyTypeCoercion>
        <RedundantCastGivenDocblockType>
            <errorLevel type="suppress">
                <!-- Can be removed once the "getMaxResults" methods of those classes have native parameter types -->
-                <file name="lib/Doctrine/ORM/Query.php"/>
-                <file name="lib/Doctrine/ORM/QueryBuilder.php"/>
+                <file name="src/Query.php"/>
+                <file name="src/QueryBuilder.php"/>
            </errorLevel>
        </RedundantCastGivenDocblockType>
        <RedundantCondition>
            <errorLevel type="suppress">
                <!-- The SQLAnywherePlatform class may or may not exist depending on the DBAL version -->
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Mapping/ClassMetadataFactory.php"/>
            </errorLevel>
        </RedundantCondition>
        <ReferenceConstraintViolation>
            <errorLevel type="suppress">
                <!-- https://github.com/vimeo/psalm/issues/9155 -->
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Mapping/ClassMetadataFactory.php"/>
            </errorLevel>
        </ReferenceConstraintViolation>
        <TooManyArguments>
@@ -254,8 +257,9 @@
        </TooManyArguments>
        <TypeDoesNotContainType>
            <errorLevel type="suppress">
-                <file name="lib/Doctrine/ORM/Internal/SQLResultCasing.php"/>
-                <file name="lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Internal/SQLResultCasing.php"/>
+                <file name="src/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Utility/LockSqlHelper.php"/>
            </errorLevel>
        </TypeDoesNotContainType>
        <UndefinedClass>
@@ -294,7 +298,7 @@
        </UndefinedMethod>
        <MissingClosureReturnType>
            <errorLevel type="suppress">
-                <file name="lib/Doctrine/ORM/Tools/Pagination/Paginator.php"/>
+                <file name="src/Tools/Pagination/Paginator.php"/>
            </errorLevel>
        </MissingClosureReturnType>
    </issueHandlers>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Grégoire Paris	f2176a9ce5	Merge pull request #11201 from mpdude/merge-up-217-218 Merge 2.17.x up into 2.18.x	2024-01-31 16:53:12 +01:00
Matthias Pigulla	9a6ff66c5e	Merge remote-tracking branch 'origin/2.17.x' into 2.18.x	2024-01-31 15:41:59 +01:00
Grégoire Paris	f58984c43f	Merge pull request #11198 from jwage/port-lock-sql-changes Fix calls to removed lock methods (#11061)	2024-01-31 08:50:41 +01:00
Alexander M. Turek	79c7c5087e	Fix calls to removed lock methods (#11061 )	2024-01-30 15:39:35 -06:00
Grégoire Paris	12c4560f1d	Merge pull request #11197 from mpdude/update-limit-subquery-output-walker-test Cover limit/offset values in `LimitSubqueryOutputWalkerTest`	2024-01-30 11:26:54 +01:00
Matthias Pigulla	152ebd756c	Cover limit/offset values in `LimitSubqueryOutputWalkerTest` This will help to make sure we don't lose those parts of the SQL when working on #11188.	2024-01-30 09:02:43 +01:00
Grégoire Paris	8845b6de0f	Merge pull request #11195 from greg0ire/more-specific-type Use a more specific type for getSqlStatements()	2024-01-30 08:58:52 +01:00
Grégoire Paris	e110941f9d	Use a more specific type for getSqlStatements() It is strictly beneficial for the Psalm baseline.	2024-01-29 21:07:12 +01:00
Grégoire Paris	5b5b56d83a	Merge pull request #11190 from doctrine/2.17.x-merge-up-into-2.18.x_5AQ0zJbx Merge release 2.17.4 into 2.18.x	2024-01-28 16:54:18 +01:00
Grégoire Paris	a9c45a37ff	Merge remote-tracking branch 'origin/2.17.x' into 2.17.x-merge-up-into-2.18.x_5AQ0zJbx	2024-01-28 16:41:34 +01:00
Grégoire Paris	82533af893	Merge pull request #11191 from greg0ire/ignore-depr Ignore deprecations handled in next major	2024-01-28 16:40:46 +01:00
Grégoire Paris	b988137378	Ignore deprecations handled in next major These deprecations have been handled on 4.0.x in https://github.com/doctrine/orm/pull/11061, it is safe to ignore them.	2024-01-28 16:30:02 +01:00
Grégoire Paris	ccfc97c32f	Merge pull request #11187 from jwage/remove-xml-validation-disabling-deprecation Remove XML validation disabling deprecation.	2024-01-26 20:41:16 +01:00
Jonathan H. Wage	d386b43be3	Remove XML validation disabling deprecation.	2024-01-26 09:59:03 -06:00
Grégoire Paris	0970ce7072	Merge pull request #11186 from derrabus/chore/readme-versions Update branches in README	2024-01-26 08:34:24 +01:00
Alexander M. Turek	624c56be72	Update branches in README	2024-01-26 00:52:35 +01:00
Grégoire Paris	020d31efba	Remove remaining submodules (#11183 ) We are no longer relying on either piece of software.	2024-01-23 19:51:48 +01:00
Grégoire Paris	fbc8e6741e	Merge pull request #11176 from thePanz/fix-11173-get-name-on-null-non-backed-enum Throw exception when trying to use non-backed enum types	2024-01-23 07:50:20 +01:00
Grégoire Paris	2d65bc265b	Merge pull request #11180 from greg0ire/allow-lexer-3 Allow doctrine/lexer 3	2024-01-22 19:51:10 +01:00
thePanz	7151db3cb8	Throw exception when trying to use non-backed enum types	2024-01-22 13:04:58 +01:00
Grégoire Paris	c23524259c	Merge pull request #11181 from greg0ire/followup-rename Look for lib remnants in hidden files	2024-01-21 23:52:34 +01:00
Grégoire Paris	4bddab9e09	Look for lib remnants in hidden files	2024-01-21 23:40:35 +01:00
Grégoire Paris	df730d69b8	Allow doctrine/lexer 3	2024-01-21 19:25:40 +01:00
Grégoire Paris	ac24c11808	Modernize code in documentation (#11179 ) Somehow, there still were code samples relying on annotations.	2024-01-20 21:53:48 +01:00
Grégoire Paris	dd478d8662	Merge pull request #11178 from greg0ire/remove-ref-jira Remove references to JIRA	2024-01-20 14:06:15 +01:00
Grégoire Paris	0b3cd72609	Remove references to JIRA	2024-01-20 13:45:04 +01:00
Grégoire Paris	85034699cb	Merge pull request #11171 from greg0ire/extract-class Make Doctrine\Tests\ORM\Internal\Node autoloadable	2024-01-18 21:33:06 +01:00
Grégoire Paris	d98186e2c4	Make Doctrine\Tests\ORM\Internal\Node autoloadable It is used in several tests.	2024-01-18 21:19:28 +01:00
Grégoire Paris	2b8d6f87b2	Merge remote-tracking branch 'origin/2.17.x' into 2.18.x	2024-01-18 16:49:56 +01:00
Grégoire Paris	a0ed37954b	Merge pull request #11167 from bobvandevijver/fix-eager-iterable-loading-test Use foreach on iterable to prevent table locks during tests	2024-01-18 16:47:11 +01:00
Bob van de Vijver	4875f4c878	Use foreach on iterable to prevent table locks during tests	2024-01-18 10:24:40 +01:00
Grégoire Paris	b648bea2af	Merge pull request #11164 from doctrine/2.17.x-merge-up-into-2.18.x_slYTN7ur Merge release 2.17.3 into 2.18.x	2024-01-17 20:44:06 +01:00
Grégoire Paris	f16594e89c	Merge remote-tracking branch 'origin/2.17.x' into 2.17.x-merge-up-into-2.18.x_slYTN7ur	2024-01-17 20:10:52 +01:00
Grégoire Paris	d6989297c5	Merge pull request #11148 from greg0ire/flatten Flatten directory tree on 2.18	2024-01-02 21:54:30 +01:00
Grégoire Paris	073f2aa891	Flatten directory tree It will make fuzzy matchers more efficient, and configuration files more readable. - lib/Doctrine/ORM becomes just src - tests/Doctrine/ becomes just tests	2024-01-02 19:52:06 +01:00
Grégoire Paris	a98e306335	Merge pull request #11144 from doctrine/2.17.x Merge 2.17.x up into 2.18.x	2024-01-02 08:31:34 +01:00
Grégoire Paris	091e43eb9d	Merge pull request #11141 from doctrine/2.17.x Merge 2.17.x up into 2.18.x	2023-12-28 19:38:08 +01:00
Alexander M. Turek	9785cb84c6	Merge release 2.17.2 into 2.18.x (#11131 )	2023-12-20 23:16:21 +01:00
Grégoire Paris	c2d29d55ab	Merge pull request #11114 from doctrine/2.17.x Merge 2.17.x up into 2.18.x	2023-12-11 21:10:05 +01:00