Code improvements (#1649)

* use global namespace for faster lookups
* phpstan level 5
This commit is contained in:
Kevin Papst
2020-04-19 14:37:14 +02:00
committed by GitHub
parent 7b25e9acaf
commit 0f3fa8fdbe
183 changed files with 604 additions and 574 deletions

View File

@@ -22,10 +22,10 @@ class AboutControllerTest extends ControllerBaseTest
$this->assertAccessIsGranted($client, '/about');
$result = $client->getCrawler()->filter('ul.nav.nav-stacked li a');
$this->assertEquals(4, count($result));
$this->assertEquals(4, \count($result));
$result = $client->getCrawler()->filter('div.box-body pre');
$this->assertEquals(1, count($result));
$this->assertEquals(1, \count($result));
$this->assertStringContainsString('MIT License', $result->text(null, true));
}
}

View File

@@ -54,7 +54,7 @@ class ActivityControllerTest extends ControllerBaseTest
$activity->setMetaField((new ActivityMeta())->setName('location')->setValue('homeoffice'));
$activity->setMetaField((new ActivityMeta())->setName('feature')->setValue('timetracking'));
});
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/activity/');
@@ -82,14 +82,14 @@ class ActivityControllerTest extends ControllerBaseTest
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setActivities($em->getRepository(Activity::class)->findAll());
$fixture->setUser($this->getUserByRole($em, User::ROLE_ADMIN));
$this->importFixture($client, $fixture);
$fixture->setUser($this->getUserByRole(User::ROLE_ADMIN));
$this->importFixture($fixture);
$project = $em->getRepository(Project::class)->find(1);
$fixture = new ActivityFixtures();
$fixture->setAmount(6); // to trigger a second page
$fixture->setProjects([$project]);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/activity/1/details');
self::assertHasProgressbar($client);
@@ -165,7 +165,7 @@ class ActivityControllerTest extends ControllerBaseTest
$fixture = new ProjectFixtures();
$fixture->setAmount(10);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/activity/create');
$form = $client->getCrawler()->filter('form[name=activity_edit_form]')->form();
@@ -262,12 +262,12 @@ class ActivityControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setAmount(10);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$timesheets = $em->getRepository(Timesheet::class)->findAll();
$this->assertEquals(10, count($timesheets));
$this->assertEquals(10, \count($timesheets));
/** @var Timesheet $entry */
foreach ($timesheets as $entry) {
@@ -303,15 +303,15 @@ class ActivityControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setAmount(10);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$fixture = new ActivityFixtures();
$fixture->setAmount(1)->setIsGlobal(true)->setIsVisible(true);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$timesheets = $em->getRepository(Timesheet::class)->findAll();
$this->assertEquals(10, count($timesheets));
$this->assertEquals(10, \count($timesheets));
/** @var Timesheet $entry */
foreach ($timesheets as $entry) {
@@ -335,7 +335,7 @@ class ActivityControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
$timesheets = $em->getRepository(Timesheet::class)->findAll();
$this->assertEquals(10, count($timesheets));
$this->assertEquals(10, \count($timesheets));
/** @var Timesheet $entry */
foreach ($timesheets as $entry) {

View File

@@ -214,7 +214,7 @@ abstract class ControllerBaseTest extends WebTestCase
self::assertEquals($expectedUrl, $element->getAttribute('href'));
}
self::assertEquals(count($buttons), $node->count(), 'Invalid amount of page actions');
self::assertEquals(\count($buttons), $node->count(), 'Invalid amount of page actions');
}
/**
@@ -239,9 +239,9 @@ abstract class ControllerBaseTest extends WebTestCase
$validationErrors = $submittedForm->filter('li.text-danger');
self::assertEquals(
count($fieldNames),
count($validationErrors),
sprintf('Expected %s validation errors, found %s', count($fieldNames), count($validationErrors))
\count($fieldNames),
\count($validationErrors),
sprintf('Expected %s validation errors, found %s', \count($fieldNames), \count($validationErrors))
);
foreach ($fieldNames as $name) {
@@ -251,7 +251,7 @@ abstract class ControllerBaseTest extends WebTestCase
self::assertNotNull($list, 'Form field has no validation message: ' . $name);
$validation = $list->filter('li.text-danger');
if (count($validation) < 1) {
if (\count($validation) < 1) {
// decorated form fields with icon have a different html structure, see kimai-theme.html.twig
/** @var \DOMElement $listMsg */
$listMsg = $field->parents()->getNode(1);

View File

@@ -55,7 +55,7 @@ class CustomerControllerTest extends ControllerBaseTest
$customer->setMetaField((new CustomerMeta())->setName('location')->setValue('homeoffice'));
$customer->setMetaField((new CustomerMeta())->setName('feature')->setValue('timetracking'));
});
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/customer/');
@@ -209,7 +209,7 @@ class CustomerControllerTest extends ControllerBaseTest
$fixture = new ProjectFixtures();
$fixture->setAmount(9); // to trigger a second page (every third activity is hidden)
$fixture->setCustomers([$customer]);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/customer/1/projects/1');
@@ -289,7 +289,7 @@ class CustomerControllerTest extends ControllerBaseTest
$fixture = new TeamFixtures();
$fixture->setAmount(2);
$fixture->setAddCustomer(false);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/customer/1/permissions');
$form = $client->getCrawler()->filter('form[name=customer_team_permission_form]')->form();
@@ -316,7 +316,7 @@ class CustomerControllerTest extends ControllerBaseTest
$fixture = new CustomerFixtures();
$fixture->setAmount(1);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/admin/customer/2/edit');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -341,12 +341,12 @@ class CustomerControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setAmount(10);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$timesheets = $em->getRepository(Timesheet::class)->findAll();
$this->assertEquals(10, count($timesheets));
$this->assertEquals(10, \count($timesheets));
/** @var Timesheet $entry */
foreach ($timesheets as $entry) {
@@ -380,15 +380,15 @@ class CustomerControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setAmount(10);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$fixture = new CustomerFixtures();
$fixture->setAmount(1)->setIsVisible(true);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$timesheets = $em->getRepository(Timesheet::class)->findAll();
$this->assertEquals(10, count($timesheets));
$this->assertEquals(10, \count($timesheets));
/** @var Timesheet $entry */
foreach ($timesheets as $entry) {
@@ -412,7 +412,7 @@ class CustomerControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
$timesheets = $em->getRepository(Timesheet::class)->findAll();
$this->assertEquals(10, count($timesheets));
$this->assertEquals(10, \count($timesheets));
/** @var Timesheet $entry */
foreach ($timesheets as $entry) {

View File

@@ -32,6 +32,6 @@ class DoctorControllerTest extends ControllerBaseTest
$this->assertAccessIsGranted($client, '/doctor');
$result = $client->getCrawler()->filter('.content .box-header');
$this->assertEquals(7, count($result));
$this->assertEquals(7, \count($result));
}
}

View File

@@ -45,8 +45,8 @@ class ExportControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
$em = $this->getEntityManager();
$teamlead = $this->getUserByRole($em, User::ROLE_TEAMLEAD);
$user = $this->getUserByRole($em, User::ROLE_USER);
$teamlead = $this->getUserByRole(User::ROLE_TEAMLEAD);
$user = $this->getUserByRole(User::ROLE_USER);
/** @var Team $team */
$team = new Team();
$team->setName('fooo');
@@ -57,7 +57,7 @@ class ExportControllerTest extends ControllerBaseTest
$em->persist($teamlead);
$em->flush();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$begin = new \DateTime('first day of this month');
$fixture = new TimesheetFixtures();
@@ -70,9 +70,9 @@ class ExportControllerTest extends ControllerBaseTest
$em->persist($team);
})
;
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$teamlead = $this->getUserByRole($em, User::ROLE_TEAMLEAD);
$teamlead = $this->getUserByRole(User::ROLE_TEAMLEAD);
$fixture = new TimesheetFixtures();
$fixture
@@ -80,7 +80,7 @@ class ExportControllerTest extends ControllerBaseTest
->setAmount(2)
->setStartDate($begin)
;
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$em->flush();
$this->request($client, '/export/?preview=');
@@ -94,7 +94,7 @@ class ExportControllerTest extends ControllerBaseTest
// assert export type buttons are available
$expected = ['csv', 'default.html.twig', 'default-budget.pdf.twig', 'default-internal.pdf.twig', 'default.pdf.twig', 'xlsx'];
$node = $client->getCrawler()->filter('#export-buttons .startExportBtn');
$this->assertEquals(count($expected), $node->count());
$this->assertEquals(\count($expected), $node->count());
/** @var \DOMElement $button */
foreach ($node->getIterator() as $button) {
$type = $button->getAttribute('data-type');
@@ -108,7 +108,7 @@ class ExportControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$begin = new \DateTime('first day of this month');
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
// these should be ignored, becuase teamlead and user do NOT share a team!
$fixture = new TimesheetFixtures();
@@ -117,7 +117,7 @@ class ExportControllerTest extends ControllerBaseTest
->setAmount(20)
->setStartDate($begin)
;
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/export/?preview=');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -125,7 +125,7 @@ class ExportControllerTest extends ControllerBaseTest
// make sure all existing records are displayed
$this->assertHasNoEntriesWithFilter($client);
$teamlead = $this->getUserByRole($em, User::ROLE_TEAMLEAD);
$teamlead = $this->getUserByRole(User::ROLE_TEAMLEAD);
$fixture = new TimesheetFixtures();
$fixture
@@ -133,7 +133,7 @@ class ExportControllerTest extends ControllerBaseTest
->setAmount(2)
->setStartDate($begin)
;
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/export/?preview=');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -146,7 +146,7 @@ class ExportControllerTest extends ControllerBaseTest
// assert export type buttons are available
$expected = ['csv', 'default.html.twig', 'default-budget.pdf.twig', 'default-internal.pdf.twig', 'default.pdf.twig', 'xlsx'];
$node = $client->getCrawler()->filter('#export-buttons .startExportBtn');
$this->assertEquals(count($expected), $node->count());
$this->assertEquals(\count($expected), $node->count());
/** @var \DOMElement $button */
foreach ($node->getIterator() as $button) {
$type = $button->getAttribute('data-type');
@@ -196,11 +196,11 @@ class ExportControllerTest extends ControllerBaseTest
$begin = new \DateTime('first day of this month');
$fixture = new TimesheetFixtures();
$fixture
->setUser($this->getUserByRole($em, User::ROLE_USER))
->setUser($this->getUserByRole(User::ROLE_USER))
->setAmount(20)
->setStartDate($begin)
;
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/export/');
$this->assertTrue($client->getResponse()->isSuccessful());

View File

@@ -36,7 +36,7 @@ class HomepageControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$pref = (new UserPreference())
->setName('login.initial_view')

View File

@@ -70,7 +70,7 @@ class InvoiceControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/invoice/?preview=');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -83,7 +83,7 @@ class InvoiceControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/invoice/template');
@@ -120,7 +120,7 @@ class InvoiceControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
/** @var InvoiceTemplate $template */
$template = $em->getRepository(InvoiceTemplate::class)->find(1);
@@ -148,17 +148,17 @@ class InvoiceControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$begin = new \DateTime('first day of this month');
$end = new \DateTime('last day of this month');
$fixture = new TimesheetFixtures();
$fixture
->setUser($this->getUserByRole($em, User::ROLE_TEAMLEAD))
->setUser($this->getUserByRole(User::ROLE_TEAMLEAD))
->setAmount(20)
->setStartDate($begin)
;
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/invoice/');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -214,17 +214,17 @@ class InvoiceControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$begin = new \DateTime('first day of this month');
$end = new \DateTime('last day of this month');
$fixture = new TimesheetFixtures();
$fixture
->setUser($this->getUserByRole($em, User::ROLE_TEAMLEAD))
->setUser($this->getUserByRole(User::ROLE_TEAMLEAD))
->setAmount(20)
->setStartDate($begin)
;
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/invoice/');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -273,17 +273,17 @@ class InvoiceControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$begin = new \DateTime('first day of this month');
$end = new \DateTime('last day of this month');
$fixture = new TimesheetFixtures();
$fixture
->setUser($this->getUserByRole($em, User::ROLE_ADMIN))
->setUser($this->getUserByRole(User::ROLE_ADMIN))
->setAmount(20)
->setStartDate($begin)
;
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/invoice/');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -357,7 +357,7 @@ class InvoiceControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/invoice/template/1/edit?page=1');
$form = $client->getCrawler()->filter('form[name=invoice_template_form]')->form();
@@ -384,7 +384,7 @@ class InvoiceControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/invoice/template/1/delete');
$this->assertIsRedirect($client, '/invoice/template');
@@ -402,7 +402,7 @@ class InvoiceControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/invoice/document_upload');
$this->assertTrue($client->getResponse()->isSuccessful());

