Update dependencies

Also upgrade to doctrine 3

composer.json

@@ -9,7 +9,7 @@
  }
  },
  "require": {
- "php": "^8.2",
+ "php": "~8.2 || ~8.3",
  "ext-gd": "*",
  "ext-iconv": "*",
  "ext-readline": "*",
@@ -18,7 +18,7 @@
  "caseyamcl/configula": "^4.2",
  "cube43/slim-jwt-auth": "^6.0",
  "doctrine/annotations": "^1||^2",
- "doctrine/orm": "^2.9",
+ "doctrine/orm": "^3.1",
  "guzzlehttp/psr7": "^2.4",
  "james-heinrich/getid3": "^1.9",
  "jetbrains/phpstorm-attributes": "^1.0",

src/Bootstrap/Services.php

@@ -10,10 +10,12 @@
 use DateTimeInterface;
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Events;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\ORMSetup;
 use Doctrine\ORM\Tools\ResolveTargetEntityListener;
 use getID3;
@@ -105,6 +107,10 @@
  $ormConfig->setQueryCache($cacheProvider->getOrmQueryCache());
  $ormConfig->setResultCache($cacheProvider->getOrmResultCache());
 
+ $ormConfig->setIdentityGenerationPreferences([
+ PostgreSQLPlatform::class => ClassMetadata::GENERATOR_TYPE_SEQUENCE,
+ ]);
+
  return new EntityManager(
  DriverManager::getConnection(
  [

src/Orm/Repository/AlbumRepository.php

@@ -4,9 +4,11 @@
 
 namespace Uxmp\Core\Orm\Repository;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\Query\Parameter;
 use Generator;
 use Uxmp\Core\Orm\Model\Album;
 use Uxmp\Core\Orm\Model\AlbumInterface;
@@ -117,8 +119,8 @@ public function getFavorites(
  ?int $offset = null
  ): iterable {
  $parameter = [
- 'user' => $user,
- 'type' => FavoriteItemTypeEnum::ALBUM,
+ new Parameter('user', $user),
+ new Parameter('type', FavoriteItemTypeEnum::ALBUM),
  ];
 
  $qb = $this
@@ -137,7 +139,7 @@ public function getFavorites(
  if ($catalog !== null) {
  $andExpression->add($expressionBuilder->eq('a.catalog', ':catalog'));
 
- $parameter['catalog'] = $catalog;
+ $parameter[] = new Parameter('catalog', $catalog);
  }
 
  $qb
@@ -153,7 +155,7 @@ public function getFavorites(
  ->getDQL()
  )
  )
- ->setParameters($parameter)
+ ->setParameters(new ArrayCollection($parameter))
  ->orderBy('a.title', 'ASC')
  ->setMaxResults($limit)
  ->setFirstResult($offset);

src/Orm/Repository/GenreMapRepository.php

@@ -4,7 +4,9 @@
 
 namespace Uxmp\Core\Orm\Repository;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query\Parameter;
 use Uxmp\Core\Orm\Model\AlbumInterface;
 use Uxmp\Core\Orm\Model\GenreMap;
 use Uxmp\Core\Orm\Model\GenreMapEnum;
@@ -53,10 +55,10 @@ public function deleteByAlbum(AlbumInterface $album): void
  ->delete(GenreMap::class, 'gm')
  ->where('gm.mapped_item_type = :itemType')
  ->andWhere('gm.mapped_item_id = :itemId')
- ->setParameters([
- 'itemType' => GenreMapEnum::ALBUM,
- 'itemId' => $album->getId(),
- ])
+ ->setParameters(new ArrayCollection([
+ new Parameter('itemType', GenreMapEnum::ALBUM),
+ new Parameter('itemId', $album->getId()),
+ ]))
  ->getQuery()
  ->execute();
  }

src/Orm/Repository/GenreRepository.php

@@ -4,8 +4,10 @@
 
 namespace Uxmp\Core\Orm\Repository;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\Query\Parameter;
 use Generator;
 use Uxmp\Core\Orm\Model\Genre;
 use Uxmp\Core\Orm\Model\GenreInterface;
@@ -69,10 +71,10 @@ public function getGenreStatistics(): Generator
  Join::WITH,
  'c.genre_id = a.id AND c.mapped_item_type = :song_index_name'
  )
- ->setParameters([
- 'album_index_name' => GenreMapEnum::ALBUM,
- 'song_index_name' => GenreMapEnum::SONG,
- ])
+ ->setParameters(new ArrayCollection([
+ new Parameter('album_index_name', GenreMapEnum::ALBUM),
+ new Parameter('song_index_name', GenreMapEnum::SONG),
+ ]))
  ->groupBy('a.title')
  ->groupBy('a.id')
  ->having('COUNT(b.id) > 0')

src/Orm/Repository/SongRepository.php

@@ -4,7 +4,9 @@
 
 namespace Uxmp\Core\Orm\Repository;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query\Parameter;
 use Traversable;
 use Uxmp\Core\Orm\Model\ArtistInterface;
 use Uxmp\Core\Orm\Model\CatalogInterface;
@@ -61,8 +63,8 @@ public function findFavorites(
  ?CatalogInterface $catalog = null
  ): iterable {
  $parameter = [
- 'user' => $user,
- 'type' => FavoriteItemTypeEnum::SONG,
+ new Parameter('user', $user),
+ new Parameter('type', FavoriteItemTypeEnum::SONG),
  ];
 
  $qb = $this->createQueryBuilder('a');
@@ -77,7 +79,7 @@ public function findFavorites(
  if ($catalog !== null) {
  $andExpression->add($expressionBuilder->eq('a.catalog', ':catalog'));
 
- $parameter['catalog'] = $catalog;
+ $parameter[] = new Parameter('catalog', $catalog);
  }
 
  $qb
@@ -91,7 +93,7 @@ public function findFavorites(
  ->getDQL()
  )
  )
- ->setParameters($parameter)
+ ->setParameters(new ArrayCollection($parameter))
  ;
 
  return $qb->getQuery()->getResult();

tests/DoctrineTestHelperTrait.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Uxmp\Core;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Query\Parameter;
+use Mockery;
+use Mockery\Matcher\Closure;
+
+trait DoctrineTestHelperTrait
+{
+ /**
+ * @param list<Parameter> $expectedData
+ */
+ private function withOrmParams(array $expectedData): Closure
+ {
+ return Mockery::on(function (ArrayCollection $collection) use ($expectedData): bool {
+ $params = [];
+ foreach ($collection as $param) {
+ $params[$param->getName()] = $param->getValue();
+ }
+
+ return $params === $expectedData;
+ });
+ }
+}

tests/Orm/Repository/AlbumRepositoryTest.php

@@ -5,10 +5,10 @@
 namespace Uxmp\Core\Orm\Repository;
 
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\Query\Expr\Comparison;
@@ -19,6 +19,7 @@
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 use Mockery\MockInterface;
+use Uxmp\Core\DoctrineTestHelperTrait;
 use Uxmp\Core\Orm\Model\Album;
 use Uxmp\Core\Orm\Model\AlbumInterface;
 use Uxmp\Core\Orm\Model\Artist;
@@ -33,6 +34,8 @@
 
 class AlbumRepositoryTest extends MockeryTestCase
 {
+ use DoctrineTestHelperTrait;
+
  private EntityManagerInterface&MockInterface $entityManager;
 
  private ClassMetadata&MockInterface $classMetaData;
@@ -120,7 +123,7 @@ public function testDeleteDeletes(): void
  public function testFindEmptyAlbumsReturnsResult(): void
  {
  $catalog = Mockery::mock(CatalogInterface::class);
- $query = Mockery::mock(AbstractQuery::class);
+ $query = Mockery::mock(Query::class);
 
  $catalogId = 666;
  $result = [Mockery::mock(AlbumInterface::class)];
@@ -163,14 +166,14 @@ public function testGetFavoritesReturnsData(): void
  $qb = Mockery::mock(QueryBuilder::class);
  $qbSub = Mockery::mock(QueryBuilder::class);
  $expressionBuilder = Mockery::mock(Expr::class);
- $query = Mockery::mock(AbstractQuery::class);
+ $query = Mockery::mock(Query::class);
  $andExpression = Mockery::mock(Andx::class);
  $comparisonExpression = Mockery::mock(Comparison::class);
  $catalog = Mockery::mock(CatalogInterface::class);
+ $inExpression = $this->createMock(Func::class);
 
  $result = ['some-result'];
  $qbSubDql = 'some-dql';
- $inExpression = 'some-in-expression';
  $limit = 666;
  $offset = 42;
 
@@ -254,11 +257,11 @@ public function testGetFavoritesReturnsData(): void
  ->once()
  ->andReturnSelf();
  $qb->shouldReceive('setParameters')
- ->with([
+ ->with($this->withOrmParams([
  'user' => $user,
  'type' => FavoriteItemTypeEnum::ALBUM,
  'catalog' => $catalog,
- ])
+ ]))
  ->once()
  ->andReturnSelf();
  $qb->shouldReceive('getQuery')
@@ -287,7 +290,7 @@ public function testFindByGenreReturnsData(): void
  $equalExpression = Mockery::mock(Comparison::class);
  $inExpression = Mockery::mock(Func::class);
  $album = Mockery::mock(AlbumInterface::class);
- $query = Mockery::mock(AbstractQuery::class);
+ $query = Mockery::mock(Query::class);
 
  $subQueryBuilderDQL = 'some-dql';
  $limit = 666;
@@ -405,7 +408,7 @@ public function testGetListOrderedByArtistReturnsData(): void
 
  $album = Mockery::mock(AlbumInterface::class);
  $qb = Mockery::mock(QueryBuilder::class);
- $query = Mockery::mock(AbstractQuery::class);
+ $query = Mockery::mock(Query::class);
 
  $this->entityManager->shouldReceive('createQueryBuilder')
  ->withNoArgs()
@@ -476,7 +479,7 @@ public function testSearchReturnsData(): void
 
  $album = $this->createMock(AlbumInterface::class);
  $qb = $this->createMock(QueryBuilder::class);
- $query = $this->createMock(AbstractQuery::class);
+ $query = $this->createMock(Query::class);
  $expression = $this->createMock(Expr::class);
  $comparison = $this->createMock(Comparison::class);
 

tests/Orm/Repository/ArtistRepositoryTest.php

@@ -4,10 +4,10 @@
 
 namespace Uxmp\Core\Orm\Repository;
 
-use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Comparison;
 use Doctrine\ORM\QueryBuilder;
@@ -106,7 +106,7 @@ public function testFindByMbIdReturnsValue(): void
 
  public function testGetAllHavingNoRelationsReturnsArtists(): void
  {
- $query = Mockery::mock(AbstractQuery::class);
+ $query = Mockery::mock(Query::class);
  $artist = Mockery::mock(ArtistInterface::class);
 
  $this->entityManager->shouldReceive('createQuery')
@@ -139,7 +139,7 @@ public function testSearchReturnsData(): void
 
  $artist = $this->createMock(ArtistInterface::class);
  $qb = $this->createMock(QueryBuilder::class);
- $query = $this->createMock(AbstractQuery::class);
+ $query = $this->createMock(Query::class);
  $expression = $this->createMock(Expr::class);
  $comparison = $this->createMock(Comparison::class);
 

tests/Orm/Repository/DiscRepositoryTest.php

@@ -4,10 +4,10 @@
 
 namespace Uxmp\Core\Orm\Repository;
 
-use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\UnitOfWork;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
@@ -118,7 +118,7 @@ public function testFindUniqDiscReturnsValue(): void
 
  public function testFindEmptyDiscsReturnsData(): void
  {
- $query = Mockery::mock(AbstractQuery::class);
+ $query = Mockery::mock(Query::class);
  $result = [Mockery::mock(DiscInterface::class)];
  $catalog = Mockery::mock(CatalogInterface::class);
 

tests/Orm/Repository/GenreMapRepositoryTest.php

@@ -4,22 +4,25 @@
 
 namespace Uxmp\Core\Orm\Repository;
 
-use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\UnitOfWork;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 use Mockery\MockInterface;
+use Uxmp\Core\DoctrineTestHelperTrait;
 use Uxmp\Core\Orm\Model\AlbumInterface;
 use Uxmp\Core\Orm\Model\GenreMap;
 use Uxmp\Core\Orm\Model\GenreMapEnum;
 use Uxmp\Core\Orm\Model\GenreMapInterface;
 
 class GenreMapRepositoryTest extends MockeryTestCase
 {
+ use DoctrineTestHelperTrait;
+
  private EntityManagerInterface&MockInterface $entityManager;
 
  private ClassMetadata&MockInterface $classMetaData;
@@ -122,7 +125,7 @@ public function testDeleteByAlbumDeletes(): void
  {
  $queryBuilder = Mockery::mock(QueryBuilder::class);
  $album = Mockery::mock(AlbumInterface::class);
- $query = Mockery::mock(AbstractQuery::class);
+ $query = Mockery::mock(Query::class);
 
  $albumId = 666;
 
@@ -149,10 +152,10 @@ public function testDeleteByAlbumDeletes(): void
  ->once()
  ->andReturnSelf();
  $queryBuilder->shouldReceive('setParameters')
- ->with([
+ ->with($this->withOrmParams([
  'itemType' => GenreMapEnum::ALBUM,
  'itemId' => $albumId,
- ])
+ ]))
  ->once()
  ->andReturnSelf();
  $queryBuilder->shouldReceive('getQuery')