Add support for doctrine/orm 3

.github/workflows/test.yml

@@ -48,24 +48,14 @@ jobs:
             ${{ runner.os }}-php-${{ matrix.dependencies }}-
             ${{ runner.os }}-php-
 
-      - name: Install highest dependencies
-        if: ${{ matrix.dependencies == 'high' }}
+      - name: Install dependencies
         run: composer update
           --no-ansi
           --no-interaction
           --no-progress
           --no-suggest
           --prefer-dist
-
-      - name: Install lowest dependencies
-        if: ${{ matrix.dependencies == 'low' }}
-        run: composer update
-          --no-ansi
-          --no-interaction
-          --no-progress
-          --no-suggest
-          --prefer-dist
-          --prefer-lowest
+          ${{ matrix.dependencies == 'low' && '--prefer-lowest' || '' }}
 
       - name: PHPUnit
         run: vendor/bin/phpunit

README.md

@@ -47,7 +47,6 @@ The following methods on Doctrine's `EntityManagerInterface` should all work as
 - find
 - persist
 - remove
-- merge
 - flush
 - getRepository
 - getCache (will always return `null`)
@@ -88,3 +87,10 @@ The following methods are **not** supported at this time:
 - getFilters
 - isFiltersStateClean
 - hasFilters
+
+## ORM v2 Support
+
+As of Mocktrine, 1.0 and newer, Doctrine/ORM v3 is the only supported version.
+While it was originally a goal to support v2 and v3 in the same major version of Mocktrine, there are too many BC breaks for this to be practical.
+
+To use Mocktrine to test Doctrine/ORM v2 code, install the 0.x line.

composer.json

@@ -6,7 +6,7 @@
         "php": "^8.1",
         "doctrine/annotations": "^1.10 || ^2.0",
         "doctrine/collections": "^1.6.8 || ^2.0",
-        "doctrine/orm": "^2.9",
+        "doctrine/orm": "^3.0",
         "doctrine/persistence": "^1.3 || ^2.0 || ^3.0"
     },
     "require-dev": {

phpstan-baseline.neon

@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Return type \\(Firehed\\\\Mocktrine\\\\InMemoryRepository\\<Entity of object\\>\\) of method Firehed\\\\Mocktrine\\\\InMemoryEntityManager\\:\\:getRepository\\(\\) should be compatible with return type \\(Doctrine\\\\ORM\\\\EntityRepository\\<object\\>\\) of method Doctrine\\\\ORM\\\\EntityManagerInterface\\:\\:getRepository\\(\\)$#"
-			count: 1
-			path: src/InMemoryEntityManager.php
-
 		-
 			message: "#^Property Firehed\\\\Mocktrine\\\\RepositoryContainer\\:\\:\\$values with generic class Firehed\\\\Mocktrine\\\\InMemoryRepository does not specify its types\\: Entity$#"
 			count: 1

src/ArrayALC.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Firehed\Mocktrine;
+
+use BadMethodCallException;
+use Doctrine\Common\Collections\{
+    AbstractLazyCollection,
+    Criteria,
+    Collection,
+    Selectable,
+};
+
+/**
+ * Since we're currently forced to extend EntityRepository instead of merely
+ * implementing the interface in orm:3, we're consequently forced to return an
+ * implementation-specific `AbstractLazyCollection` intead of the interface's
+ * `ReadableCollection`. This does some light wrapping to allow things to work
+ * for the common case.
+ *
+ * @see doctrine/orm#11019
+ *
+ * @template TKey of array-key
+ * @template T of object
+ *
+ * @extends AbstractLazyCollection<TKey, T>
+ * @implements Selectable<TKey, T>
+ *
+ * @internal
+ */
+class ArrayALC extends AbstractLazyCollection implements Selectable
+{
+    /**
+     * @param Collection<TKey, T> $collection
+     */
+    public function __construct(
+        Collection $collection,
+    ) {
+        $this->collection = $collection;
+    }
+
+    protected function doInitialize(): void
+    {
+        // no-op, constructor does this
+    }
+
+    public function matching(Criteria $criteria)
+    {
+        throw new BadMethodCallException('Nested matching not supported');
+    }
+}