Skip to content

Commit

Permalink
Merge branch 'release/v0.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
betterthanclay committed Apr 26, 2024
2 parents 9a0567c + a6f16c5 commit 2f95013
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## v0.1.2 (2024-04-24)
## v0.2.0 (2024-04-26)
* Upgraded Doctrine to ORM 3 and DBAL 4
* Updated dependency list

## v0.1.3 (2024-04-24)
* Updated Carbon dependency

## v0.1.2 (2023-12-12)
Expand Down
11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,24 @@
} ],
"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",
"doctrine/dbal": "^3.7",
"doctrine/orm": "^3",
"doctrine/dbal": "^4",
"doctrine/migrations": "^3.7"
},
"require-dev": {
"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"
},
Expand All @@ -50,7 +51,7 @@
},
"extra": {
"branch-alias": {
"dev-develop": "0.1.x-dev"
"dev-develop": "0.2.x-dev"
}
}
}
11 changes: 4 additions & 7 deletions src/Indoctrination/Generator/Uuid.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down

0 comments on commit 2f95013

Please sign in to comment.