From 4d806b8de58633fca5e583529bc2161b25bfd068 Mon Sep 17 00:00:00 2001 From: Tom Wright Date: Wed, 24 Apr 2024 13:46:31 +0000 Subject: [PATCH 1/4] Updated changelog Signed-off-by: Tom Wright --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 674ce1c..44a5706 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## v0.1.2 (2024-04-24) +## v0.1.3 (2024-04-24) * Updated Carbon dependency ## v0.1.2 (2023-12-12) From 2af3d0685fca84ee3fec2896db9f5457ef82257c Mon Sep 17 00:00:00 2001 From: Tom Wright Date: Fri, 26 Apr 2024 11:28:24 +0000 Subject: [PATCH 2/4] Updated dependency list Signed-off-by: Tom Wright --- CHANGELOG.md | 2 ++ composer.json | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44a5706..b6fa45e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +* Updated dependency list + ## v0.1.3 (2024-04-24) * Updated Carbon dependency diff --git a/composer.json b/composer.json index 1ceeaa7..ea42e12 100644 --- a/composer.json +++ b/composer.json @@ -10,11 +10,12 @@ } ], "require": { "php": "^8.1", + "decodelabs/dovetail": "^0.2.2", "decodelabs/exceptional": "^0.4.4", "decodelabs/guidance": "^0.1.7", "decodelabs/slingshot": "^0.1.4", - "decodelabs/stash": "^0.3.0", + "decodelabs/stash": "^0.5.0", "decodelabs/veneer": "^0.10.24", "doctrine/orm": "^2.17", @@ -25,8 +26,8 @@ "decodelabs/cipher": "^0.1.1", "decodelabs/clip": "^0.3.10", "decodelabs/genesis": "^0.8.3", - "decodelabs/glitch": "^0.18.10", "decodelabs/phpstan-decodelabs": "^0.6.7", + "martin-georgiev/postgresql-for-doctrine": "^2.1", "nesbot/carbon": "^2|^3" }, From 35c8729b862158596a20d2fd22d9a122b4a0a7b5 Mon Sep 17 00:00:00 2001 From: Tom Wright Date: Fri, 26 Apr 2024 14:19:38 +0000 Subject: [PATCH 3/4] Upgraded Doctrine to ORM 3 and DBAL 4 Signed-off-by: Tom Wright --- CHANGELOG.md | 1 + composer.json | 6 +++--- src/Indoctrination/Generator/Uuid.php | 11 ++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6fa45e..b9ffdf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +* Upgraded Doctrine to ORM 3 and DBAL 4 * Updated dependency list ## v0.1.3 (2024-04-24) diff --git a/composer.json b/composer.json index ea42e12..0766acc 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ "decodelabs/stash": "^0.5.0", "decodelabs/veneer": "^0.10.24", - "doctrine/orm": "^2.17", - "doctrine/dbal": "^3.7", + "doctrine/orm": "^3", + "doctrine/dbal": "^4", "doctrine/migrations": "^3.7" }, "require-dev": { @@ -51,7 +51,7 @@ }, "extra": { "branch-alias": { - "dev-develop": "0.1.x-dev" + "dev-develop": "0.2.x-dev" } } } diff --git a/src/Indoctrination/Generator/Uuid.php b/src/Indoctrination/Generator/Uuid.php index faa98e9..7384c8b 100644 --- a/src/Indoctrination/Generator/Uuid.php +++ b/src/Indoctrination/Generator/Uuid.php @@ -10,17 +10,14 @@ namespace DecodeLabs\Indoctrination\Generator; use DecodeLabs\Guidance; -use Doctrine\ORM\EntityManager; +use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Id\AbstractIdGenerator; class Uuid extends AbstractIdGenerator { - /** - * @param object $entity - */ - public function generate( - EntityManager $entityManager, - $entity + public function generateId( + EntityManagerInterface $entityManager, + ?object $entity ): string { return (string)Guidance::createV7(); } From a6f16c58b23383fec128a310e065d9455e41cb5d Mon Sep 17 00:00:00 2001 From: Tom Wright Date: Fri, 26 Apr 2024 14:44:27 +0000 Subject: [PATCH 4/4] Updated changelog Signed-off-by: Tom Wright --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9ffdf4..8fa43f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## v0.2.0 (2024-04-26) * Upgraded Doctrine to ORM 3 and DBAL 4 * Updated dependency list