diff --git a/composer.json b/composer.json index 5c38462c4928a9c71f6d7f3320c43918495ab42c..9a44ded75a1a9062008a1e9a001f9be90fa1396e 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,7 @@ "require": { "php": "^8.3", "symfony/http-foundation": "^7.2.3", - "doctrine/orm": "^3.3.2", - "beberlei/doctrineextensions": "^1.5" + "doctrine/orm": "^3.3.2" }, "require-dev": { "phpunit/phpunit": "^12.0", diff --git a/tests/FilterByDateRangeTest.php b/tests/FilterByDateRangeTest.php index 114933cdea453a1ceb141908ec9b34af81a5796c..acb4a4b16ba4d6d19a4cd66884e8ced347958f74 100644 --- a/tests/FilterByDateRangeTest.php +++ b/tests/FilterByDateRangeTest.php @@ -225,7 +225,9 @@ class FilterByDateRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $result = $postRepository->createQueryByFilter([ + $this->expectException(FilterParameterValueIsNullException::class); + + $postRepository->createQueryByFilter([ 'createdAt' => DateRange::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -237,8 +239,6 @@ class FilterByDateRangeTest extends TestCase ])) ->getQuery() ->getResult(); - - $this->assertEmpty($result); } public function testFilterDateRangeWithDifferentKey(): void diff --git a/tests/FilterByDateTest.php b/tests/FilterByDateTest.php index 887fcf9abb27dab4220974de3d37ba899c2c2145..deba304fab9c0960d6f72f3640c9098badaa2571 100644 --- a/tests/FilterByDateTest.php +++ b/tests/FilterByDateTest.php @@ -95,7 +95,7 @@ class FilterByDateTest extends TestCase $this->assertEquals($date, current($result)->createdAt); } - public function testSuccessFilterDateRangeWithSeveralResults(): void + public function testSuccessFilterDateWithSeveralResults(): void { /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); @@ -194,7 +194,9 @@ class FilterByDateTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $result = $postRepository->createQueryByFilter([ + $this->expectException(FilterParameterValueIsNullException::class); + + $postRepository->createQueryByFilter([ 'createdAt' => Date::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -203,8 +205,6 @@ class FilterByDateTest extends TestCase ])) ->getQuery() ->getResult(); - - $this->assertEmpty($result); } public function testFilterDateWithDifferentKey(): void diff --git a/tests/TestCase.php b/tests/TestCase.php index bdb1212e22cda7d22582c4987c3a4dc8de224344..0e6331875ee581bc32b723da9722a6b738b20662 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -12,7 +12,6 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\ORMSetup; use Doctrine\ORM\Tools\SchemaTool; -use DoctrineExtensions\Query\Sqlite\StrfTime; use Faker\Factory; use Faker\Generator; use IQDEV\Packages\DoctrineHttpFilter\HttpFilterEntityRepository; @@ -60,7 +59,6 @@ abstract class TestCase extends BaseTestCase [__DIR__ . '/Entity'], true, ); - $config->addCustomStringFunction('strftime', StrfTime::class); $connection = DriverManager::getConnection([ 'driver' => 'pdo_sqlite',