jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

phpstan level 3, fixed deprecations, code cleanup (#811)

Browse Source
This commit is contained in:
Kevin Papst
2019-05-28 12:24:21 +02:00
committed by GitHub
parent d9dca96a32
commit 393abe9e62
69 changed files with 381 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Controller/TimesheetAbstractController.php
View File

@@ -17,6 +17,7 @@ use App\Form\Toolbar\TimesheetToolbarForm;
use App\Repository\ActivityRepository;
use App\Repository\ProjectRepository;
use App\Repository\Query\TimesheetQuery;
use App\Repository\TagRepository;
use App\Repository\TimesheetRepository;
use App\Timesheet\UserDateTimeFactory;
use Doctrine\Common\Collections\ArrayCollection;
@@ -35,15 +36,16 @@ abstract class TimesheetAbstractController extends AbstractController
* @var TimesheetConfiguration
*/
protected $configuration;
/**
* @param UserDateTimeFactory $dateTime
* @param TimesheetConfiguration $configuration
* @var TimesheetRepository
*/
public function __construct(UserDateTimeFactory $dateTime, TimesheetConfiguration $configuration)
protected $repository;
public function __construct(UserDateTimeFactory $dateTime, TimesheetConfiguration $configuration, TimesheetRepository $repository)
{
$this->dateTime = $dateTime;
$this->configuration = $configuration;
$this->repository = $repository;
}
/**
@@ -59,7 +61,7 @@ abstract class TimesheetAbstractController extends AbstractController
*/
protected function getRepository()
{
return $this->getDoctrine()->getRepository(Timesheet::class);
return $this->repository;
}
protected function index($page, Request $request, string $renderTemplate)
@@ -86,9 +88,11 @@ abstract class TimesheetAbstractController extends AbstractController
$tags = $query->getTags(true);
if (!empty($tags)) {
/** @var TagRepository $tagRepo */
$tagRepo = $this->getDoctrine()->getRepository(Tag::class);
$query->setTags(
new ArrayCollection(
$this->getDoctrine()->getRepository(Tag::class)->findIdsByTagNameList(implode(',', $tags))
$tagRepo->findIdsByTagNameList(implode(',', $tags))
)
);
}