View File

@@ -22,7 +22,7 @@ class LayoutControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->request($client, '/dashboard/');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -78,7 +78,7 @@ class LayoutControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->request($client, '/layou/active_entries');
$this->assertTrue($client->getResponse()->isSuccessful());

View File

@@ -160,7 +160,7 @@ class PermissionControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$rolePermissions = $em->getRepository(RolePermission::class)->findAll();
$this->assertEquals(0, count($rolePermissions));
$this->assertEquals(0, \count($rolePermissions));
// create the permission
$this->request($client, '/admin/permissions/roles/1/view_user/1');
@@ -168,7 +168,7 @@ class PermissionControllerTest extends ControllerBaseTest
$client->followRedirect();
$rolePermissions = $em->getRepository(RolePermission::class)->findAll();
$this->assertEquals(1, count($rolePermissions));
$this->assertEquals(1, \count($rolePermissions));
$permission = $rolePermissions[0];
self::assertInstanceOf(RolePermission::class, $permission);
self::assertEquals('view_user', $permission->getPermission());
@@ -185,7 +185,7 @@ class PermissionControllerTest extends ControllerBaseTest
$client->followRedirect();
$rolePermissions = $em->getRepository(RolePermission::class)->findAll();
$this->assertEquals(1, count($rolePermissions));
$this->assertEquals(1, \count($rolePermissions));
$permission = $rolePermissions[0];
self::assertInstanceOf(RolePermission::class, $permission);
self::assertEquals('view_user', $permission->getPermission());

