Skip to content

Fix date filter tests with immutable dates #1727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dunglas merged 1 commit into from
Feb 23, 2018
Merged

Fix date filter tests with immutable dates #1727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions tests/Bridge/Doctrine/Orm/Filter/DateFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Dummy;
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyDate;
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyImmutableDate;
use Doctrine\Common\Persistence\ManagerRegistry;
use Doctrine\ORM\EntityRepository;
use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;

Expand All @@ -38,6 +34,11 @@ public function testApplyDate()
$this->doTestApplyDate(false);
}

public function testApplyDateImmutable()
{
$this->doTestApplyDateImmutable(false);
}

/**
* @group legacy
*/
Expand All @@ -46,6 +47,14 @@ public function testRequestApplyDate()
$this->doTestApplyDate(true);
}

/**
* @group legacy
*/
public function testRequestApplyDateImmutable()
{
$this->doTestApplyDateImmutable(true);
}

private function doTestApplyDate(bool $request)
{
$filters = ['dummyDate' => ['after' => '2015-04-05']];
Expand All @@ -65,26 +74,21 @@ private function doTestApplyDate(bool $request)
$this->assertInstanceOf(\DateTime::class, $queryBuilder->getParameters()[0]->getValue());
}

public function testApplyDateImmutable()
private function doTestApplyDateImmutable(bool $request)
{
$request = Request::create('/api/dummy_immutable_dates', 'GET', [
'dummyDate' => [
'after' => '2015-04-05',
],
]);
$requestStack = new RequestStack();
$requestStack->push($request);
$filters = ['dummyDate' => ['after' => '2015-04-05']];

$requestStack = null;
if ($request) {
$requestStack = new RequestStack();
$requestStack->push(Request::create('/api/dummy_immutable_dates', 'GET', $filters));
}

$queryBuilder = $this->repository->createQueryBuilder('o');

$filter = new DateFilter(
$this->managerRegistry,
$requestStack,
null,
['dummyDate' => null]
);
$filter = new DateFilter($this->managerRegistry, $requestStack, null, ['dummyDate' => null]);
$filter->apply($queryBuilder, new QueryNameGenerator(), DummyImmutableDate::class, null, $request ? [] : ['filters' => $filters]);

$filter->apply($queryBuilder, new QueryNameGenerator(), DummyImmutableDate::class);
$this->assertEquals(new \DateTimeImmutable('2015-04-05'), $queryBuilder->getParameters()[0]->getValue());
$this->assertInstanceOf(\DateTimeImmutable::class, $queryBuilder->getParameters()[0]->getValue());
}
Expand Down