Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)
This commit is contained in:
@@ -32,24 +32,14 @@ use Symfony\Component\Form\FormFactoryInterface;
|
||||
*/
|
||||
class BaseQueryTest extends TestCase
|
||||
{
|
||||
public function testQuery()
|
||||
public function testQuery(): void
|
||||
{
|
||||
$this->assertBaseQuery(new BaseQuery());
|
||||
$this->assertResetByFormError(new BaseQuery());
|
||||
$this->assertFilter(new BaseQuery());
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedDeprecation BaseQuery::getResultType() is deprecated and will be removed with 2.0
|
||||
* @group legacy
|
||||
*/
|
||||
public function testDeprecations()
|
||||
{
|
||||
$sut = new BaseQuery();
|
||||
$sut->getResultType();
|
||||
}
|
||||
|
||||
protected function assertResetByFormError(BaseQuery $sut, $orderBy = 'id', $order = 'ASC')
|
||||
protected function assertResetByFormError(BaseQuery $sut, $orderBy = 'id', $order = 'ASC'): void
|
||||
{
|
||||
$sut->setOrder('ASK');
|
||||
$sut->setOrderBy('foo');
|
||||
@@ -66,7 +56,7 @@ class BaseQueryTest extends TestCase
|
||||
self::assertNull($sut->getSearchTerm());
|
||||
}
|
||||
|
||||
protected function assertBaseQuery(BaseQuery $sut, $orderBy = 'id', $order = BaseQuery::ORDER_ASC)
|
||||
protected function assertBaseQuery(BaseQuery $sut, $orderBy = 'id', $order = BaseQuery::ORDER_ASC): void
|
||||
{
|
||||
$this->assertPage($sut);
|
||||
$this->assertPageSize($sut);
|
||||
@@ -76,12 +66,12 @@ class BaseQueryTest extends TestCase
|
||||
$this->assertBookmark($sut);
|
||||
}
|
||||
|
||||
private function getFormBuilder(string $name)
|
||||
private function getFormBuilder(string $name): FormBuilder
|
||||
{
|
||||
return new FormBuilder($name, null, new EventDispatcher(), $this->createMock(FormFactoryInterface::class), []);
|
||||
}
|
||||
|
||||
protected function resetByFormError(BaseQuery $sut, array $invalidFields)
|
||||
protected function resetByFormError(BaseQuery $sut, array $invalidFields): void
|
||||
{
|
||||
$formBuilder = $this->getFormBuilder('form');
|
||||
$formBuilder->setCompound(true);
|
||||
@@ -104,11 +94,11 @@ class BaseQueryTest extends TestCase
|
||||
$sut->resetByFormError($formErrors);
|
||||
}
|
||||
|
||||
protected function assertTeams(BaseQuery $sut)
|
||||
protected function assertTeams(BaseQuery $sut): void
|
||||
{
|
||||
self::assertEmpty($sut->getTeams());
|
||||
|
||||
self::assertInstanceOf(BaseQuery::class, $sut->addTeam(new Team()));
|
||||
self::assertInstanceOf(BaseQuery::class, $sut->addTeam(new Team('foo')));
|
||||
self::assertEquals(1, \count($sut->getTeams()));
|
||||
|
||||
$sut->setTeams(null);
|
||||
@@ -116,14 +106,14 @@ class BaseQueryTest extends TestCase
|
||||
$sut->setTeams([]);
|
||||
self::assertEmpty($sut->getTeams());
|
||||
|
||||
$team = new Team();
|
||||
$team = new Team('foo');
|
||||
self::assertInstanceOf(BaseQuery::class, $sut->setTeams([$team]));
|
||||
self::assertEquals(1, \count($sut->getTeams()));
|
||||
/* @phpstan-ignore-next-line */
|
||||
self::assertSame($team, $sut->getTeams()[0]);
|
||||
}
|
||||
|
||||
protected function assertFilter(BaseQuery $sut)
|
||||
protected function assertFilter(BaseQuery $sut): void
|
||||
{
|
||||
self::assertEquals(0, $sut->countFilter());
|
||||
$sut->setSearchTerm(new SearchTerm('sdfsdf'));
|
||||
@@ -153,7 +143,7 @@ class BaseQueryTest extends TestCase
|
||||
self::assertFalse($sut->isDefaultFilter('foo'));
|
||||
}
|
||||
|
||||
protected function assertBookmark(BaseQuery $sut)
|
||||
protected function assertBookmark(BaseQuery $sut): void
|
||||
{
|
||||
$bookmark = new Bookmark();
|
||||
self::assertNull($sut->getBookmark());
|
||||
@@ -166,7 +156,7 @@ class BaseQueryTest extends TestCase
|
||||
self::assertTrue($sut->isBookmarkSearch());
|
||||
}
|
||||
|
||||
protected function assertPage(BaseQuery $sut)
|
||||
protected function assertPage(BaseQuery $sut): void
|
||||
{
|
||||
self::assertEquals(1, $sut->getPage());
|
||||
|
||||
@@ -174,7 +164,7 @@ class BaseQueryTest extends TestCase
|
||||
self::assertEquals(42, $sut->getPage());
|
||||
}
|
||||
|
||||
protected function assertPageSize(BaseQuery $sut)
|
||||
protected function assertPageSize(BaseQuery $sut): void
|
||||
{
|
||||
self::assertEquals(BaseQuery::DEFAULT_PAGESIZE, $sut->getPageSize());
|
||||
|
||||
@@ -182,7 +172,7 @@ class BaseQueryTest extends TestCase
|
||||
self::assertEquals(100, $sut->getPageSize());
|
||||
}
|
||||
|
||||
protected function assertOrderBy(BaseQuery $sut, $column = 'id')
|
||||
protected function assertOrderBy(BaseQuery $sut, $column = 'id'): void
|
||||
{
|
||||
self::assertEquals($column, $sut->getOrderBy());
|
||||
|
||||
@@ -190,7 +180,7 @@ class BaseQueryTest extends TestCase
|
||||
self::assertEquals('foo', $sut->getOrderBy());
|
||||
}
|
||||
|
||||
protected function assertOrder(BaseQuery $sut, $order = BaseQuery::ORDER_ASC)
|
||||
protected function assertOrder(BaseQuery $sut, $order = BaseQuery::ORDER_ASC): void
|
||||
{
|
||||
self::assertEquals($order, $sut->getOrder());
|
||||
|
||||
@@ -204,7 +194,7 @@ class BaseQueryTest extends TestCase
|
||||
self::assertEquals(BaseQuery::ORDER_DESC, $sut->getOrder());
|
||||
}
|
||||
|
||||
protected function assertSearchTerm(BaseQuery $sut)
|
||||
protected function assertSearchTerm(BaseQuery $sut): void
|
||||
{
|
||||
self::assertNull($sut->getSearchTerm());
|
||||
|
||||
@@ -219,21 +209,14 @@ class BaseQueryTest extends TestCase
|
||||
self::assertSame($term, $sut->getSearchTerm());
|
||||
}
|
||||
|
||||
protected function assertActivity(TimesheetQuery $sut)
|
||||
protected function assertActivity(TimesheetQuery $sut): void
|
||||
{
|
||||
$this->assertNull($sut->getActivity());
|
||||
$this->assertEquals([], $sut->getActivities());
|
||||
$this->assertFalse($sut->hasActivities());
|
||||
|
||||
$expected = new Activity();
|
||||
$expected->setName('foo-bar');
|
||||
|
||||
$sut->setActivity($expected);
|
||||
$this->assertEquals($expected, $sut->getActivity());
|
||||
|
||||
$sut->setActivities([]);
|
||||
$this->assertEquals([], $sut->getActivities());
|
||||
|
||||
$sut->addActivity($expected);
|
||||
$this->assertEquals([$expected], $sut->getActivities());
|
||||
$this->assertTrue($sut->hasActivities());
|
||||
@@ -243,64 +226,79 @@ class BaseQueryTest extends TestCase
|
||||
|
||||
$sut->addActivity($expected2);
|
||||
$this->assertEquals([$expected, $expected2], $sut->getActivities());
|
||||
$this->assertEquals([], $sut->getActivityIds());
|
||||
|
||||
$sut->setActivity(null);
|
||||
$this->assertNull($sut->getActivity());
|
||||
$sut->setActivities([]);
|
||||
$this->assertEquals([], $sut->getActivities());
|
||||
$this->assertFalse($sut->hasActivities());
|
||||
|
||||
// make sure int is allowed as well
|
||||
$sut->setActivities([99]);
|
||||
$this->assertEquals(99, $sut->getActivity());
|
||||
$this->assertEquals([99], $sut->getActivities());
|
||||
$activity = $this->createMock(Activity::class);
|
||||
$activity->method('getId')->willReturn(13);
|
||||
$sut->addActivity($activity);
|
||||
|
||||
$activity = $this->createMock(Activity::class);
|
||||
$activity->method('getId')->willReturn(27);
|
||||
$sut->addActivity($activity);
|
||||
|
||||
$activity = $this->createMock(Activity::class);
|
||||
$activity->method('getId')->willReturn(null);
|
||||
$sut->addActivity($activity);
|
||||
|
||||
$activity = $this->createMock(Activity::class);
|
||||
$activity->method('getId')->willReturn(27);
|
||||
$sut->addActivity($activity);
|
||||
|
||||
$this->assertEquals([13, 27], $sut->getActivityIds());
|
||||
}
|
||||
|
||||
protected function assertCustomer(ProjectQuery $sut)
|
||||
protected function assertCustomer(ProjectQuery $sut): void
|
||||
{
|
||||
$this->assertNull($sut->getCustomer());
|
||||
$this->assertEquals([], $sut->getCustomers());
|
||||
$this->assertFalse($sut->hasCustomers());
|
||||
|
||||
$expected = new Customer();
|
||||
$expected->setName('foo-bar');
|
||||
|
||||
$sut->setCustomer($expected);
|
||||
$this->assertEquals($expected, $sut->getCustomer());
|
||||
|
||||
$sut->setCustomers([]);
|
||||
$this->assertEquals([], $sut->getCustomers());
|
||||
$expected = new Customer('foo-bar');
|
||||
|
||||
$sut->addCustomer($expected);
|
||||
$this->assertEquals([$expected], $sut->getCustomers());
|
||||
$this->assertTrue($sut->hasCustomers());
|
||||
|
||||
$expected2 = new Customer();
|
||||
$expected2->setName('foo-bar2');
|
||||
$expected2 = new Customer('foo-bar2');
|
||||
|
||||
$sut->addCustomer($expected2);
|
||||
$this->assertEquals([$expected, $expected2], $sut->getCustomers());
|
||||
$this->assertEquals([], $sut->getCustomerIds());
|
||||
|
||||
$sut->setCustomer(null);
|
||||
$this->assertNull($sut->getCustomer());
|
||||
$sut->setCustomers([]);
|
||||
$this->assertEquals([], $sut->getCustomers());
|
||||
$this->assertFalse($sut->hasCustomers());
|
||||
|
||||
// make sure int is allowed as well
|
||||
$sut->setCustomers([99]);
|
||||
$this->assertEquals(99, $sut->getCustomer());
|
||||
$this->assertEquals([99], $sut->getCustomers());
|
||||
$customer = $this->createMock(Customer::class);
|
||||
$customer->method('getId')->willReturn(13);
|
||||
$sut->addCustomer($customer);
|
||||
|
||||
$customer = $this->createMock(Customer::class);
|
||||
$customer->method('getId')->willReturn(27);
|
||||
$sut->addCustomer($customer);
|
||||
|
||||
$customer = $this->createMock(Customer::class);
|
||||
$customer->method('getId')->willReturn(null);
|
||||
$sut->addCustomer($customer);
|
||||
|
||||
$customer = $this->createMock(Customer::class);
|
||||
$customer->method('getId')->willReturn(27);
|
||||
$sut->addCustomer($customer);
|
||||
|
||||
$this->assertEquals([13, 27], $sut->getCustomerIds());
|
||||
}
|
||||
|
||||
protected function assertProject(ActivityQuery $sut)
|
||||
protected function assertProject(ActivityQuery $sut): void
|
||||
{
|
||||
$this->assertNull($sut->getProject());
|
||||
$this->assertEquals([], $sut->getProjects());
|
||||
$this->assertFalse($sut->hasProjects());
|
||||
|
||||
$expected = new Project();
|
||||
$expected->setName('foo-bar');
|
||||
|
||||
$sut->setProject($expected);
|
||||
$this->assertEquals($expected, $sut->getProject());
|
||||
|
||||
$sut->setProjects([]);
|
||||
$this->assertEquals([], $sut->getProjects());
|
||||
|
||||
@@ -313,18 +311,31 @@ class BaseQueryTest extends TestCase
|
||||
|
||||
$sut->addProject($expected2);
|
||||
$this->assertEquals([$expected, $expected2], $sut->getProjects());
|
||||
$this->assertEquals([], $sut->getProjectIds());
|
||||
|
||||
$sut->setProject(null);
|
||||
$this->assertNull($sut->getProject());
|
||||
$sut->setProjects([]);
|
||||
$this->assertFalse($sut->hasProjects());
|
||||
|
||||
// make sure int is allowed as well
|
||||
$sut->setProjects([99]);
|
||||
$this->assertEquals(99, $sut->getProject());
|
||||
$this->assertEquals([99], $sut->getProjects());
|
||||
$project = $this->createMock(Project::class);
|
||||
$project->method('getId')->willReturn(13);
|
||||
$sut->addProject($project);
|
||||
|
||||
$project = $this->createMock(Project::class);
|
||||
$project->method('getId')->willReturn(27);
|
||||
$sut->addProject($project);
|
||||
|
||||
$project = $this->createMock(Project::class);
|
||||
$project->method('getId')->willReturn(null);
|
||||
$sut->addProject($project);
|
||||
|
||||
$project = $this->createMock(Project::class);
|
||||
$project->method('getId')->willReturn(27);
|
||||
$sut->addProject($project);
|
||||
|
||||
$this->assertEquals([13, 27], $sut->getProjectIds());
|
||||
}
|
||||
|
||||
protected function assertDateRangeTrait($sut)
|
||||
protected function assertDateRangeTrait($sut): void
|
||||
{
|
||||
self::assertNull($sut->getBegin());
|
||||
self::assertNull($sut->getEnd());
|
||||
|
||||
Reference in New Issue
Block a user