View File

@@ -53,9 +53,9 @@ class ProfileControllerTest extends ControllerBaseTest
foreach ($dates as $start) {
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setStartDate($start);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
}
$this->request($client, '/profile/' . UserFixtures::USERNAME_USER);
@@ -111,7 +111,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$tabs = $client->getCrawler()->filter('div.nav-tabs-custom ul.nav-tabs li');
$this->assertEquals(count($expectedTabs), $tabs->count());
$this->assertEquals(\count($expectedTabs), $tabs->count());
$foundTabs = [];
/** @var \DOMElement $tab */
@@ -135,7 +135,7 @@ class ProfileControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->assertEquals(UserFixtures::USERNAME_USER, $user->getUsername());
$this->assertEquals('John Doe', $user->getAlias());
@@ -161,7 +161,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->assertEquals(UserFixtures::USERNAME_USER, $user->getUsername());
$this->assertEquals('Johnny', $user->getAlias());
@@ -194,7 +194,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->assertEquals(UserFixtures::USERNAME_USER, $user->getUsername());
$this->assertEquals('Johnny', $user->getAlias());
@@ -211,7 +211,7 @@ class ProfileControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
/** @var EncoderFactoryInterface $passwordEncoder */
$passwordEncoder = static::$kernel->getContainer()->get('test.PasswordEncoder');
@@ -237,7 +237,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->assertFalse($passwordEncoder->getEncoder($user)->isPasswordValid($user->getPassword(), UserFixtures::DEFAULT_PASSWORD, $user->getSalt()));
$this->assertTrue($passwordEncoder->getEncoder($user)->isPasswordValid($user->getPassword(), 'test1234', $user->getSalt()));
@@ -250,7 +250,7 @@ class ProfileControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
/** @var EncoderFactoryInterface $passwordEncoder */
$passwordEncoder = static::$kernel->getContainer()->get('test.PasswordEncoder');
@@ -275,7 +275,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->assertFalse($passwordEncoder->getEncoder($user)->isPasswordValid($user->getApiToken(), UserFixtures::DEFAULT_API_TOKEN, $user->getSalt()));
$this->assertTrue($passwordEncoder->getEncoder($user)->isPasswordValid($user->getApiToken(), 'test123', $user->getSalt()));
@@ -295,7 +295,7 @@ class ProfileControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->assertEquals(['ROLE_USER'], $user->getRoles());
@@ -314,7 +314,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->assertEquals(['ROLE_TEAMLEAD', 'ROLE_SUPER_ADMIN', 'ROLE_USER'], $user->getRoles());
}
@@ -335,19 +335,19 @@ class ProfileControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$fixture = new TeamFixtures();
$fixture->setAmount(3);
$fixture->setAddCustomer(true);
$fixture->setAddUser(false);
$fixture->addUserToIgnore($user);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/profile/' . UserFixtures::USERNAME_USER . '/teams');
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->assertEquals([], $user->getTeams()->toArray());
$form = $client->getCrawler()->filter('form[name=user_teams]')->form();
@@ -364,7 +364,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$this->assertEquals(1, $user->getTeams()->count());
}

