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

upgraded to phpunit 8 (#1155)

Browse Source
This commit is contained in:
Kevin Papst
2019-10-24 17:35:05 +02:00
committed by GitHub
parent e91e4ff430
commit b0f83291ee
81 changed files with 421 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/API/ActivityController.php
View File

@@ -138,7 +138,6 @@ class ActivityController extends BaseApiController
*/
public function getAction($id)
{
/** @var Activity $data */
$data = $this->repository->find($id);
if (null === $data) {

1
src/API/CustomerController.php
View File

@@ -117,7 +117,6 @@ class CustomerController extends BaseApiController
*/
public function getAction($id)
{
/** @var Customer $data */
$data = $this->repository->find($id);
if (null === $data) {

1
src/API/ProjectController.php
View File

@@ -122,7 +122,6 @@ class ProjectController extends BaseApiController
*/
public function getAction($id)
{
/** @var Project $data */
$data = $this->repository->find($id);
if (null === $data) {

1
src/API/TeamController.php
View File

@@ -81,7 +81,6 @@ class TeamController extends BaseApiController
*/
public function getAction($id)
{
/** @var Team $data */
$data = $this->repository->find($id);
if (null === $data) {

4
src/API/TimesheetController.php
View File

@@ -247,7 +247,6 @@ class TimesheetController extends BaseApiController
*/
public function getAction($id)
{
/** @var Timesheet $data */
$data = $this->repository->find($id);
if (null === $data) {
@@ -545,7 +544,6 @@ class TimesheetController extends BaseApiController
*/
public function stopAction($id)
{
/** @var Timesheet $timesheet */
$timesheet = $this->repository->find($id);
if (null === $timesheet) {
@@ -590,7 +588,6 @@ class TimesheetController extends BaseApiController
*/
public function restartAction($id, ParamFetcherInterface $paramFetcher, ValidatorInterface $validator)
{
/** @var Timesheet $timesheet */
$timesheet = $this->repository->find($id);
if (null === $timesheet) {
@@ -678,7 +675,6 @@ class TimesheetController extends BaseApiController
*/
public function exportAction($id)
{
/** @var Timesheet $timesheet */
$timesheet = $this->repository->find($id);
if (null === $timesheet) {

7
src/DataFixtures/CustomerFixtures.php
View File

@@ -40,7 +40,6 @@ class CustomerFixtures extends Fixture
public const MAX_PROJECTS_PER_CUSTOMER = 25;
public const MIN_ACTIVITIES_PER_PROJECT = 0;
public const MAX_ACTIVITIES_PER_PROJECT = 25;
public const INDICATE_HIDDEN = false;
/**
* @param ObjectManager $manager
@@ -94,7 +93,7 @@ class CustomerFixtures extends Fixture
$entry = new Customer();
$entry
->setCurrency($faker->currencyCode)
->setName($faker->company . (self::INDICATE_HIDDEN && !$visible ? ' (x)' : ''))
->setName($faker->company)
->setAddress($faker->address)
->setComment($faker->text)
->setNumber('C-' . $faker->ean8)
@@ -125,7 +124,7 @@ class CustomerFixtures extends Fixture
$entry = new Project();
$entry
->setName($faker->catchPhrase . (self::INDICATE_HIDDEN && !$visible ? ' (x)' : ''))
->setName($faker->catchPhrase)
->setComment($faker->text)
->setCustomer($customer)
->setOrderNumber('P-' . $faker->ean8)
@@ -153,7 +152,7 @@ class CustomerFixtures extends Fixture
{
$entry = new Activity();
$entry
->setName($faker->bs . (self::INDICATE_HIDDEN && !$visible ? ' (x)' : ''))
->setName($faker->bs)
->setProject($project)
->setComment($faker->text)
->setVisible($visible)

2
src/DependencyInjection/Compiler/DoctrineCompilerPass.php
View File

@@ -43,7 +43,7 @@ class DoctrineCompilerPass implements CompilerPassInterface
$engine = getenv('DATABASE_ENGINE');
}
if (null === $engine) {
if (false === $engine) {
throw new \Exception(
'Could not detect database engine. Please set the environment config DATABASE_ENGINE ' .
'to one of: "' . implode(', ', $this->allowedEngines) . '" in your .env file, e.g. DATABASE_ENGINE=sqlite'

2
src/Doctrine/UTCDateTimeType.php
View File

@@ -16,7 +16,7 @@ use Doctrine\DBAL\Types\DateTimeType;
class UTCDateTimeType extends DateTimeType
{
/**
* @var \DateTimeZone
* @var \DateTimeZone|null
*/
private static $utc;

11
src/Event/PrepareUserEvent.php
View File

@@ -21,24 +21,17 @@ final class PrepareUserEvent extends Event
* @deprecated since 1.4, will be removed with 2.0
*/
public const PREPARE = PrepareUserEvent::class;
/**
* @var User
*/
protected $user;
private $user;
/**
* @param User $user
*/
public function __construct(User $user)
{
$this->user = $user;
}
/**
* @return User
*/
public function getUser()
public function getUser(): User
{
return $this->user;
}

1
src/EventSubscriber/TimezoneSubscriber.php
View File

@@ -52,7 +52,6 @@ class TimezoneSubscriber implements EventSubscriberInterface
return false;
}
/* @var $user User */
$user = $this->storage->getToken()->getUser();
if (null === $user) {

17
src/EventSubscriber/UserPreferenceSubscriber.php
View File

@@ -151,10 +151,6 @@ class UserPreferenceSubscriber implements EventSubscriberInterface
*/
public function loadUserPreferences(PrepareUserEvent $event)
{
if (!$this->canHandleEvent($event)) {
return;
}
$user = $event->getUser();
$prefs = [];
@@ -182,17 +178,4 @@ class UserPreferenceSubscriber implements EventSubscriberInterface
$user->setPreferences(array_values($prefs));
}
/**
* @param PrepareUserEvent $event
* @return bool
*/
protected function canHandleEvent(PrepareUserEvent $event): bool
{
if (null === ($user = $event->getUser())) {
return false;
}
return ($user instanceof User);
}
}

2
src/Form/DataTransformer/DurationStringToSecondsTransformer.php
View File

@@ -46,7 +46,7 @@ class DurationStringToSecondsTransformer implements DataTransformerInterface
}
/**
* @param string $formatToInt
* @param string|null $formatToInt
* @return int|null
*/
public function reverseTransform($formatToInt)

24
src/Form/Model/DateRange.php
View File

@@ -11,49 +11,35 @@ namespace App\Form\Model;
use DateTime;
class DateRange
final class DateRange
{
/**
* @var DateTime
*/
protected $begin;
private $begin;
/**
* @var DateTime
*/
protected $end;
private $end;
/**
* @return DateTime
*/
public function getBegin(): ?DateTime
{
return $this->begin;
}
/**
* @param DateTime $begin
* @return DateRange
*/
public function setBegin(DateTime $begin)
public function setBegin(DateTime $begin): DateRange
{
$this->begin = $begin;
return $this;
}
/**
* @return DateTime
*/
public function getEnd(): ?DateTime
{
return $this->end;
}
/**
* @param DateTime $end
* @return DateRange
*/
public function setEnd(DateTime $end)
public function setEnd(DateTime $end): DateRange
{
$this->end = $end;

2
src/Form/TimesheetEditForm.php
View File

@@ -295,7 +295,7 @@ class TimesheetEditForm extends AbstractType
$builder->addEventListener(
FormEvents::POST_SET_DATA,
function (FormEvent $event) {
/** @var Timesheet $data */
/** @var Timesheet|null $data */
$data = $event->getData();
if (null === $data || null === $data->getEnd()) {
$event->getForm()->get('duration')->setData(null);

4
src/Invoice/Calculator/AbstractCalculator.php
View File

@@ -69,8 +69,8 @@ abstract class AbstractCalculator
public function getTax(): float
{
$vat = $this->getVat();
if (0 === $vat) {
return 0;
if (0.00 === $vat) {
return 0.00;
}
$percent = $vat / 100.00;

18
src/Repository/Query/TimesheetQuery.php
View File

@@ -144,10 +144,6 @@ class TimesheetQuery extends ActivityQuery
*/
public function setState($state)
{
if (!is_int($state) && $state !== (int) $state) {
return $this;
}
$state = (int) $state;
if (in_array($state, [self::STATE_ALL, self::STATE_RUNNING, self::STATE_STOPPED], true)) {
$this->state = $state;
@@ -170,10 +166,6 @@ class TimesheetQuery extends ActivityQuery
*/
public function setExported($exported)
{
if (!is_int($exported) && $exported !== (int) $exported) {
return $this;
}
$exported = (int) $exported;
if (in_array($exported, [self::STATE_ALL, self::STATE_EXPORTED, self::STATE_NOT_EXPORTED], true)) {
$this->exported = $exported;
@@ -182,10 +174,7 @@ class TimesheetQuery extends ActivityQuery
return $this;
}
/**
* @return \DateTime
*/
public function getBegin()
public function getBegin(): ?\DateTime
{
return $this->dateRange->getBegin();
}
@@ -201,10 +190,7 @@ class TimesheetQuery extends ActivityQuery
return $this;
}
/**
* @return \DateTime
*/
public function getEnd()
public function getEnd(): ?\DateTime
{
return $this->dateRange->getEnd();
}

6
src/Repository/Query/UserQuery.php
View File

@@ -19,7 +19,7 @@ class UserQuery extends VisibilityQuery
/**
* @var string|null
*/
protected $role;
private $role;
public function __construct()
{
@@ -37,12 +37,12 @@ class UserQuery extends VisibilityQuery
}
/**
* @param string $role
* @param string|null $role
* @return UserQuery
*/
public function setRole($role)
{
if (false !== strpos($role, 'ROLE_') || null === $role) {
if (null === $role || false !== strpos($role, 'ROLE_')) {
$this->role = $role;
}

4
src/Repository/Query/VisibilityQuery.php
View File

@@ -43,10 +43,6 @@ class VisibilityQuery extends BaseQuery
*/
public function setVisibility($visibility)
{
if (!is_int($visibility) && $visibility != (int) $visibility) {
return $this;
}
$visibility = (int) $visibility;
if (in_array($visibility, self::ALLOWED_VISIBILITY_STATES, true)) {
$this->visibility = $visibility;

2
src/Utils/Duration.php
View File

@@ -24,7 +24,7 @@ class Duration
/**
* Transforms seconds into a duration string.
*
* @param int $seconds
* @param int|null $seconds
* @param string $format
* @return string|null
*/

2
src/Validator/Constraints/TimesheetValidator.php
View File

@@ -46,7 +46,7 @@ class TimesheetValidator extends ConstraintValidator
}
/**
* @param TimesheetEntity $value
* @param TimesheetEntity|mixed $value
* @param Constraint $constraint
*/
public function validate($value, Constraint $constraint)