Skip to content

Commit d37aef1

Browse files
author
Jérôme Parmentier
committed
Fix compatibility with php-xapi/model:^2.0
1 parent 807509a commit d37aef1

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/Repository/StatementRepository.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
namespace XApi\Repository\Doctrine\Repository;
1313

14-
use Rhumsaa\Uuid\Uuid;
14+
use Rhumsaa\Uuid\Uuid as RhumsaaUuid;
1515
use Xabbuh\XApi\Common\Exception\NotFoundException;
1616
use Xabbuh\XApi\Model\Actor;
1717
use Xabbuh\XApi\Model\Statement;
1818
use Xabbuh\XApi\Model\StatementId;
1919
use Xabbuh\XApi\Model\StatementsFilter;
20+
use Xabbuh\XApi\Model\Uuid as ModelUuid;
2021
use XApi\Repository\Api\StatementRepositoryInterface;
2122
use XApi\Repository\Doctrine\Mapping\Statement as MappedStatement;
2223
use XApi\Repository\Doctrine\Repository\Mapping\StatementRepository as MappedStatementRepository;
@@ -114,7 +115,13 @@ final public function findStatementsBy(StatementsFilter $criteria, Actor $author
114115
final public function storeStatement(Statement $statement, $flush = true)
115116
{
116117
if (null === $statement->getId()) {
117-
$statement = $statement->withId(StatementId::fromUuid(Uuid::uuid4()));
118+
if (class_exists('Xabbuh\XApi\Model\Uuid')) {
119+
$uuid = ModelUuid::uuid4();
120+
} else {
121+
$uuid = RhumsaaUuid::uuid4();
122+
}
123+
124+
$statement = $statement->withId(StatementId::fromUuid($uuid));
118125
}
119126

120127
$mappedStatement = MappedStatement::fromModel($statement);

0 commit comments

Comments
 (0)