View File

@@ -62,7 +62,7 @@ class ProjectControllerTest extends ControllerBaseTest
$project->setMetaField((new ProjectMeta())->setName('location')->setValue('homeoffice'));
$project->setMetaField((new ProjectMeta())->setName('feature')->setValue('timetracking'));
});
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/project/');
@@ -91,14 +91,14 @@ class ProjectControllerTest extends ControllerBaseTest
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setProjects([$project]);
$fixture->setUser($this->getUserByRole($em, User::ROLE_ADMIN));
$this->importFixture($client, $fixture);
$fixture->setUser($this->getUserByRole(User::ROLE_ADMIN));
$this->importFixture($fixture);
$project = $em->getRepository(Project::class)->find(1);
$fixture = new ActivityFixtures();
$fixture->setAmount(6); // to trigger a second page
$fixture->setProjects([$project]);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/project/1/details');
self::assertHasProgressbar($client);
@@ -154,7 +154,7 @@ class ProjectControllerTest extends ControllerBaseTest
$project->setEnd(new \DateTime());
$em->persist($project);
$team = new Team();
$team->setTeamLead($this->getUserByRole($em, User::ROLE_ADMIN));
$team->setTeamLead($this->getUserByRole(User::ROLE_ADMIN));
$team->addProject($project);
$team->setName('project 1');
$em->persist($team);
@@ -275,7 +275,7 @@ class ProjectControllerTest extends ControllerBaseTest
$fixture = new ActivityFixtures();
$fixture->setAmount(9); // to trigger a second page (every third activity is hidden)
$fixture->setProjects([$project]);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/project/1/activities/1');
@@ -321,7 +321,7 @@ class ProjectControllerTest extends ControllerBaseTest
$fixture = new CustomerFixtures();
$fixture->setAmount(10);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/project/create');
$form = $client->getCrawler()->filter('form[name=project_edit_form]')->form();
@@ -377,7 +377,7 @@ class ProjectControllerTest extends ControllerBaseTest
$fixture = new TeamFixtures();
$fixture->setAmount(2);
$fixture->setAddCustomer(false);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/project/1/permissions');
$form = $client->getCrawler()->filter('form[name=project_team_permission_form]')->form();
@@ -404,7 +404,7 @@ class ProjectControllerTest extends ControllerBaseTest
$fixture = new ProjectFixtures();
$fixture->setAmount(1);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$this->request($client, '/admin/project/2/edit');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -429,12 +429,12 @@ class ProjectControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setAmount(10);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$timesheets = $em->getRepository(Timesheet::class)->findAll();
$this->assertEquals(10, count($timesheets));
$this->assertEquals(10, \count($timesheets));
/** @var Timesheet $entry */
foreach ($timesheets as $entry) {
@@ -468,15 +468,15 @@ class ProjectControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setAmount(10);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$fixture = new ProjectFixtures();
$fixture->setAmount(1)->setIsVisible(true);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$timesheets = $em->getRepository(Timesheet::class)->findAll();
$this->assertEquals(10, count($timesheets));
$this->assertEquals(10, \count($timesheets));
/** @var Timesheet $entry */
foreach ($timesheets as $entry) {
@@ -500,7 +500,7 @@ class ProjectControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
$timesheets = $em->getRepository(Timesheet::class)->findAll();
$this->assertEquals(10, count($timesheets));
$this->assertEquals(10, \count($timesheets));
/** @var Timesheet $entry */
foreach ($timesheets as $entry) {

View File

@@ -35,14 +35,14 @@ class SystemConfigurationControllerTest extends ControllerBaseTest
$expectedForms = $this->getTestDataForms();
$result = $client->getCrawler()->filter('section.content div.box.box-primary');
$this->assertEquals(count($expectedForms), count($result));
$this->assertEquals(\count($expectedForms), \count($result));
$result = $client->getCrawler()->filter('section.content div.box.box-primary form');
$this->assertEquals(count($expectedForms), count($result));
$this->assertEquals(\count($expectedForms), \count($result));
foreach ($expectedForms as $formConfig) {
$result = $client->getCrawler()->filter($formConfig[0]);
$this->assertEquals(1, count($result));
$this->assertEquals(1, \count($result));
$form = $result->form();
$this->assertStringEndsWith($formConfig[1], $form->getUri());
$this->assertEquals('POST', $form->getMethod());
@@ -57,13 +57,13 @@ class SystemConfigurationControllerTest extends ControllerBaseTest
$expectedForms = $this->getTestDataForms();
$result = $client->getCrawler()->filter('section.content div.box.box-primary');
$this->assertEquals(1, count($result));
$this->assertEquals(1, \count($result));
$result = $client->getCrawler()->filter('section.content div.box.box-primary form');
$this->assertEquals(1, count($result));
$this->assertEquals(1, \count($result));
$result = $client->getCrawler()->filter('form[name=system_configuration_form_timesheet]');
$this->assertEquals(1, count($result));
$this->assertEquals(1, \count($result));
$form = $result->form();
$this->assertEquals('POST', $form->getMethod());
}

View File

@@ -26,7 +26,7 @@ class TagControllerTest extends ControllerBaseTest
$fixture = new TagFixtures();
$fixture->setTagArray($tagList);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
}
public function testIsSecure()

View File

@@ -37,7 +37,7 @@ class TeamControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TeamFixtures();
$fixture->setAmount(5);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/teams/');
$this->assertPageActions($client, [
@@ -58,7 +58,7 @@ class TeamControllerTest extends ControllerBaseTest
$fixture->setCallback(function (Team $team) {
$team->setName($team->getName() . '- fantastic team with foooo bar magic');
});
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/teams/');
@@ -109,7 +109,7 @@ class TeamControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TeamFixtures();
$fixture->setAmount(2);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/teams/1/edit');
$form = $client->getCrawler()->filter('form[name=team_edit_form]')->form();
@@ -132,7 +132,7 @@ class TeamControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TeamFixtures();
$fixture->setAmount(2);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/admin/teams/1/edit_member');
$form = $client->getCrawler()->filter('form[name=team_edit_form]')->form();
@@ -158,10 +158,10 @@ class TeamControllerTest extends ControllerBaseTest
$fixture = new TeamFixtures();
$fixture->setAmount(2);
$fixture->setAddCustomer(false);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$team = $em->getRepository(Team::class)->find(1);
self::assertEquals(0, count($team->getCustomers()));
self::assertEquals(0, \count($team->getCustomers()));
$this->assertAccessIsGranted($client, '/admin/teams/1/edit');
$form = $client->getCrawler()->filter('form[name=team_customer_form]')->form();
@@ -174,7 +174,7 @@ class TeamControllerTest extends ControllerBaseTest
$this->assertIsRedirect($client, $this->createUrl('/admin/teams/1/edit'));
$team = $em->getRepository(Team::class)->find(1);
self::assertEquals(1, count($team->getCustomers()));
self::assertEquals(1, \count($team->getCustomers()));
}
public function testEditProjectAccessAction()
@@ -187,10 +187,10 @@ class TeamControllerTest extends ControllerBaseTest
$fixture = new TeamFixtures();
$fixture->setAmount(2);
$fixture->setAddCustomer(false);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$team = $em->getRepository(Team::class)->find(1);
self::assertEquals(0, count($team->getProjects()));
self::assertEquals(0, \count($team->getProjects()));
$this->assertAccessIsGranted($client, '/admin/teams/1/edit');
$form = $client->getCrawler()->filter('form[name=team_project_form]')->form();
@@ -203,6 +203,6 @@ class TeamControllerTest extends ControllerBaseTest
$this->assertIsRedirect($client, $this->createUrl('/admin/teams/1/edit'));
$team = $em->getRepository(Team::class)->find(1);
self::assertEquals(1, count($team->getProjects()));
self::assertEquals(1, \count($team->getProjects()));
}
}

View File

@@ -55,9 +55,9 @@ class TimesheetControllerTest extends ControllerBaseTest
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setAmountRunning(2);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setStartDate($start);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->request($client, '/timesheet/');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -91,20 +91,20 @@ class TimesheetControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setStartDate($start);
$fixture->setCallback(function (Timesheet $timesheet) {
$timesheet->setDescription('I am a foobar with tralalalala some more content');
$timesheet->setMetaField((new TimesheetMeta())->setName('location')->setValue('homeoffice'));
$timesheet->setMetaField((new TimesheetMeta())->setName('feature')->setValue('timetracking'));
});
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setAmountRunning(5);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setStartDate($start);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->request($client, '/timesheet/');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -128,9 +128,9 @@ class TimesheetControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setStartDate(new \DateTime('-10 days'));
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->request($client, '/timesheet/');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -154,7 +154,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->assertEquals('invoice_print', $body->getAttribute('class'));
$result = $node->filter('section.invoice table.table tbody tr');
$this->assertEquals(5, count($result));
$this->assertEquals(5, \count($result));
}
public function testCreateAction()
@@ -293,9 +293,9 @@ class TimesheetControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setStartDate('2017-05-01');
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->request($client, '/timesheet/1/edit');
@@ -332,11 +332,11 @@ class TimesheetControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setUser($user);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/timesheet/');
@@ -371,11 +371,11 @@ class TimesheetControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_SUPER_ADMIN);
$user = $this->getUserByRole(User::ROLE_SUPER_ADMIN);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setUser($user);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/timesheet/');

