From 911438ce8746a18a9d55aac0607318f573bd2c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Hu=C4=8D=C3=ADk?= Date: Sat, 7 Feb 2026 23:00:37 +0100 Subject: [PATCH 1/7] Fix parameter type hints in EntityManager methods --- src/Kdyby/Doctrine/EntityManager.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Kdyby/Doctrine/EntityManager.php b/src/Kdyby/Doctrine/EntityManager.php index 63372755..273b9931 100644 --- a/src/Kdyby/Doctrine/EntityManager.php +++ b/src/Kdyby/Doctrine/EntityManager.php @@ -140,7 +140,7 @@ public function persist($entity) * @param object|array|NULL $entity * @return EntityManager */ - public function flush($entity = null) + public function flush($entity ) { try { parent::flush($entity); @@ -183,7 +183,7 @@ public function close() */ public function safePersist($entity) { - if ($this->nonLockingUniqueInserter === NULL) { + if ($this->nonLockingUniqueInserter ==) { $this->nonLockingUniqueInserter = new NonLockingUniqueInserter($this); } @@ -221,7 +221,7 @@ public function newHydrator($hydrationMode) * @throws \Doctrine\ORM\ORMException * @return EntityManager */ - public static function create($conn, Doctrine\ORM\Configuration $config, Doctrine\Common\EventManager $eventManager = NULL) + public static function create($conn, Doctrine\ORM\Configuration $config, ?Doctrine\Common\EventManager $eventManager ) { if (!$config->getMetadataDriverImpl()) { throw ORMException::missingMappingDriverImpl(); From ee14048c365b3c84c72a79ecac063488820bcc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Hu=C4=8D=C3=ADk?= Date: Sat, 7 Feb 2026 23:04:24 +0100 Subject: [PATCH 2/7] Set default value of entity parameter to null --- src/Kdyby/Doctrine/EntityManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Kdyby/Doctrine/EntityManager.php b/src/Kdyby/Doctrine/EntityManager.php index 273b9931..66f94c99 100644 --- a/src/Kdyby/Doctrine/EntityManager.php +++ b/src/Kdyby/Doctrine/EntityManager.php @@ -140,7 +140,7 @@ public function persist($entity) * @param object|array|NULL $entity * @return EntityManager */ - public function flush($entity ) + public function flush($entity = null) { try { parent::flush($entity); From e88c56af4ee7f87b380e3426e8f6417405356cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Hu=C4=8D=C3=ADk?= Date: Sat, 7 Feb 2026 23:04:56 +0100 Subject: [PATCH 3/7] Fix variable name from nonLockingUniqueInserter to ckingUniqueInserter --- src/Kdyby/Doctrine/EntityManager.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Kdyby/Doctrine/EntityManager.php b/src/Kdyby/Doctrine/EntityManager.php index 66f94c99..fbc48af1 100644 --- a/src/Kdyby/Doctrine/EntityManager.php +++ b/src/Kdyby/Doctrine/EntityManager.php @@ -37,9 +37,9 @@ class EntityManager extends Doctrine\ORM\EntityManager implements Persistence\Qu use \Kdyby\StrictObjects\Scream; /** - * @var NonLockingUniqueInserter + * @var ckingUniqueInserter */ - private $nonLockingUniqueInserter; + private $ckingUniqueInserter; /** * @var \Kdyby\Doctrine\Diagnostics\EntityManagerUnitOfWorkSnapshotPanel @@ -183,7 +183,7 @@ public function close() */ public function safePersist($entity) { - if ($this->nonLockingUniqueInserter ==) { + if ($this->ckingUniqueInserter === NULL) { $this->nonLockingUniqueInserter = new NonLockingUniqueInserter($this); } From f0c8adc005ad84ec7ed777873ce2506d79f69267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Hu=C4=8D=C3=ADk?= Date: Sat, 7 Feb 2026 23:05:49 +0100 Subject: [PATCH 4/7] Rename ckingUniqueInserter to nonLockingUniqueInserter --- src/Kdyby/Doctrine/EntityManager.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Kdyby/Doctrine/EntityManager.php b/src/Kdyby/Doctrine/EntityManager.php index fbc48af1..f67db24d 100644 --- a/src/Kdyby/Doctrine/EntityManager.php +++ b/src/Kdyby/Doctrine/EntityManager.php @@ -37,9 +37,9 @@ class EntityManager extends Doctrine\ORM\EntityManager implements Persistence\Qu use \Kdyby\StrictObjects\Scream; /** - * @var ckingUniqueInserter + * @var UniqueInserter */ - private $ckingUniqueInserter; + private $nonLockingUniqueInserter; /** * @var \Kdyby\Doctrine\Diagnostics\EntityManagerUnitOfWorkSnapshotPanel @@ -183,7 +183,7 @@ public function close() */ public function safePersist($entity) { - if ($this->ckingUniqueInserter === NULL) { + if ($this->nonLockingUniqueInserter === NULL) { $this->nonLockingUniqueInserter = new NonLockingUniqueInserter($this); } From 2cb5c6ce4a86f5b31bd76067266ea8b5e0b738f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Hu=C4=8D=C3=ADk?= Date: Sat, 7 Feb 2026 23:06:09 +0100 Subject: [PATCH 5/7] Rename UniqueInserter to NonLockingUniqueInserter --- src/Kdyby/Doctrine/EntityManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Kdyby/Doctrine/EntityManager.php b/src/Kdyby/Doctrine/EntityManager.php index f67db24d..eb78449e 100644 --- a/src/Kdyby/Doctrine/EntityManager.php +++ b/src/Kdyby/Doctrine/EntityManager.php @@ -37,7 +37,7 @@ class EntityManager extends Doctrine\ORM\EntityManager implements Persistence\Qu use \Kdyby\StrictObjects\Scream; /** - * @var UniqueInserter + * @var NonLockingUniqueInserter */ private $nonLockingUniqueInserter; From 570ee7dac92737354017324d815fb29328a654eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Hu=C4=8D=C3=ADk?= Date: Sat, 7 Feb 2026 23:07:35 +0100 Subject: [PATCH 6/7] Set default value for eventManager parameter --- src/Kdyby/Doctrine/EntityManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Kdyby/Doctrine/EntityManager.php b/src/Kdyby/Doctrine/EntityManager.php index eb78449e..5a6a8368 100644 --- a/src/Kdyby/Doctrine/EntityManager.php +++ b/src/Kdyby/Doctrine/EntityManager.php @@ -221,7 +221,7 @@ public function newHydrator($hydrationMode) * @throws \Doctrine\ORM\ORMException * @return EntityManager */ - public static function create($conn, Doctrine\ORM\Configuration $config, ?Doctrine\Common\EventManager $eventManager ) + public static function create($conn, Doctrine\ORM\Configuration $config, ?Doctrine\Common\EventManager $eventManager = NULL) { if (!$config->getMetadataDriverImpl()) { throw ORMException::missingMappingDriverImpl(); From 3fc2da149d0867ef24217c1dd3f1f23b62e57a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Hu=C4=8D=C3=ADk?= Date: Sat, 7 Feb 2026 23:10:27 +0100 Subject: [PATCH 7/7] Allow nullable arrays in startQuery and formatQuery --- src/Kdyby/Doctrine/Diagnostics/Panel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Kdyby/Doctrine/Diagnostics/Panel.php b/src/Kdyby/Doctrine/Diagnostics/Panel.php index 6a524a0f..098cf969 100644 --- a/src/Kdyby/Doctrine/Diagnostics/Panel.php +++ b/src/Kdyby/Doctrine/Diagnostics/Panel.php @@ -90,7 +90,7 @@ class Panel implements IBarPanel, Doctrine\DBAL\Logging\SQLLogger * @param array|null $params * @param array|null $types */ - public function startQuery($sql, array $params = NULL, array $types = NULL) + public function startQuery($sql, ?array $params = NULL, ?array $types = NULL) { Debugger::timer('doctrine'); @@ -559,7 +559,7 @@ public static function highlightQuery($sql) * @throws \Nette\Utils\RegexpException * @return string */ - public static function formatQuery($query, $params, array $types = [], AbstractPlatform $platform = NULL) + public static function formatQuery($query, $params, array $types = [], ?AbstractPlatform $platform = NULL) { if ($platform === NULL) { $platform = new Doctrine\DBAL\Platforms\MySqlPlatform();