Merge release 2.15.2 into 2.16.x (#2967)

* Merge pull request #2963 from IonBazan/fix-test

Fix provideProxiedExprMethods provider

* Bump doctrine/.github/.github/workflows/coding-standards.yml (#2941)

Bumps [doctrine/.github/.github/workflows/coding-standards.yml](https://github.com/doctrine/.github) from 12.2.0 to 13.1.0.
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@v12.2.0...13.1.0)

---
updated-dependencies:
- dependency-name: doctrine/.github/.github/workflows/coding-standards.yml
  dependency-version: 13.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Skip native lazy object initialization for unmapped properties (#2922)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Ion Bazan <ion.bazan@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jérôme Tamarelle <jerome@tamarelle.net>

Author: 4 people

.github/workflows/coding-standards.yml

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

docs/en/cookbook/lookup-reference.rst

@@ -14,6 +14,12 @@ need the referenced documents, you can use the ``$lookup`` stage in MongoDB's
 aggregation pipeline. It's similar to a SQL join, without duplication of data in
 the result set when there is many references to load.
 
+.. note::
+
+    Lazy loading of references only occurs when accessing an uninitialized mapped property.
+    If you access a property that is not mapped in Doctrine, that will not trigger
+    loading of the referenced document.
+
 Example setup
 -------------
 

src/Proxy/Factory/NativeLazyObjectFactory.php

@@ -12,8 +12,10 @@
 use Doctrine\Persistence\NotifyPropertyChanged;
 use LogicException;
 use ReflectionClass;
+use ReflectionProperty;
 use WeakMap;
 
+use function array_key_exists;
 use function count;
 
 use const PHP_VERSION_ID;
@@ -27,6 +29,9 @@ class NativeLazyObjectFactory implements ProxyFactory
     private readonly UnitOfWork $unitOfWork;
     private readonly LifecycleEventManager $lifecycleEventManager;
 
+    /** @var array<class-string, ReflectionProperty[]> */
+    private array $skippedProperties = [];
+
     public function __construct(
         DocumentManager $documentManager,
     ) {
@@ -68,13 +73,40 @@ public function getProxy(ClassMetadata $metadata, $identifier): object
 
         $metadata->propertyAccessors[$metadata->identifier]->setValue($proxy, $identifier);
 
+        foreach ($this->getSkippedProperties($metadata) as $property) {
+            $property->skipLazyInitialization($proxy);
+        }
+
         if (isset(self::$lazyObjects)) {
             self::$lazyObjects[$proxy] = true;
         }
 
         return $proxy;
     }
 
+    /** @return ReflectionProperty[] */
+    private function getSkippedProperties(ClassMetadata $metadata): array
+    {
+        if (isset($this->skippedProperties[$metadata->name])) {
+            return $this->skippedProperties[$metadata->name];
+        }
+
+        $skippedProperties = [];
+        foreach ($metadata->reflClass->getProperties() as $property) {
+            if (array_key_exists($property->name, $metadata->propertyAccessors)) {
+                continue;
+            }
+
+            if ($property->isVirtual()) {
+                continue;
+            }
+
+            $skippedProperties[] = $property;
+        }
+
+        return $this->skippedProperties[$metadata->name] = $skippedProperties;
+    }
+
     /** @internal Only for tests */
     public static function enableTracking(bool $enabled = true): void
     {

tests/Documents/DocumentWithUnmappedProperties.php

@@ -4,14 +4,18 @@
 
 namespace Documents;
 
-use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\Id;
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 
-#[Document]
+#[ODM\Document]
 class DocumentWithUnmappedProperties
 {
-    #[Id]
+    #[ODM\Id]
     public string $id;
 
     public string $foo = 'bar';
+
+    // We need at least one mapped field to avoid the native lazy object to be
+    // switched to "initialized" state immediately after setting all its properties.
+    #[ODM\Field]
+    public string $mappedField;
 }

tests/Tests/Functional/ReferencesTest.php

@@ -15,6 +15,7 @@
 use Doctrine\ODM\MongoDB\Tests\BaseTestCase;
 use Documents\Account;
 use Documents\Address;
+use Documents\DocumentWithUnmappedProperties;
 use Documents\Group;
 use Documents\Phonenumber;
 use Documents\Profile;
@@ -28,6 +29,15 @@
 
 class ReferencesTest extends BaseTestCase
 {
+    public function testSkipInitializationForUnmappedProperties(): void
+    {
+        $loadedDocument = $this->dm->getReference(DocumentWithUnmappedProperties::class, '123');
+        $this->assertInstanceOf(DocumentWithUnmappedProperties::class, $loadedDocument);
+
+        self::assertSame('bar', $loadedDocument->foo);
+        self::assertTrue($this->dm->isUninitializedObject($loadedDocument));
+    }
+
     public function testManyDeleteReference(): void
     {
         $user = new User();

tests/Tests/Query/BuilderTest.php

@@ -504,8 +504,8 @@ public static function provideProxiedExprMethods(): array
             'type()' => ['type', [7]],
             'all()' => ['all', [['value1', 'value2']]],
             'mod()' => ['mod', [2, 0]],
-            'near()' => ['near', [1, 2], null, 5, 10],
-            'nearSphere()' => ['nearSphere', [1, 2], null, 5, 10],
+            'near()' => ['near', [[1, 2], null, 5, 10]],
+            'nearSphere()' => ['nearSphere', [[1, 2], null, 5, 10]],
             'geoIntersects()' => ['geoIntersects', [self::createGeometry()]],
             'geoWithin()' => ['geoWithin', [self::createGeometry()]],
             'geoWithinBox()' => ['geoWithinBox', [1, 2, 3, 4]],