View File

@@ -59,13 +59,13 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$start = new \DateTime('first day of this month');
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setAmountRunning(3);
$fixture->setUser($user);
$fixture->setStartDate($start);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->request($client, '/team/timesheet/');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -98,20 +98,20 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setStartDate($start);
$fixture->setCallback(function (Timesheet $timesheet) {
$timesheet->setDescription('I am a foobar with tralalalala some more content');
$timesheet->setMetaField((new TimesheetMeta())->setName('location')->setValue('homeoffice'));
$timesheet->setMetaField((new TimesheetMeta())->setName('feature')->setValue('timetracking'));
});
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setAmountRunning(5);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setStartDate($start);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->request($client, '/team/timesheet/');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -135,14 +135,14 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(7);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setStartDate(new \DateTime('-10 days'));
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$fixture = new TimesheetFixtures();
$fixture->setAmount(3);
$fixture->setUser($this->getUserByRole($em, User::ROLE_TEAMLEAD));
$fixture->setUser($this->getUserByRole(User::ROLE_TEAMLEAD));
$fixture->setStartDate(new \DateTime('-10 days'));
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->request($client, '/team/timesheet/');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -166,7 +166,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$this->assertEquals('invoice_print', $body->getAttribute('class'));
$result = $node->filter('section.invoice table.table tbody tr');
$this->assertEquals(10, count($result));
$this->assertEquals(10, \count($result));
}
public function testCreateAction()
@@ -205,13 +205,13 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$teamlead = $this->getUserByRole($em, User::ROLE_TEAMLEAD);
$user = $this->getUserByRole(User::ROLE_USER);
$teamlead = $this->getUserByRole(User::ROLE_TEAMLEAD);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setUser($user);
$fixture->setStartDate('2017-05-01');
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->request($client, '/team/timesheet/1/edit');
@@ -250,11 +250,11 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_TEAMLEAD);
$user = $this->getUserByRole(User::ROLE_TEAMLEAD);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setUser($user);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/team/timesheet/');
@@ -289,11 +289,11 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_TEAMLEAD);
$user = $this->getUserByRole(User::ROLE_TEAMLEAD);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setUser($user);
$this->importFixture($em, $fixture);
$this->importFixture($fixture);
$this->assertAccessIsGranted($client, '/team/timesheet/');
@@ -320,7 +320,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
]);
$this->assertTrue($client->getResponse()->isSuccessful());
$newUser = $this->getUserByRole($em, User::ROLE_USER);
$newUser = $this->getUserByRole(User::ROLE_USER);
$form = $client->getCrawler()->filter('form[name=timesheet_multi_update]')->form();
$client->submit($form, [
'timesheet_multi_update' => [

View File

@@ -87,7 +87,7 @@ class UserControllerTest extends ControllerBaseTest
$expectedTabs = ['#settings', '#password', '#api-token', '#teams', '#roles'];
$tabs = $client->getCrawler()->filter('div.nav-tabs-custom ul.nav-tabs li');
$this->assertEquals(count($expectedTabs), $tabs->count());
$this->assertEquals(\count($expectedTabs), $tabs->count());
$foundTabs = [];
/** @var \DOMElement $tab */
foreach ($tabs->filter('a') as $tab) {
@@ -146,15 +146,15 @@ class UserControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$user = $this->getUserByRole(User::ROLE_USER);
$fixture = new TimesheetFixtures();
$fixture->setUser($user);
$fixture->setAmount(10);
$this->importFixture($client, $fixture);
$this->importFixture($fixture);
$timesheets = $em->getRepository(Timesheet::class)->findAll();
$this->assertEquals(10, count($timesheets));
$this->assertEquals(10, \count($timesheets));
$this->request($client, '/admin/user/' . $user->getId() . '/delete');
$this->assertTrue($client->getResponse()->isSuccessful());