Merge pull request #824 from doctrine/6.0.x-merge-up-into-6.1.x_f1s1cbRi

Merge release 6.0.5 into 6.1.x

composer.json

@@ -79,9 +79,6 @@
     "conflict": {
         "doctrine/orm": "2.12.0"
     },
-    "provide": {
-        "laminas/laminas-cache-storage-implementation": "1.0.0"
-    },
     "suggest": {
         "doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments"
     },

src/Options/Authentication.php

@@ -47,6 +47,8 @@
  * All remains the same using with DoctrineModule\Service\AuthenticationStorageFactory,
  * however, a string may be passed to $objectManager. This string must be a valid key to
  * retrieve an ObjectManager instance from the ServiceManager.
+ *
+ * @template-extends AbstractOptions<mixed>
  */
 final class Authentication extends AbstractOptions
 {

src/Options/Cache.php

@@ -9,6 +9,8 @@
 
 /**
  * Cache options
+ *
+ * @template-extends AbstractOptions<mixed>
  */
 final class Cache extends AbstractOptions
 {

src/Options/Driver.php

@@ -8,6 +8,8 @@
 
 /**
  * MappingDriver options
+ *
+ * @template-extends AbstractOptions<mixed>
  */
 final class Driver extends AbstractOptions
 {

src/Options/EventManager.php

@@ -8,6 +8,8 @@
 
 /**
  * EventManager options
+ *
+ * @template-extends AbstractOptions<mixed>
  */
 final class EventManager extends AbstractOptions
 {

src/Validator/ObjectExists.php

@@ -118,14 +118,14 @@ private function validateFields(): array
     }
 
     /**
-     * @param string|object|mixed[] $value a field value or an array of field values if more fields have been configured to be
+     * @param string|int|object|mixed[] $value a field value or an array of field values if more fields have been configured to be
      *                      matched
      *
      * @return mixed[]
      *
      * @throws Exception\RuntimeException
      */
-    protected function cleanSearchValue(string|object|array $value): array
+    protected function cleanSearchValue(string|int|object|array $value): array
     {
         $value = is_object($value) ? [$value] : (array) $value;
 

tests/Validator/ObjectExistsTest.php

@@ -36,6 +36,22 @@ public function testCanValidateWithSingleField(): void
         $this->assertTrue($validator->isValid(['matchKey' => 'matchValue']));
     }
 
+    public function testCanValidateWithIntegerId(): void
+    {
+        $repository = $this->createMock(ObjectRepository::class);
+
+        $repository
+            ->expects($this->exactly(2))
+            ->method('findOneBy')
+            ->with(['matchKey' => 123])
+            ->will($this->returnValue(new stdClass()));
+
+        $validator = new ObjectExists(['object_repository' => $repository, 'fields' => 'matchKey']);
+
+        $this->assertTrue($validator->isValid(123));
+        $this->assertTrue($validator->isValid(['matchKey' => 123]));
+    }
+
     public function testCanValidateWithMultipleFields(): void
     {
         $repository = $this->createMock(ObjectRepository::class);