mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
DX: apply rector rulesset up to PHP72
This commit is contained in:
parent
64b8ae3df1
commit
b9a7530f7a
@ -50,7 +50,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
|
|||||||
->findAll();
|
->findAll();
|
||||||
|
|
||||||
foreach ($persons as $person) {
|
foreach ($persons as $person) {
|
||||||
$activityNbr = mt_rand(0, 3);
|
$activityNbr = random_int(0, 3);
|
||||||
|
|
||||||
for ($i = 0; $i < $activityNbr; ++$i) {
|
for ($i = 0; $i < $activityNbr; ++$i) {
|
||||||
$activity = $this->newRandomActivity($person);
|
$activity = $this->newRandomActivity($person);
|
||||||
@ -75,7 +75,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
|
|||||||
|
|
||||||
// ->setAttendee($this->faker->boolean())
|
// ->setAttendee($this->faker->boolean())
|
||||||
|
|
||||||
for ($i = 0; mt_rand(0, 4) > $i; ++$i) {
|
for ($i = 0; random_int(0, 4) > $i; ++$i) {
|
||||||
$reason = $this->getRandomActivityReason();
|
$reason = $this->getRandomActivityReason();
|
||||||
|
|
||||||
if (null !== $reason) {
|
if (null !== $reason) {
|
||||||
|
@ -26,7 +26,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
public function getConfigTreeBuilder()
|
public function getConfigTreeBuilder()
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('chill_activity');
|
$treeBuilder = new TreeBuilder('chill_activity');
|
||||||
$rootNode = $treeBuilder->getRootNode('chill_activity');
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
|
|
||||||
$rootNode
|
$rootNode
|
||||||
->children()
|
->children()
|
||||||
|
@ -32,7 +32,7 @@ class ActivityReasonCategoryType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory',
|
'data_class' => \Chill\ActivityBundle\Entity\ActivityReasonCategory::class,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -400,9 +400,7 @@ class ActivityType extends AbstractType
|
|||||||
// the datetimetransformer will then handle timezone as GMT
|
// the datetimetransformer will then handle timezone as GMT
|
||||||
$timezoneUTC = new DateTimeZone('GMT');
|
$timezoneUTC = new DateTimeZone('GMT');
|
||||||
/** @var DateTime $data */
|
/** @var DateTime $data */
|
||||||
$data = $formEvent->getData() === null ?
|
$data = $formEvent->getData() ?? DateTime::createFromFormat('U', '300');
|
||||||
DateTime::createFromFormat('U', '300') :
|
|
||||||
$formEvent->getData();
|
|
||||||
$seconds = $data->getTimezone()->getOffset($data);
|
$seconds = $data->getTimezone()->getOffset($data);
|
||||||
$data->setTimeZone($timezoneUTC);
|
$data->setTimeZone($timezoneUTC);
|
||||||
$data->add(new DateInterval('PT' . $seconds . 'S'));
|
$data->add(new DateInterval('PT' . $seconds . 'S'));
|
||||||
|
@ -79,15 +79,15 @@ final class TranslatableActivityReasonTest extends TypeTestCase
|
|||||||
$request = $prophet->prophesize();
|
$request = $prophet->prophesize();
|
||||||
$translator = $prophet->prophesize();
|
$translator = $prophet->prophesize();
|
||||||
|
|
||||||
$request->willExtend('Symfony\Component\HttpFoundation\Request');
|
$request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
|
||||||
$request->getLocale()->willReturn($fallbackLocale);
|
$request->getLocale()->willReturn($fallbackLocale);
|
||||||
|
|
||||||
$requestStack->willExtend('Symfony\Component\HttpFoundation\RequestStack');
|
$requestStack->willExtend(\Symfony\Component\HttpFoundation\RequestStack::class);
|
||||||
$requestStack->getCurrentRequest()->will(static function () use ($request) {
|
$requestStack->getCurrentRequest()->will(static function () use ($request) {
|
||||||
return $request;
|
return $request;
|
||||||
});
|
});
|
||||||
|
|
||||||
$translator->willExtend('Symfony\Component\Translation\Translator');
|
$translator->willExtend(\Symfony\Component\Translation\Translator::class);
|
||||||
$translator->getFallbackLocales()->willReturn($locale);
|
$translator->getFallbackLocales()->willReturn($locale);
|
||||||
|
|
||||||
return new TranslatableStringHelper(
|
return new TranslatableStringHelper(
|
||||||
|
@ -160,7 +160,7 @@ final class ActivityVoterTest extends KernelTestCase
|
|||||||
{
|
{
|
||||||
$token = $this->prophet->prophesize();
|
$token = $this->prophet->prophesize();
|
||||||
$token
|
$token
|
||||||
->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
|
->willImplement('\\' . \Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
|
||||||
|
|
||||||
if (null === $user) {
|
if (null === $user) {
|
||||||
$token->getUser()->willReturn(null);
|
$token->getUser()->willReturn(null);
|
||||||
|
@ -22,7 +22,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('chill_aside_activity');
|
$treeBuilder = new TreeBuilder('chill_aside_activity');
|
||||||
|
|
||||||
$treeBuilder->getRootNode('chill_aside_activity')
|
$treeBuilder->getRootNode()
|
||||||
->children()
|
->children()
|
||||||
->arrayNode('form')
|
->arrayNode('form')
|
||||||
->canBeEnabled()
|
->canBeEnabled()
|
||||||
|
@ -95,9 +95,7 @@ final class AsideActivityFormType extends AbstractType
|
|||||||
// the datetimetransformer will then handle timezone as GMT
|
// the datetimetransformer will then handle timezone as GMT
|
||||||
$timezoneUTC = new DateTimeZone('GMT');
|
$timezoneUTC = new DateTimeZone('GMT');
|
||||||
/** @var DateTimeImmutable $data */
|
/** @var DateTimeImmutable $data */
|
||||||
$data = $formEvent->getData() === null ?
|
$data = $formEvent->getData() ?? DateTime::createFromFormat('U', '300');
|
||||||
DateTime::createFromFormat('U', '300') :
|
|
||||||
$formEvent->getData();
|
|
||||||
$seconds = $data->getTimezone()->getOffset($data);
|
$seconds = $data->getTimezone()->getOffset($data);
|
||||||
$data->setTimeZone($timezoneUTC);
|
$data->setTimeZone($timezoneUTC);
|
||||||
$data->add(new DateInterval('PT' . $seconds . 'S'));
|
$data->add(new DateInterval('PT' . $seconds . 'S'));
|
||||||
|
@ -116,7 +116,7 @@ abstract class AbstractElementController extends AbstractController
|
|||||||
$indexPage = 'chill_budget_elements_household_index';
|
$indexPage = 'chill_budget_elements_household_index';
|
||||||
}
|
}
|
||||||
|
|
||||||
$entity = null !== $element->getPerson() ? $element->getPerson() : $element->getHousehold();
|
$entity = $element->getPerson() ?? $element->getHousehold();
|
||||||
|
|
||||||
$form = $this->createForm($this->getType(), $element);
|
$form = $this->createForm($this->getType(), $element);
|
||||||
$form->add('submit', SubmitType::class);
|
$form->add('submit', SubmitType::class);
|
||||||
|
@ -19,7 +19,7 @@ class CalculatorCompilerPass implements CompilerPassInterface
|
|||||||
{
|
{
|
||||||
public function process(ContainerBuilder $container)
|
public function process(ContainerBuilder $container)
|
||||||
{
|
{
|
||||||
$manager = $container->getDefinition('Chill\BudgetBundle\Calculator\CalculatorManager');
|
$manager = $container->getDefinition(\Chill\BudgetBundle\Calculator\CalculatorManager::class);
|
||||||
|
|
||||||
foreach ($container->findTaggedServiceIds('chill_budget.calculator') as $id => $tags) {
|
foreach ($container->findTaggedServiceIds('chill_budget.calculator') as $id => $tags) {
|
||||||
foreach ($tags as $tag) {
|
foreach ($tags as $tag) {
|
||||||
|
@ -19,7 +19,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
public function getConfigTreeBuilder()
|
public function getConfigTreeBuilder()
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('chill_budget');
|
$treeBuilder = new TreeBuilder('chill_budget');
|
||||||
$rootNode = $treeBuilder->getRootNode('chill_budget');
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
|
|
||||||
$rootNode
|
$rootNode
|
||||||
->children()
|
->children()
|
||||||
|
@ -60,7 +60,7 @@ class MapAndSubscribeUserCalendarCommand extends Command
|
|||||||
|
|
||||||
public function execute(InputInterface $input, OutputInterface $output): int
|
public function execute(InputInterface $input, OutputInterface $output): int
|
||||||
{
|
{
|
||||||
$this->logger->info(__CLASS__ . ' execute command');
|
$this->logger->info(self::class . ' execute command');
|
||||||
|
|
||||||
$limit = 50;
|
$limit = 50;
|
||||||
$offset = 0;
|
$offset = 0;
|
||||||
@ -71,7 +71,7 @@ class MapAndSubscribeUserCalendarCommand extends Command
|
|||||||
$created = 0;
|
$created = 0;
|
||||||
$renewed = 0;
|
$renewed = 0;
|
||||||
|
|
||||||
$this->logger->info(__CLASS__ . ' the number of user to get - renew', [
|
$this->logger->info(self::class . ' the number of user to get - renew', [
|
||||||
'total' => $total,
|
'total' => $total,
|
||||||
'expiration' => $expiration->format(DateTimeImmutable::ATOM),
|
'expiration' => $expiration->format(DateTimeImmutable::ATOM),
|
||||||
]);
|
]);
|
||||||
@ -92,7 +92,7 @@ class MapAndSubscribeUserCalendarCommand extends Command
|
|||||||
// we first try to renew an existing subscription, if any.
|
// we first try to renew an existing subscription, if any.
|
||||||
// if not, or if it fails, we try to create a new one
|
// if not, or if it fails, we try to create a new one
|
||||||
if ($this->mapCalendarToUser->hasActiveSubscription($user)) {
|
if ($this->mapCalendarToUser->hasActiveSubscription($user)) {
|
||||||
$this->logger->debug(__CLASS__ . ' renew a subscription for', [
|
$this->logger->debug(self::class . ' renew a subscription for', [
|
||||||
'userId' => $user->getId(),
|
'userId' => $user->getId(),
|
||||||
'username' => $user->getUsernameCanonical(),
|
'username' => $user->getUsernameCanonical(),
|
||||||
]);
|
]);
|
||||||
@ -104,7 +104,7 @@ class MapAndSubscribeUserCalendarCommand extends Command
|
|||||||
if (0 !== $expirationTs) {
|
if (0 !== $expirationTs) {
|
||||||
++$renewed;
|
++$renewed;
|
||||||
} else {
|
} else {
|
||||||
$this->logger->warning(__CLASS__ . ' could not renew subscription for a user', [
|
$this->logger->warning(self::class . ' could not renew subscription for a user', [
|
||||||
'userId' => $user->getId(),
|
'userId' => $user->getId(),
|
||||||
'username' => $user->getUsernameCanonical(),
|
'username' => $user->getUsernameCanonical(),
|
||||||
]);
|
]);
|
||||||
@ -112,7 +112,7 @@ class MapAndSubscribeUserCalendarCommand extends Command
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->mapCalendarToUser->hasActiveSubscription($user)) {
|
if (!$this->mapCalendarToUser->hasActiveSubscription($user)) {
|
||||||
$this->logger->debug(__CLASS__ . ' create a subscription for', [
|
$this->logger->debug(self::class . ' create a subscription for', [
|
||||||
'userId' => $user->getId(),
|
'userId' => $user->getId(),
|
||||||
'username' => $user->getUsernameCanonical(),
|
'username' => $user->getUsernameCanonical(),
|
||||||
]);
|
]);
|
||||||
@ -124,7 +124,7 @@ class MapAndSubscribeUserCalendarCommand extends Command
|
|||||||
if (0 !== $expirationTs) {
|
if (0 !== $expirationTs) {
|
||||||
++$created;
|
++$created;
|
||||||
} else {
|
} else {
|
||||||
$this->logger->warning(__CLASS__ . ' could not create subscription for a user', [
|
$this->logger->warning(self::class . ' could not create subscription for a user', [
|
||||||
'userId' => $user->getId(),
|
'userId' => $user->getId(),
|
||||||
'username' => $user->getUsernameCanonical(),
|
'username' => $user->getUsernameCanonical(),
|
||||||
]);
|
]);
|
||||||
@ -139,7 +139,7 @@ class MapAndSubscribeUserCalendarCommand extends Command
|
|||||||
$this->em->clear();
|
$this->em->clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->logger->warning(__CLASS__ . ' process executed', [
|
$this->logger->warning(self::class . ' process executed', [
|
||||||
'created' => $created,
|
'created' => $created,
|
||||||
'renewed' => $renewed,
|
'renewed' => $renewed,
|
||||||
]);
|
]);
|
||||||
|
@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
public function getConfigTreeBuilder()
|
public function getConfigTreeBuilder()
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('chill_calendar');
|
$treeBuilder = new TreeBuilder('chill_calendar');
|
||||||
$rootNode = $treeBuilder->getRootNode('chill_calendar');
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
|
|
||||||
$rootNode
|
$rootNode
|
||||||
->children()
|
->children()
|
||||||
|
@ -77,7 +77,7 @@ class MSGraphChangeNotificationHandler implements MessageHandlerInterface
|
|||||||
$user = $this->userRepository->find($changeNotificationMessage->getUserId());
|
$user = $this->userRepository->find($changeNotificationMessage->getUserId());
|
||||||
|
|
||||||
if (null === $user) {
|
if (null === $user) {
|
||||||
$this->logger->warning(__CLASS__ . ' notification concern non-existent user, skipping');
|
$this->logger->warning(self::class . ' notification concern non-existent user, skipping');
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -86,7 +86,7 @@ class MSGraphChangeNotificationHandler implements MessageHandlerInterface
|
|||||||
$secret = $this->mapCalendarToUser->getSubscriptionSecret($user);
|
$secret = $this->mapCalendarToUser->getSubscriptionSecret($user);
|
||||||
|
|
||||||
if ($secret !== ($notification['clientState'] ?? -1)) {
|
if ($secret !== ($notification['clientState'] ?? -1)) {
|
||||||
$this->logger->warning(__CLASS__ . ' could not validate secret, skipping');
|
$this->logger->warning(self::class . ' could not validate secret, skipping');
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -101,7 +101,7 @@ class MSGraphChangeNotificationHandler implements MessageHandlerInterface
|
|||||||
$this->calendarSyncer->handleCalendarSync($calendar, $notification, $user);
|
$this->calendarSyncer->handleCalendarSync($calendar, $notification, $user);
|
||||||
$this->em->flush();
|
$this->em->flush();
|
||||||
} else {
|
} else {
|
||||||
$this->logger->info(__CLASS__ . ' id not found in any calendar nor calendar range');
|
$this->logger->info(self::class . ' id not found in any calendar nor calendar range');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ class CalendarRangeSyncer
|
|||||||
}
|
}
|
||||||
$calendarRange->preventEnqueueChanges = true;
|
$calendarRange->preventEnqueueChanges = true;
|
||||||
|
|
||||||
$this->logger->info(__CLASS__ . ' remove a calendar range because deleted on remote calendar');
|
$this->logger->info(self::class . ' remove a calendar range because deleted on remote calendar');
|
||||||
$this->em->remove($calendarRange);
|
$this->em->remove($calendarRange);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@ -71,7 +71,7 @@ class CalendarRangeSyncer
|
|||||||
$notification['resource']
|
$notification['resource']
|
||||||
)->toArray();
|
)->toArray();
|
||||||
} catch (ClientExceptionInterface $clientException) {
|
} catch (ClientExceptionInterface $clientException) {
|
||||||
$this->logger->warning(__CLASS__ . ' could not retrieve event from ms graph. Already deleted ?', [
|
$this->logger->warning(self::class . ' could not retrieve event from ms graph. Already deleted ?', [
|
||||||
'calendarRangeId' => $calendarRange->getId(),
|
'calendarRangeId' => $calendarRange->getId(),
|
||||||
'remoteEventId' => $notification['resource'],
|
'remoteEventId' => $notification['resource'],
|
||||||
]);
|
]);
|
||||||
@ -82,7 +82,7 @@ class CalendarRangeSyncer
|
|||||||
$lastModified = RemoteEventConverter::convertStringDateWithTimezone($new['lastModifiedDateTime']);
|
$lastModified = RemoteEventConverter::convertStringDateWithTimezone($new['lastModifiedDateTime']);
|
||||||
|
|
||||||
if ($calendarRange->getRemoteAttributes()['lastModifiedDateTime'] === $lastModified->getTimestamp()) {
|
if ($calendarRange->getRemoteAttributes()['lastModifiedDateTime'] === $lastModified->getTimestamp()) {
|
||||||
$this->logger->info(__CLASS__ . ' change key is equals. Source is probably a local update', [
|
$this->logger->info(self::class . ' change key is equals. Source is probably a local update', [
|
||||||
'calendarRangeId' => $calendarRange->getId(),
|
'calendarRangeId' => $calendarRange->getId(),
|
||||||
'remoteEventId' => $notification['resource'],
|
'remoteEventId' => $notification['resource'],
|
||||||
]);
|
]);
|
||||||
|
@ -79,7 +79,7 @@ class CalendarSyncer
|
|||||||
$notification['resource']
|
$notification['resource']
|
||||||
)->toArray();
|
)->toArray();
|
||||||
} catch (ClientExceptionInterface $clientException) {
|
} catch (ClientExceptionInterface $clientException) {
|
||||||
$this->logger->warning(__CLASS__ . ' could not retrieve event from ms graph. Already deleted ?', [
|
$this->logger->warning(self::class . ' could not retrieve event from ms graph. Already deleted ?', [
|
||||||
'calendarId' => $calendar->getId(),
|
'calendarId' => $calendar->getId(),
|
||||||
'remoteEventId' => $notification['resource'],
|
'remoteEventId' => $notification['resource'],
|
||||||
]);
|
]);
|
||||||
@ -96,7 +96,7 @@ class CalendarSyncer
|
|||||||
);
|
);
|
||||||
|
|
||||||
if ($calendar->getRemoteAttributes()['lastModifiedDateTime'] === $lastModified->getTimestamp()) {
|
if ($calendar->getRemoteAttributes()['lastModifiedDateTime'] === $lastModified->getTimestamp()) {
|
||||||
$this->logger->info(__CLASS__ . ' change key is equals. Source is probably a local update', [
|
$this->logger->info(self::class . ' change key is equals. Source is probably a local update', [
|
||||||
'calendarRangeId' => $calendar->getId(),
|
'calendarRangeId' => $calendar->getId(),
|
||||||
'remoteEventId' => $notification['resource'],
|
'remoteEventId' => $notification['resource'],
|
||||||
]);
|
]);
|
||||||
|
@ -66,6 +66,6 @@ class BulkCalendarShortMessageSender
|
|||||||
$this->em->refresh($calendar);
|
$this->em->refresh($calendar);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->logger->info(__CLASS__ . 'a bulk of messages was sent', ['count_calendars' => $countCalendars, 'count_sms' => $countSms]);
|
$this->logger->info(self::class . 'a bulk of messages was sent', ['count_calendars' => $countCalendars, 'count_sms' => $countSms]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -192,9 +192,7 @@ class CreateFieldsOnGroupCommand extends Command
|
|||||||
|
|
||||||
foreach ($languages as $lang) {
|
foreach ($languages as $lang) {
|
||||||
//todo replace with service to find lang when available
|
//todo replace with service to find lang when available
|
||||||
$names[] = (isset($cf->getName()[$lang])) ?
|
$names[] = $cf->getName()[$lang] ?? 'Not available in this language';
|
||||||
$cf->getName()[$lang] :
|
|
||||||
'Not available in this language';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->validator->validate($cf)) {
|
if ($this->validator->validate($cf)) {
|
||||||
@ -249,9 +247,7 @@ class CreateFieldsOnGroupCommand extends Command
|
|||||||
|
|
||||||
foreach ($languages as $lang) {
|
foreach ($languages as $lang) {
|
||||||
//todo replace with service to find lang when available
|
//todo replace with service to find lang when available
|
||||||
$row[] = (isset($customFieldGroup->getName()[$lang])) ?
|
$row[] = $customFieldGroup->getName()[$lang] ?? 'Not available in this language';
|
||||||
$customFieldGroup->getName()[$lang] :
|
|
||||||
'Not available in this language';
|
|
||||||
}
|
}
|
||||||
$rows[] = $row;
|
$rows[] = $row;
|
||||||
}
|
}
|
||||||
|
@ -294,7 +294,7 @@ class CustomFieldChoice extends AbstractCustomField
|
|||||||
public function render($value, CustomField $customField, $documentType = 'html')
|
public function render($value, CustomField $customField, $documentType = 'html')
|
||||||
{
|
{
|
||||||
//extract the data. They are under a _choice key if they are stored with allow_other
|
//extract the data. They are under a _choice key if they are stored with allow_other
|
||||||
$data = (isset($value['_choices'])) ? $value['_choices'] : $value;
|
$data = $value['_choices'] ?? $value;
|
||||||
$selected = (is_array($data)) ? $data : [$data];
|
$selected = (is_array($data)) ? $data : [$data];
|
||||||
$choices = $customField->getOptions()[self::CHOICES];
|
$choices = $customField->getOptions()[self::CHOICES];
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
|
|||||||
$manager->persist($parent);
|
$manager->persist($parent);
|
||||||
|
|
||||||
//Load children
|
//Load children
|
||||||
$expected_nb_children = mt_rand(10, 50);
|
$expected_nb_children = random_int(10, 50);
|
||||||
|
|
||||||
for ($i = 0; $i < $expected_nb_children; ++$i) {
|
for ($i = 0; $i < $expected_nb_children; ++$i) {
|
||||||
$companyName = $this->fakerFr->company;
|
$companyName = $this->fakerFr->company;
|
||||||
@ -144,7 +144,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
|
|||||||
$manager->persist($parent);
|
$manager->persist($parent);
|
||||||
|
|
||||||
//Load children
|
//Load children
|
||||||
$expected_nb_children = mt_rand(10, 50);
|
$expected_nb_children = random_int(10, 50);
|
||||||
|
|
||||||
for ($i = 0; $i < $expected_nb_children; ++$i) {
|
for ($i = 0; $i < $expected_nb_children; ++$i) {
|
||||||
$manager->persist($this->createChildOption($parent, [
|
$manager->persist($this->createChildOption($parent, [
|
||||||
|
@ -25,7 +25,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
public function getConfigTreeBuilder()
|
public function getConfigTreeBuilder()
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('chill_custom_fields');
|
$treeBuilder = new TreeBuilder('chill_custom_fields');
|
||||||
$rootNode = $treeBuilder->getRootNode('chill_custom_fields');
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
|
|
||||||
$classInfo = 'The class which may receive custom fields';
|
$classInfo = 'The class which may receive custom fields';
|
||||||
$nameInfo = 'The name which will appears in the user interface. May be translatable';
|
$nameInfo = 'The name which will appears in the user interface. May be translatable';
|
||||||
|
@ -119,7 +119,7 @@ class CustomFieldType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\CustomFieldsBundle\Entity\CustomField',
|
'data_class' => \Chill\CustomFieldsBundle\Entity\CustomField::class,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$resolver->setRequired(['type', 'group_widget'])
|
$resolver->setRequired(['type', 'group_widget'])
|
||||||
|
@ -38,7 +38,7 @@ class ChoicesListType extends AbstractType
|
|||||||
$formData = $form->getData();
|
$formData = $form->getData();
|
||||||
|
|
||||||
if (null === $formData['slug']) {
|
if (null === $formData['slug']) {
|
||||||
$slug = uniqid(mt_rand(), true);
|
$slug = uniqid(random_int(0, mt_getrandmax()), true);
|
||||||
|
|
||||||
$data['slug'] = $slug;
|
$data['slug'] = $slug;
|
||||||
$event->setData($data);
|
$event->setData($data);
|
||||||
|
@ -49,7 +49,7 @@ class CustomFieldType extends AbstractType
|
|||||||
{
|
{
|
||||||
$resolver
|
$resolver
|
||||||
->setRequired(['group'])
|
->setRequired(['group'])
|
||||||
->addAllowedTypes('group', ['Chill\CustomFieldsBundle\Entity\CustomFieldsGroup']);
|
->addAllowedTypes('group', [\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getBlockPrefix()
|
public function getBlockPrefix()
|
||||||
|
@ -49,7 +49,7 @@ class CustomFieldsHelper
|
|||||||
public function isEmptyValue(array $fields, CustomField $customField)
|
public function isEmptyValue(array $fields, CustomField $customField)
|
||||||
{
|
{
|
||||||
$slug = $customField->getSlug();
|
$slug = $customField->getSlug();
|
||||||
$rawValue = (isset($fields[$slug])) ? $fields[$slug] : null;
|
$rawValue = $fields[$slug] ?? null;
|
||||||
$customFieldType = $this->provider->getCustomFieldByType($customField->getType());
|
$customFieldType = $this->provider->getCustomFieldByType($customField->getType());
|
||||||
|
|
||||||
$deserializedValue = $customFieldType->deserialize($rawValue, $customField);
|
$deserializedValue = $customFieldType->deserialize($rawValue, $customField);
|
||||||
@ -71,7 +71,7 @@ class CustomFieldsHelper
|
|||||||
public function renderCustomField(array $fields, CustomField $customField, $documentType = 'html')
|
public function renderCustomField(array $fields, CustomField $customField, $documentType = 'html')
|
||||||
{
|
{
|
||||||
$slug = $customField->getSlug();
|
$slug = $customField->getSlug();
|
||||||
$rawValue = (isset($fields[$slug])) ? $fields[$slug] : null;
|
$rawValue = $fields[$slug] ?? null;
|
||||||
$customFieldType = $this->provider->getCustomFieldByType($customField->getType());
|
$customFieldType = $this->provider->getCustomFieldByType($customField->getType());
|
||||||
|
|
||||||
return $customFieldType->render($rawValue, $customField, $documentType);
|
return $customFieldType->render($rawValue, $customField, $documentType);
|
||||||
|
@ -52,7 +52,7 @@ final class CustomFieldsGroupControllerTest extends WebTestCase
|
|||||||
// Fill in the form and submit it
|
// Fill in the form and submit it
|
||||||
$form = $crawler->selectButton('Créer')->form([
|
$form = $crawler->selectButton('Créer')->form([
|
||||||
'custom_fields_group[name][fr]' => 'Test',
|
'custom_fields_group[name][fr]' => 'Test',
|
||||||
'custom_fields_group[entity]' => 'Chill\PersonBundle\Entity\Person',
|
'custom_fields_group[entity]' => \Chill\PersonBundle\Entity\Person::class,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$crawler = $client->submit($form);
|
$crawler = $client->submit($form);
|
||||||
|
@ -34,12 +34,12 @@ trait CustomFieldTestHelper
|
|||||||
$kernel = static::$kernel;
|
$kernel = static::$kernel;
|
||||||
|
|
||||||
//check a kernel is accessible
|
//check a kernel is accessible
|
||||||
$customFieldsGroup = $this->createMock('Chill\CustomFieldsBundle\Entity\CustomFieldsGroup');
|
$customFieldsGroup = $this->createMock(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class);
|
||||||
$customFieldsGroup->expects($this->once())
|
$customFieldsGroup->expects($this->once())
|
||||||
->method('getActiveCustomFields')
|
->method('getActiveCustomFields')
|
||||||
->will($this->returnValue([$field]));
|
->will($this->returnValue([$field]));
|
||||||
|
|
||||||
$request = $this->createMock('Symfony\Component\HttpFoundation\Request');
|
$request = $this->createMock(\Symfony\Component\HttpFoundation\Request::class);
|
||||||
$request->expects($this->any())
|
$request->expects($this->any())
|
||||||
->method('getLocale')
|
->method('getLocale')
|
||||||
->will($this->returnValue($locale));
|
->will($this->returnValue($locale));
|
||||||
|
@ -41,11 +41,11 @@ final class CustomFieldsTextTest extends WebTestCase
|
|||||||
$customField = $this->customFieldProvider->getCustomFieldByType('text');
|
$customField = $this->customFieldProvider->getCustomFieldByType('text');
|
||||||
|
|
||||||
$this->assertInstanceOf(
|
$this->assertInstanceOf(
|
||||||
'Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface',
|
\Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface::class,
|
||||||
$customField
|
$customField
|
||||||
);
|
);
|
||||||
$this->assertInstanceOf(
|
$this->assertInstanceOf(
|
||||||
'Chill\CustomFieldsBundle\CustomFields\CustomFieldText',
|
\Chill\CustomFieldsBundle\CustomFields\CustomFieldText::class,
|
||||||
$customField
|
$customField
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ final class CustomFieldRenderingTwigTest extends KernelTestCase
|
|||||||
// set locale to fr
|
// set locale to fr
|
||||||
$prophet = new \Prophecy\Prophet();
|
$prophet = new \Prophecy\Prophet();
|
||||||
$request = $prophet->prophesize();
|
$request = $prophet->prophesize();
|
||||||
$request->willExtend('Symfony\Component\HttpFoundation\Request');
|
$request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
|
||||||
$request->getLocale()->willReturn('fr');
|
$request->getLocale()->willReturn('fr');
|
||||||
self::$kernel->getContainer()->get('request_stack')
|
self::$kernel->getContainer()->get('request_stack')
|
||||||
->push($request->reveal());
|
->push($request->reveal());
|
||||||
|
@ -48,7 +48,7 @@ final class CustomFieldsGroupRenderingTwigTest extends KernelTestCase
|
|||||||
// set locale to fr
|
// set locale to fr
|
||||||
$prophet = new \Prophecy\Prophet();
|
$prophet = new \Prophecy\Prophet();
|
||||||
$request = $prophet->prophesize();
|
$request = $prophet->prophesize();
|
||||||
$request->willExtend('Symfony\Component\HttpFoundation\Request');
|
$request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
|
||||||
$request->getLocale()->willReturn('fr');
|
$request->getLocale()->willReturn('fr');
|
||||||
self::$kernel->getContainer()->get('request_stack')
|
self::$kernel->getContainer()->get('request_stack')
|
||||||
->push($request->reveal());
|
->push($request->reveal());
|
||||||
|
@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
public function getConfigTreeBuilder()
|
public function getConfigTreeBuilder()
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('chill_doc_store');
|
$treeBuilder = new TreeBuilder('chill_doc_store');
|
||||||
$rootNode = $treeBuilder->getRootNode('chill_doc_store');
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
|
|
||||||
// Here you should define the parameters that are allowed to
|
// Here you should define the parameters that are allowed to
|
||||||
// configure your bundle. See the documentation linked above for
|
// configure your bundle. See the documentation linked above for
|
||||||
|
@ -43,7 +43,7 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
|
|||||||
for ($i = 0; $i < $expectedNumber; ++$i) {
|
for ($i = 0; $i < $expectedNumber; ++$i) {
|
||||||
$event = (new Event())
|
$event = (new Event())
|
||||||
->setDate($this->faker->dateTimeBetween('-2 years', '+6 months'))
|
->setDate($this->faker->dateTimeBetween('-2 years', '+6 months'))
|
||||||
->setName($this->faker->words(mt_rand(2, 4), true))
|
->setName($this->faker->words(random_int(2, 4), true))
|
||||||
->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)]))
|
->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)]))
|
||||||
->setCenter($center)
|
->setCenter($center)
|
||||||
->setCircle(
|
->setCircle(
|
||||||
@ -75,7 +75,7 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
|
|||||||
|
|
||||||
/** @var \Chill\PersonBundle\Entity\Person $person */
|
/** @var \Chill\PersonBundle\Entity\Person $person */
|
||||||
foreach ($people as $person) {
|
foreach ($people as $person) {
|
||||||
$nb = mt_rand(0, 3);
|
$nb = random_int(0, 3);
|
||||||
|
|
||||||
for ($i = 0; $i < $nb; ++$i) {
|
for ($i = 0; $i < $nb; ++$i) {
|
||||||
$event = $events[array_rand($events)];
|
$event = $events[array_rand($events)];
|
||||||
|
@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
public function getConfigTreeBuilder()
|
public function getConfigTreeBuilder()
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('chill_event');
|
$treeBuilder = new TreeBuilder('chill_event');
|
||||||
$rootNode = $treeBuilder->getRootNode('chill_event');
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
|
|
||||||
// Here you should define the parameters that are allowed to
|
// Here you should define the parameters that are allowed to
|
||||||
// configure your bundle. See the documentation linked above for
|
// configure your bundle. See the documentation linked above for
|
||||||
|
@ -54,7 +54,7 @@ class EventType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\EventBundle\Entity\Event',
|
'data_class' => \Chill\EventBundle\Entity\Event::class,
|
||||||
]);
|
]);
|
||||||
$resolver
|
$resolver
|
||||||
->setRequired(['center', 'role'])
|
->setRequired(['center', 'role'])
|
||||||
|
@ -36,7 +36,7 @@ class EventTypeType extends AbstractType
|
|||||||
public function setDefaultOptions(OptionsResolverInterface $resolver)
|
public function setDefaultOptions(OptionsResolverInterface $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\EventBundle\Entity\EventType',
|
'data_class' => \Chill\EventBundle\Entity\EventType::class,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -55,7 +55,7 @@ class RoleType extends AbstractType
|
|||||||
public function setDefaultOptions(OptionsResolverInterface $resolver)
|
public function setDefaultOptions(OptionsResolverInterface $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\EventBundle\Entity\Role',
|
'data_class' => \Chill\EventBundle\Entity\Role::class,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,7 @@ class StatusType extends AbstractType
|
|||||||
public function setDefaultOptions(OptionsResolverInterface $resolver)
|
public function setDefaultOptions(OptionsResolverInterface $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\EventBundle\Entity\Status',
|
'data_class' => \Chill\EventBundle\Entity\Status::class,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
public function getConfigTreeBuilder()
|
public function getConfigTreeBuilder()
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('chill_amli_family_members');
|
$treeBuilder = new TreeBuilder('chill_amli_family_members');
|
||||||
$rootNode = $treeBuilder->getRootNode('chill_amli_family_members');
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
|
|
||||||
$rootNode
|
$rootNode
|
||||||
->children()
|
->children()
|
||||||
|
@ -102,11 +102,7 @@ class LoadPostalCodesCommand extends Command
|
|||||||
try {
|
try {
|
||||||
$this->addPostalCode($row, $output);
|
$this->addPostalCode($row, $output);
|
||||||
++$num;
|
++$num;
|
||||||
} catch (ExistingPostalCodeException $ex) {
|
} catch (ExistingPostalCodeException|CountryCodeNotFoundException|PostalCodeNotValidException $ex) {
|
||||||
$output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
|
|
||||||
} catch (CountryCodeNotFoundException $ex) {
|
|
||||||
$output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
|
|
||||||
} catch (PostalCodeNotValidException $ex) {
|
|
||||||
$output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
|
$output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
|
||||||
}
|
}
|
||||||
++$line;
|
++$line;
|
||||||
|
@ -164,7 +164,7 @@ class ExportController extends AbstractController
|
|||||||
{
|
{
|
||||||
$this->denyAccessUnlessGranted(SavedExportVoter::GENERATE, $savedExport);
|
$this->denyAccessUnlessGranted(SavedExportVoter::GENERATE, $savedExport);
|
||||||
|
|
||||||
$key = md5(uniqid((string) mt_rand(), false));
|
$key = md5(uniqid((string) random_int(0, mt_getrandmax()), false));
|
||||||
|
|
||||||
$this->redis->setEx($key, 3600, serialize($savedExport->getOptions()));
|
$this->redis->setEx($key, 3600, serialize($savedExport->getOptions()));
|
||||||
|
|
||||||
@ -481,7 +481,7 @@ class ExportController extends AbstractController
|
|||||||
'alias' => $alias,
|
'alias' => $alias,
|
||||||
];
|
];
|
||||||
unset($parameters['_token']);
|
unset($parameters['_token']);
|
||||||
$key = md5(uniqid((string) mt_rand(), false));
|
$key = md5(uniqid((string) random_int(0, mt_getrandmax()), false));
|
||||||
|
|
||||||
$this->redis->setEx($key, 3600, serialize($parameters));
|
$this->redis->setEx($key, 3600, serialize($parameters));
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
|
|||||||
|
|
||||||
$ar->setRefId($this->faker->numerify('ref-id-######'));
|
$ar->setRefId($this->faker->numerify('ref-id-######'));
|
||||||
$ar->setStreet($this->faker->streetName);
|
$ar->setStreet($this->faker->streetName);
|
||||||
$ar->setStreetNumber((string) mt_rand(0, 199));
|
$ar->setStreetNumber((string) random_int(0, 199));
|
||||||
$ar->setPoint($this->getRandomPoint());
|
$ar->setPoint($this->getRandomPoint());
|
||||||
$ar->setPostcode($this->getReference(
|
$ar->setPostcode($this->getReference(
|
||||||
LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)]
|
LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)]
|
||||||
@ -89,8 +89,8 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
|
|||||||
{
|
{
|
||||||
$lonBrussels = 4.35243;
|
$lonBrussels = 4.35243;
|
||||||
$latBrussels = 50.84676;
|
$latBrussels = 50.84676;
|
||||||
$lon = $lonBrussels + 0.01 * mt_rand(-5, 5);
|
$lon = $lonBrussels + 0.01 * random_int(-5, 5);
|
||||||
$lat = $latBrussels + 0.01 * mt_rand(-5, 5);
|
$lat = $latBrussels + 0.01 * random_int(-5, 5);
|
||||||
|
|
||||||
return Point::fromLonLat($lon, $lat);
|
return Point::fromLonLat($lon, $lat);
|
||||||
}
|
}
|
||||||
|
@ -38,11 +38,7 @@ class MenuCompilerPass implements CompilerPassInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
usort($services, static function ($a, $b) {
|
usort($services, static function ($a, $b) {
|
||||||
if ($a['priority'] === $b['priority']) {
|
return $a['priority'] <=> $b['priority'];
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ($a['priority'] < $b['priority']) ? -1 : 1;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
foreach ($services as $service) {
|
foreach ($services as $service) {
|
||||||
|
@ -34,7 +34,7 @@ class ShortMessageCompilerPass implements CompilerPassInterface
|
|||||||
{
|
{
|
||||||
public function process(ContainerBuilder $container)
|
public function process(ContainerBuilder $container)
|
||||||
{
|
{
|
||||||
$config = $container->resolveEnvPlaceholders($container->getParameter('chill_main.short_messages', null), true);
|
$config = $container->resolveEnvPlaceholders($container->getParameter('chill_main.short_messages'), true);
|
||||||
// weird fix for special characters
|
// weird fix for special characters
|
||||||
$config['dsn'] = str_replace(['%%'], ['%'], $config['dsn']);
|
$config['dsn'] = str_replace(['%%'], ['%'], $config['dsn']);
|
||||||
$dsn = parse_url($config['dsn']);
|
$dsn = parse_url($config['dsn']);
|
||||||
@ -43,7 +43,7 @@ class ShortMessageCompilerPass implements CompilerPassInterface
|
|||||||
if ('null' === $dsn['scheme'] || false === $config['enabled']) {
|
if ('null' === $dsn['scheme'] || false === $config['enabled']) {
|
||||||
$defaultTransporter = new Reference(NullShortMessageSender::class);
|
$defaultTransporter = new Reference(NullShortMessageSender::class);
|
||||||
} elseif ('ovh' === $dsn['scheme']) {
|
} elseif ('ovh' === $dsn['scheme']) {
|
||||||
if (!class_exists('\Ovh\Api')) {
|
if (!class_exists('\\' . \Ovh\Api::class)) {
|
||||||
throw new RuntimeException('Class \\Ovh\\Api not found');
|
throw new RuntimeException('Class \\Ovh\\Api not found');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,17 +66,17 @@ class ShortMessageCompilerPass implements CompilerPassInterface
|
|||||||
|
|
||||||
$ovh = new Definition();
|
$ovh = new Definition();
|
||||||
$ovh
|
$ovh
|
||||||
->setClass('\Ovh\Api')
|
->setClass('\\' . \Ovh\Api::class)
|
||||||
->setArgument(0, $dsn['user'])
|
->setArgument(0, $dsn['user'])
|
||||||
->setArgument(1, $dsn['pass'])
|
->setArgument(1, $dsn['pass'])
|
||||||
->setArgument(2, $dsn['host'])
|
->setArgument(2, $dsn['host'])
|
||||||
->setArgument(3, $dsn['queries']['consumer_key']);
|
->setArgument(3, $dsn['queries']['consumer_key']);
|
||||||
$container->setDefinition('Ovh\Api', $ovh);
|
$container->setDefinition(\Ovh\Api::class, $ovh);
|
||||||
|
|
||||||
$ovhSender = new Definition();
|
$ovhSender = new Definition();
|
||||||
$ovhSender
|
$ovhSender
|
||||||
->setClass(OvhShortMessageSender::class)
|
->setClass(OvhShortMessageSender::class)
|
||||||
->setArgument(0, new Reference('Ovh\Api'))
|
->setArgument(0, new Reference(\Ovh\Api::class))
|
||||||
->setArgument(1, $dsn['queries']['service_name'])
|
->setArgument(1, $dsn['queries']['service_name'])
|
||||||
->setArgument(2, $dsn['queries']['sender'])
|
->setArgument(2, $dsn['queries']['sender'])
|
||||||
->setArgument(3, new Reference(LoggerInterface::class))
|
->setArgument(3, new Reference(LoggerInterface::class))
|
||||||
|
@ -37,7 +37,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
public function getConfigTreeBuilder()
|
public function getConfigTreeBuilder()
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('chill_main');
|
$treeBuilder = new TreeBuilder('chill_main');
|
||||||
$rootNode = $treeBuilder->getRootNode('chill_main');
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
|
|
||||||
$rootNode
|
$rootNode
|
||||||
->children()
|
->children()
|
||||||
|
@ -193,8 +193,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
|
|||||||
/** @var WidgetFactoryInterface $factory */
|
/** @var WidgetFactoryInterface $factory */
|
||||||
$factory = $this->widgetServices[$alias];
|
$factory = $this->widgetServices[$alias];
|
||||||
// get the config (under the key which equals to widget_alias
|
// get the config (under the key which equals to widget_alias
|
||||||
$config = isset($param[$factory->getWidgetAlias()]) ?
|
$config = $param[$factory->getWidgetAlias()] ?? [];
|
||||||
$param[$factory->getWidgetAlias()] : [];
|
|
||||||
// register the service into the container
|
// register the service into the container
|
||||||
$serviceId = $this->registerServiceIntoContainer(
|
$serviceId = $this->registerServiceIntoContainer(
|
||||||
$container,
|
$container,
|
||||||
|
@ -139,7 +139,7 @@ trait AddWidgetConfigurationTrait
|
|||||||
protected function addWidgetsConfiguration(string $place, ContainerBuilder $containerBuilder)
|
protected function addWidgetsConfiguration(string $place, ContainerBuilder $containerBuilder)
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder($place);
|
$treeBuilder = new TreeBuilder($place);
|
||||||
$root = $treeBuilder->getRootNode($place)
|
$root = $treeBuilder->getRootNode()
|
||||||
->canBeUnset()
|
->canBeUnset()
|
||||||
->info('register widgets on place "' . $place . '"');
|
->info('register widgets on place "' . $place . '"');
|
||||||
|
|
||||||
@ -170,7 +170,7 @@ trait AddWidgetConfigurationTrait
|
|||||||
// adding the possible config on each widget under the widget_alias
|
// adding the possible config on each widget under the widget_alias
|
||||||
foreach ($this->filterWidgetByPlace($place) as $factory) {
|
foreach ($this->filterWidgetByPlace($place) as $factory) {
|
||||||
$builder = new TreeBuilder($factory->getWidgetAlias());
|
$builder = new TreeBuilder($factory->getWidgetAlias());
|
||||||
$widgetOptionsRoot = $builder->getRootNode($factory->getWidgetAlias());
|
$widgetOptionsRoot = $builder->getRootNode();
|
||||||
$widgetOptionsRoot->canBeUnset()
|
$widgetOptionsRoot->canBeUnset()
|
||||||
->info(sprintf(
|
->info(sprintf(
|
||||||
'the configuration for the widget "%s" (only required if this widget is set in widget_alias)',
|
'the configuration for the widget "%s" (only required if this widget is set in widget_alias)',
|
||||||
|
@ -527,28 +527,20 @@ class Address
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Set streetAddress1 (legacy function).
|
* Set streetAddress1 (legacy function).
|
||||||
*
|
|
||||||
* @param string $streetAddress1
|
|
||||||
*
|
|
||||||
* @return Address
|
|
||||||
*/
|
*/
|
||||||
public function setStreetAddress1($streetAddress1)
|
public function setStreetAddress1(?string $streetAddress1): self
|
||||||
{
|
{
|
||||||
$this->street = null === $streetAddress1 ? '' : $streetAddress1;
|
$this->street = (string) $streetAddress1;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set streetAddress2 (legacy function).
|
* Set streetAddress2 (legacy function).
|
||||||
*
|
|
||||||
* @param string $streetAddress2
|
|
||||||
*
|
|
||||||
* @return Address
|
|
||||||
*/
|
*/
|
||||||
public function setStreetAddress2($streetAddress2)
|
public function setStreetAddress2(?string $streetAddress2): self
|
||||||
{
|
{
|
||||||
$this->streetNumber = null === $streetAddress2 ? '' : $streetAddress2;
|
$this->streetNumber = (string) $streetAddress2;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ class PrivateCommentEmbeddable
|
|||||||
|
|
||||||
public function merge(PrivateCommentEmbeddable $newComment): self
|
public function merge(PrivateCommentEmbeddable $newComment): self
|
||||||
{
|
{
|
||||||
$currentComments = null === $this->getComments() ? [] : $this->getComments();
|
$currentComments = $this->getComments() ?? [];
|
||||||
|
|
||||||
$mergedComments = $newComment->getComments() + $currentComments;
|
$mergedComments = $newComment->getComments() + $currentComments;
|
||||||
|
|
||||||
|
@ -435,7 +435,7 @@ class SpreadSheetFormatter implements FormatterInterface
|
|||||||
* Get the displayable result.
|
* Get the displayable result.
|
||||||
*
|
*
|
||||||
* @param string $key
|
* @param string $key
|
||||||
* @param string $value
|
* @param mixed $value
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
@ -445,7 +445,7 @@ class SpreadSheetFormatter implements FormatterInterface
|
|||||||
$this->initializeCache($key);
|
$this->initializeCache($key);
|
||||||
}
|
}
|
||||||
|
|
||||||
$value = null === $value ? '' : $value;
|
$value = $value ?? '';
|
||||||
|
|
||||||
return call_user_func($this->cacheDisplayableResult[$key], $value);
|
return call_user_func($this->cacheDisplayableResult[$key], $value);
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@ class CenterType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\MainBundle\Entity\Center',
|
'data_class' => \Chill\MainBundle\Entity\Center::class,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ final class LocationFormType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\MainBundle\Entity\Location',
|
'data_class' => \Chill\MainBundle\Entity\Location::class,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ class PermissionsGroupType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\MainBundle\Entity\PermissionsGroup',
|
'data_class' => \Chill\MainBundle\Entity\PermissionsGroup::class,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ class ScopeType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\MainBundle\Entity\Scope',
|
'data_class' => \Chill\MainBundle\Entity\Scope::class,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,8 +83,8 @@ trait AppendScopeChoiceTypeTrait
|
|||||||
{
|
{
|
||||||
$resolver
|
$resolver
|
||||||
->setRequired(['center', 'role'])
|
->setRequired(['center', 'role'])
|
||||||
->setAllowedTypes('center', 'Chill\MainBundle\Entity\Center')
|
->setAllowedTypes('center', \Chill\MainBundle\Entity\Center::class)
|
||||||
->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role');
|
->setAllowedTypes('role', 'string');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -23,12 +23,12 @@ class ComposedGroupCenterType extends AbstractType
|
|||||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||||
{
|
{
|
||||||
$builder->add('permissionsgroup', EntityType::class, [
|
$builder->add('permissionsgroup', EntityType::class, [
|
||||||
'class' => 'Chill\MainBundle\Entity\PermissionsGroup',
|
'class' => \Chill\MainBundle\Entity\PermissionsGroup::class,
|
||||||
'choice_label' => static function (PermissionsGroup $group) {
|
'choice_label' => static function (PermissionsGroup $group) {
|
||||||
return $group->getName();
|
return $group->getName();
|
||||||
},
|
},
|
||||||
])->add('center', EntityType::class, [
|
])->add('center', EntityType::class, [
|
||||||
'class' => 'Chill\MainBundle\Entity\Center',
|
'class' => \Chill\MainBundle\Entity\Center::class,
|
||||||
'choice_label' => static function (Center $center) {
|
'choice_label' => static function (Center $center) {
|
||||||
return $center->getName();
|
return $center->getName();
|
||||||
},
|
},
|
||||||
@ -37,7 +37,7 @@ class ComposedGroupCenterType extends AbstractType
|
|||||||
|
|
||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefault('data_class', 'Chill\MainBundle\Entity\GroupCenter');
|
$resolver->setDefault('data_class', \Chill\MainBundle\Entity\GroupCenter::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getBlockPrefix()
|
public function getBlockPrefix()
|
||||||
|
@ -98,6 +98,6 @@ class ComposedRoleScopeType extends AbstractType
|
|||||||
|
|
||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefault('data_class', 'Chill\MainBundle\Entity\RoleScope');
|
$resolver->setDefault('data_class', \Chill\MainBundle\Entity\RoleScope::class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -77,7 +77,7 @@ class Select2CountryType extends AbstractType
|
|||||||
asort($choices, SORT_STRING | SORT_FLAG_CASE);
|
asort($choices, SORT_STRING | SORT_FLAG_CASE);
|
||||||
|
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'class' => 'Chill\MainBundle\Entity\Country',
|
'class' => \Chill\MainBundle\Entity\Country::class,
|
||||||
'choices' => array_combine(array_values($choices), array_keys($choices)),
|
'choices' => array_combine(array_values($choices), array_keys($choices)),
|
||||||
'preferred_choices' => array_combine(array_values($preferredChoices), array_keys($preferredChoices)),
|
'preferred_choices' => array_combine(array_values($preferredChoices), array_keys($preferredChoices)),
|
||||||
]);
|
]);
|
||||||
|
@ -73,7 +73,7 @@ class Select2LanguageType extends AbstractType
|
|||||||
asort($choices, SORT_STRING | SORT_FLAG_CASE);
|
asort($choices, SORT_STRING | SORT_FLAG_CASE);
|
||||||
|
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'class' => 'Chill\MainBundle\Entity\Language',
|
'class' => \Chill\MainBundle\Entity\Language::class,
|
||||||
'choices' => array_combine(array_values($choices), array_keys($choices)),
|
'choices' => array_combine(array_values($choices), array_keys($choices)),
|
||||||
'preferred_choices' => array_combine(array_values($preferredChoices), array_keys($preferredChoices)),
|
'preferred_choices' => array_combine(array_values($preferredChoices), array_keys($preferredChoices)),
|
||||||
]);
|
]);
|
||||||
|
@ -167,7 +167,7 @@ class UserType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\MainBundle\Entity\User',
|
'data_class' => \Chill\MainBundle\Entity\User::class,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$resolver
|
$resolver
|
||||||
|
@ -196,7 +196,7 @@ class WorkflowStepType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver
|
$resolver
|
||||||
->setDefined('class', EntityWorkflowStep::class)
|
->setDefined('class')
|
||||||
->setRequired('transition')
|
->setRequired('transition')
|
||||||
->setAllowedTypes('transition', 'bool')
|
->setAllowedTypes('transition', 'bool')
|
||||||
->setRequired('entity_workflow')
|
->setRequired('entity_workflow')
|
||||||
|
@ -78,9 +78,8 @@ class PaginatorFactory
|
|||||||
$totalItems,
|
$totalItems,
|
||||||
$this->getCurrentItemsPerPage(),
|
$this->getCurrentItemsPerPage(),
|
||||||
$this->getCurrentPageNumber(),
|
$this->getCurrentPageNumber(),
|
||||||
null === $route ? $this->getCurrentRoute() : $route,
|
$route ?? $this->getCurrentRoute(),
|
||||||
null === $routeParameters ? $this->getCurrentRouteParameters() :
|
$routeParameters ?? $this->getCurrentRouteParameters(),
|
||||||
$routeParameters,
|
|
||||||
$this->router,
|
$this->router,
|
||||||
self::DEFAULT_CURRENT_PAGE_KEY,
|
self::DEFAULT_CURRENT_PAGE_KEY,
|
||||||
self::DEFAULT_ITEM_PER_NUMBER_KEY
|
self::DEFAULT_ITEM_PER_NUMBER_KEY
|
||||||
|
@ -91,11 +91,7 @@ class SearchProvider
|
|||||||
{
|
{
|
||||||
//sort the array
|
//sort the array
|
||||||
uasort($this->searchServices, static function (SearchInterface $a, SearchInterface $b) {
|
uasort($this->searchServices, static function (SearchInterface $a, SearchInterface $b) {
|
||||||
if ($a->getOrder() === $b->getOrder()) {
|
return $a->getOrder() <=> $b->getOrder();
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ($a->getOrder() < $b->getOrder()) ? -1 : 1;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return $this->searchServices;
|
return $this->searchServices;
|
||||||
@ -124,11 +120,7 @@ class SearchProvider
|
|||||||
{
|
{
|
||||||
//sort the array
|
//sort the array
|
||||||
uasort($this->hasAdvancedFormSearchServices, static function (SearchInterface $a, SearchInterface $b) {
|
uasort($this->hasAdvancedFormSearchServices, static function (SearchInterface $a, SearchInterface $b) {
|
||||||
if ($a->getOrder() === $b->getOrder()) {
|
return $a->getOrder() <=> $b->getOrder();
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ($a->getOrder() < $b->getOrder()) ? -1 : 1;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return $this->hasAdvancedFormSearchServices;
|
return $this->hasAdvancedFormSearchServices;
|
||||||
|
@ -41,7 +41,7 @@ class RefreshAddressToGeographicalUnitMaterializedViewCronJob implements CronJob
|
|||||||
|
|
||||||
return $cronJobExecution->getLastStart() < $now->sub(new DateInterval('P1D'))
|
return $cronJobExecution->getLastStart() < $now->sub(new DateInterval('P1D'))
|
||||||
// introduce a random component to ensure a roll when multiple instances are hosted on same machines
|
// introduce a random component to ensure a roll when multiple instances are hosted on same machines
|
||||||
&& mt_rand(0, 10) === 0;
|
&& random_int(0, 10) === 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getKey(): string
|
public function getKey(): string
|
||||||
|
@ -66,11 +66,11 @@ class PostalCodeBEFromBestAddress
|
|||||||
gzclose($uncompressedStream);
|
gzclose($uncompressedStream);
|
||||||
unlink($tmpname);
|
unlink($tmpname);
|
||||||
|
|
||||||
$this->logger->info(__CLASS__ . ' list of postal code downloaded');
|
$this->logger->info(self::class . ' list of postal code downloaded');
|
||||||
|
|
||||||
$this->baseImporter->finalize();
|
$this->baseImporter->finalize();
|
||||||
|
|
||||||
$this->logger->info(__CLASS__ . ' postal code fetched', ['offset' => $offset ?? 0]);
|
$this->logger->info(self::class . ' postal code fetched', ['offset' => $offset ?? 0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getFileDownloadUrl(string $lang): string
|
private function getFileDownloadUrl(string $lang): string
|
||||||
|
@ -73,7 +73,7 @@ class PostalCodeFRFromOpenData
|
|||||||
$this->baseImporter->finalize();
|
$this->baseImporter->finalize();
|
||||||
fclose($tmpfile);
|
fclose($tmpfile);
|
||||||
|
|
||||||
$this->logger->info(__CLASS__ . ' postal code fetched', ['offset' => $offset ?? 0]);
|
$this->logger->info(self::class . ' postal code fetched', ['offset' => $offset ?? 0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function handleRecord(array $record): void
|
private function handleRecord(array $record): void
|
||||||
|
@ -243,7 +243,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
|
|||||||
$result = $results[0];
|
$result = $results[0];
|
||||||
|
|
||||||
$this->assertTrue(
|
$this->assertTrue(
|
||||||
$result instanceof Traversable || is_array($result),
|
is_iterable($result),
|
||||||
'test that each row in the result is traversable or an array'
|
'test that each row in the result is traversable or an array'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -230,7 +230,7 @@ abstract class AbstractExportTest extends WebTestCase
|
|||||||
$result = $results[0];
|
$result = $results[0];
|
||||||
|
|
||||||
$this->assertTrue(
|
$this->assertTrue(
|
||||||
$result instanceof Traversable || is_array($result),
|
is_iterable($result),
|
||||||
'test that each row in the result is traversable or an array'
|
'test that each row in the result is traversable or an array'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ trait PrepareCenterTrait
|
|||||||
}
|
}
|
||||||
|
|
||||||
$center = $this->centerProphet->prophesize();
|
$center = $this->centerProphet->prophesize();
|
||||||
$center->willExtend('\Chill\MainBundle\Entity\Center');
|
$center->willExtend('\\' . \Chill\MainBundle\Entity\Center::class);
|
||||||
$center->getId()->willReturn($id);
|
$center->getId()->willReturn($id);
|
||||||
$center->getName()->willReturn($name);
|
$center->getName()->willReturn($name);
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ trait PrepareCircleTrait
|
|||||||
}
|
}
|
||||||
|
|
||||||
$scope = $this->circleProphet->prophesize();
|
$scope = $this->circleProphet->prophesize();
|
||||||
$scope->willExtend('\Chill\MainBundle\Entity\Scope');
|
$scope->willExtend('\\' . \Chill\MainBundle\Entity\Scope::class);
|
||||||
$scope->getId()->willReturn($id);
|
$scope->getId()->willReturn($id);
|
||||||
$scope->getName()->willReturn($name);
|
$scope->getName()->willReturn($name);
|
||||||
|
|
||||||
|
@ -198,10 +198,10 @@ final class ExportManagerTest extends KernelTestCase
|
|||||||
|
|
||||||
//create a formatter
|
//create a formatter
|
||||||
$formatterFoo = $this->prophet->prophesize();
|
$formatterFoo = $this->prophet->prophesize();
|
||||||
$formatterFoo->willImplement('Chill\MainBundle\Export\FormatterInterface');
|
$formatterFoo->willImplement(\Chill\MainBundle\Export\FormatterInterface::class);
|
||||||
$formatterFoo->getType()->willReturn('foo');
|
$formatterFoo->getType()->willReturn('foo');
|
||||||
$formatterBar = $this->prophet->prophesize();
|
$formatterBar = $this->prophet->prophesize();
|
||||||
$formatterBar->willImplement('Chill\MainBundle\Export\FormatterInterface');
|
$formatterBar->willImplement(\Chill\MainBundle\Export\FormatterInterface::class);
|
||||||
$formatterBar->getType()->willReturn('bar');
|
$formatterBar->getType()->willReturn('bar');
|
||||||
$exportManager->addFormatter($formatterFoo->reveal(), 'foo');
|
$exportManager->addFormatter($formatterFoo->reveal(), 'foo');
|
||||||
$exportManager->addFormatter($formatterBar->reveal(), 'bar');
|
$exportManager->addFormatter($formatterBar->reveal(), 'bar');
|
||||||
@ -380,12 +380,12 @@ final class ExportManagerTest extends KernelTestCase
|
|||||||
|
|
||||||
//create a filter and add it to ExportManager
|
//create a filter and add it to ExportManager
|
||||||
$agg = $this->prophet->prophesize();
|
$agg = $this->prophet->prophesize();
|
||||||
$agg->willImplement('Chill\MainBundle\Export\AggregatorInterface');
|
$agg->willImplement(\Chill\MainBundle\Export\AggregatorInterface::class);
|
||||||
$exportManager->addAggregator($agg->reveal(), 'dummy');
|
$exportManager->addAggregator($agg->reveal(), 'dummy');
|
||||||
|
|
||||||
$obtained = $exportManager->getAggregator('dummy');
|
$obtained = $exportManager->getAggregator('dummy');
|
||||||
|
|
||||||
$this->assertInstanceof('Chill\MainBundle\Export\AggregatorInterface', $obtained);
|
$this->assertInstanceof(\Chill\MainBundle\Export\AggregatorInterface::class, $obtained);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testGetAggregatorNonExistant()
|
public function testGetAggregatorNonExistant()
|
||||||
@ -403,11 +403,11 @@ final class ExportManagerTest extends KernelTestCase
|
|||||||
|
|
||||||
//create three filters and add them to ExportManager
|
//create three filters and add them to ExportManager
|
||||||
$aggFoo = $this->prophet->prophesize();
|
$aggFoo = $this->prophet->prophesize();
|
||||||
$aggFoo->willImplement('Chill\MainBundle\Export\AggregatorInterface');
|
$aggFoo->willImplement(\Chill\MainBundle\Export\AggregatorInterface::class);
|
||||||
$aggBar = $this->prophet->prophesize();
|
$aggBar = $this->prophet->prophesize();
|
||||||
$aggBar->willImplement('Chill\MainBundle\Export\AggregatorInterface');
|
$aggBar->willImplement(\Chill\MainBundle\Export\AggregatorInterface::class);
|
||||||
$aggFooBar = $this->prophet->prophesize();
|
$aggFooBar = $this->prophet->prophesize();
|
||||||
$aggFooBar->willImplement('Chill\MainBundle\Export\AggregatorInterface');
|
$aggFooBar->willImplement(\Chill\MainBundle\Export\AggregatorInterface::class);
|
||||||
$exportManager->addAggregator($aggFoo->reveal(), 'foo');
|
$exportManager->addAggregator($aggFoo->reveal(), 'foo');
|
||||||
$exportManager->addAggregator($aggBar->reveal(), 'bar');
|
$exportManager->addAggregator($aggBar->reveal(), 'bar');
|
||||||
$exportManager->addAggregator($aggFooBar->reveal(), 'foobar');
|
$exportManager->addAggregator($aggFooBar->reveal(), 'foobar');
|
||||||
@ -477,12 +477,12 @@ final class ExportManagerTest extends KernelTestCase
|
|||||||
|
|
||||||
//create a filter and add it to ExportManager
|
//create a filter and add it to ExportManager
|
||||||
$filter = $this->prophet->prophesize();
|
$filter = $this->prophet->prophesize();
|
||||||
$filter->willImplement('Chill\MainBundle\Export\FilterInterface');
|
$filter->willImplement(\Chill\MainBundle\Export\FilterInterface::class);
|
||||||
$exportManager->addFilter($filter->reveal(), 'dummy');
|
$exportManager->addFilter($filter->reveal(), 'dummy');
|
||||||
|
|
||||||
$obtained = $exportManager->getFilter('dummy');
|
$obtained = $exportManager->getFilter('dummy');
|
||||||
|
|
||||||
$this->assertInstanceof('Chill\MainBundle\Export\FilterInterface', $obtained);
|
$this->assertInstanceof(\Chill\MainBundle\Export\FilterInterface::class, $obtained);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testGetFilterNonExistant()
|
public function testGetFilterNonExistant()
|
||||||
@ -500,11 +500,11 @@ final class ExportManagerTest extends KernelTestCase
|
|||||||
|
|
||||||
//create three filters and add them to ExportManager
|
//create three filters and add them to ExportManager
|
||||||
$filterFoo = $this->prophet->prophesize();
|
$filterFoo = $this->prophet->prophesize();
|
||||||
$filterFoo->willImplement('Chill\MainBundle\Export\FilterInterface');
|
$filterFoo->willImplement(\Chill\MainBundle\Export\FilterInterface::class);
|
||||||
$filterBar = $this->prophet->prophesize();
|
$filterBar = $this->prophet->prophesize();
|
||||||
$filterBar->willImplement('Chill\MainBundle\Export\FilterInterface');
|
$filterBar->willImplement(\Chill\MainBundle\Export\FilterInterface::class);
|
||||||
$filterFooBar = $this->prophet->prophesize();
|
$filterFooBar = $this->prophet->prophesize();
|
||||||
$filterFooBar->willImplement('Chill\MainBundle\Export\FilterInterface');
|
$filterFooBar->willImplement(\Chill\MainBundle\Export\FilterInterface::class);
|
||||||
$exportManager->addFilter($filterFoo->reveal(), 'foo');
|
$exportManager->addFilter($filterFoo->reveal(), 'foo');
|
||||||
$exportManager->addFilter($filterBar->reveal(), 'bar');
|
$exportManager->addFilter($filterBar->reveal(), 'bar');
|
||||||
$exportManager->addFilter($filterFooBar->reveal(), 'foobar');
|
$exportManager->addFilter($filterFooBar->reveal(), 'foobar');
|
||||||
@ -522,12 +522,12 @@ final class ExportManagerTest extends KernelTestCase
|
|||||||
|
|
||||||
//create a formatter
|
//create a formatter
|
||||||
$formatter = $this->prophet->prophesize();
|
$formatter = $this->prophet->prophesize();
|
||||||
$formatter->willImplement('Chill\MainBundle\Export\FormatterInterface');
|
$formatter->willImplement(\Chill\MainBundle\Export\FormatterInterface::class);
|
||||||
$exportManager->addFormatter($formatter->reveal(), 'dummy');
|
$exportManager->addFormatter($formatter->reveal(), 'dummy');
|
||||||
|
|
||||||
$obtained = $exportManager->getFormatter('dummy');
|
$obtained = $exportManager->getFormatter('dummy');
|
||||||
|
|
||||||
$this->assertInstanceOf('Chill\MainBundle\Export\FormatterInterface', $obtained);
|
$this->assertInstanceOf(\Chill\MainBundle\Export\FormatterInterface::class, $obtained);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testIsGrantedForElementWithExportAndUserIsGranted()
|
public function testIsGrantedForElementWithExportAndUserIsGranted()
|
||||||
@ -536,7 +536,7 @@ final class ExportManagerTest extends KernelTestCase
|
|||||||
$user = $this->prepareUser([]);
|
$user = $this->prepareUser([]);
|
||||||
|
|
||||||
$authorizationChecker = $this->prophet->prophesize();
|
$authorizationChecker = $this->prophet->prophesize();
|
||||||
$authorizationChecker->willImplement('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
|
$authorizationChecker->willImplement(\Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface::class);
|
||||||
$authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
|
$authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
|
||||||
->willReturn(true);
|
->willReturn(true);
|
||||||
|
|
||||||
@ -564,7 +564,7 @@ final class ExportManagerTest extends KernelTestCase
|
|||||||
$user = $this->prepareUser([]);
|
$user = $this->prepareUser([]);
|
||||||
|
|
||||||
$authorizationChecker = $this->prophet->prophesize();
|
$authorizationChecker = $this->prophet->prophesize();
|
||||||
$authorizationChecker->willImplement('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
|
$authorizationChecker->willImplement(\Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface::class);
|
||||||
$authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
|
$authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
|
||||||
->willReturn(true);
|
->willReturn(true);
|
||||||
$authorizationChecker->isGranted('CHILL_STAT_DUMMY', $centerB)
|
$authorizationChecker->isGranted('CHILL_STAT_DUMMY', $centerB)
|
||||||
|
@ -101,7 +101,7 @@ final class PickCenterTypeTest extends TypeTestCase
|
|||||||
$prophet = new \Prophecy\Prophet();
|
$prophet = new \Prophecy\Prophet();
|
||||||
|
|
||||||
$prophecyCenter = $prophet->prophesize();
|
$prophecyCenter = $prophet->prophesize();
|
||||||
$prophecyCenter->willExtend('\Chill\MainBundle\Entity\Center');
|
$prophecyCenter->willExtend('\\' . \Chill\MainBundle\Entity\Center::class);
|
||||||
$prophecyCenter->getId()->willReturn($id);
|
$prophecyCenter->getId()->willReturn($id);
|
||||||
$prophecyCenter->getName()->willReturn($name);
|
$prophecyCenter->getName()->willReturn($name);
|
||||||
|
|
||||||
@ -122,18 +122,18 @@ final class PickCenterTypeTest extends TypeTestCase
|
|||||||
//create a center transformer
|
//create a center transformer
|
||||||
$centerTransformerProphecy = $prophet->prophesize();
|
$centerTransformerProphecy = $prophet->prophesize();
|
||||||
$centerTransformerProphecy
|
$centerTransformerProphecy
|
||||||
->willExtend('Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer');
|
->willExtend(\Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer::class);
|
||||||
$transformer = $centerTransformerProphecy->reveal();
|
$transformer = $centerTransformerProphecy->reveal();
|
||||||
|
|
||||||
$tokenProphecy = $prophet->prophesize();
|
$tokenProphecy = $prophet->prophesize();
|
||||||
$tokenProphecy
|
$tokenProphecy
|
||||||
->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
|
->willImplement('\\' . \Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
|
||||||
$tokenProphecy->getUser()->willReturn($user);
|
$tokenProphecy->getUser()->willReturn($user);
|
||||||
$token = $tokenProphecy->reveal();
|
$token = $tokenProphecy->reveal();
|
||||||
|
|
||||||
$tokenStorageProphecy = $prophet->prophesize();
|
$tokenStorageProphecy = $prophet->prophesize();
|
||||||
$tokenStorageProphecy
|
$tokenStorageProphecy
|
||||||
->willExtend('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage');
|
->willExtend(\Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage::class);
|
||||||
$tokenStorageProphecy->getToken()->willReturn($token);
|
$tokenStorageProphecy->getToken()->willReturn($token);
|
||||||
$tokenStorage = $tokenStorageProphecy->reveal();
|
$tokenStorage = $tokenStorageProphecy->reveal();
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ final class AbstractSearchTest extends \PHPUnit\Framework\TestCase
|
|||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
$this->stub = $this->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
|
$this->stub = $this->getMockForAbstractClass(\Chill\MainBundle\Search\AbstractSearch::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testParseDateRegular()
|
public function testParseDateRegular()
|
||||||
|
@ -245,7 +245,7 @@ final class SearchProviderTest extends TestCase
|
|||||||
private function createDefaultSearchService($result, $order)
|
private function createDefaultSearchService($result, $order)
|
||||||
{
|
{
|
||||||
$mock = $this
|
$mock = $this
|
||||||
->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
|
->getMockForAbstractClass(\Chill\MainBundle\Search\AbstractSearch::class);
|
||||||
|
|
||||||
//set the mock as default
|
//set the mock as default
|
||||||
$mock->expects($this->any())
|
$mock->expects($this->any())
|
||||||
@ -267,7 +267,7 @@ final class SearchProviderTest extends TestCase
|
|||||||
private function createNonDefaultDomainSearchService($result, $order, $domain)
|
private function createNonDefaultDomainSearchService($result, $order, $domain)
|
||||||
{
|
{
|
||||||
$mock = $this
|
$mock = $this
|
||||||
->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
|
->getMockForAbstractClass(\Chill\MainBundle\Search\AbstractSearch::class);
|
||||||
|
|
||||||
//set the mock as default
|
//set the mock as default
|
||||||
$mock->expects($this->any())
|
$mock->expects($this->any())
|
||||||
|
@ -279,8 +279,8 @@ final class AuthorizationHelperTest extends KernelTestCase
|
|||||||
]);
|
]);
|
||||||
$helper = $this->getAuthorizationHelper();
|
$helper = $this->getAuthorizationHelper();
|
||||||
$entity = $this->getProphet()->prophesize();
|
$entity = $this->getProphet()->prophesize();
|
||||||
$entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
|
$entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
|
||||||
$entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
|
$entity->willImplement('\\' . \Chill\MainBundle\Entity\HasScopeInterface::class);
|
||||||
$entity->getCenter()->willReturn($center);
|
$entity->getCenter()->willReturn($center);
|
||||||
$entity->getScope()->willReturn($scope);
|
$entity->getScope()->willReturn($scope);
|
||||||
|
|
||||||
@ -386,7 +386,7 @@ final class AuthorizationHelperTest extends KernelTestCase
|
|||||||
]);
|
]);
|
||||||
$helper = $this->getAuthorizationHelper();
|
$helper = $this->getAuthorizationHelper();
|
||||||
$entity = $this->getProphet()->prophesize();
|
$entity = $this->getProphet()->prophesize();
|
||||||
$entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
|
$entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
|
||||||
$entity->getCenter()->willReturn($center);
|
$entity->getCenter()->willReturn($center);
|
||||||
|
|
||||||
$this->assertTrue($helper->userHasAccess(
|
$this->assertTrue($helper->userHasAccess(
|
||||||
@ -410,7 +410,7 @@ final class AuthorizationHelperTest extends KernelTestCase
|
|||||||
|
|
||||||
$helper = $this->getAuthorizationHelper();
|
$helper = $this->getAuthorizationHelper();
|
||||||
$entity = $this->getProphet()->prophesize();
|
$entity = $this->getProphet()->prophesize();
|
||||||
$entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
|
$entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
|
||||||
$entity->getCenter()->willReturn($center);
|
$entity->getCenter()->willReturn($center);
|
||||||
|
|
||||||
$this->assertTrue($helper->userHasAccess(
|
$this->assertTrue($helper->userHasAccess(
|
||||||
@ -434,8 +434,8 @@ final class AuthorizationHelperTest extends KernelTestCase
|
|||||||
]);
|
]);
|
||||||
$helper = $this->getAuthorizationHelper();
|
$helper = $this->getAuthorizationHelper();
|
||||||
$entity = $this->getProphet()->prophesize();
|
$entity = $this->getProphet()->prophesize();
|
||||||
$entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
|
$entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
|
||||||
$entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
|
$entity->willImplement('\\' . \Chill\MainBundle\Entity\HasScopeInterface::class);
|
||||||
$entity->getCenter()->willReturn($centerB);
|
$entity->getCenter()->willReturn($centerB);
|
||||||
$entity->getScope()->willReturn($scope);
|
$entity->getScope()->willReturn($scope);
|
||||||
|
|
||||||
@ -455,7 +455,7 @@ final class AuthorizationHelperTest extends KernelTestCase
|
|||||||
]);
|
]);
|
||||||
$helper = $this->getAuthorizationHelper();
|
$helper = $this->getAuthorizationHelper();
|
||||||
$entity = $this->getProphet()->prophesize();
|
$entity = $this->getProphet()->prophesize();
|
||||||
$entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
|
$entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
|
||||||
$entity->getCenter()->willReturn($center);
|
$entity->getCenter()->willReturn($center);
|
||||||
|
|
||||||
$this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
|
$this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
|
||||||
@ -474,8 +474,8 @@ final class AuthorizationHelperTest extends KernelTestCase
|
|||||||
]);
|
]);
|
||||||
$helper = $this->getAuthorizationHelper();
|
$helper = $this->getAuthorizationHelper();
|
||||||
$entity = $this->getProphet()->prophesize();
|
$entity = $this->getProphet()->prophesize();
|
||||||
$entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
|
$entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
|
||||||
$entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
|
$entity->willImplement('\\' . \Chill\MainBundle\Entity\HasScopeInterface::class);
|
||||||
$entity->getCenter()->willReturn($center);
|
$entity->getCenter()->willReturn($center);
|
||||||
$entity->getScope()->willReturn($scope);
|
$entity->getScope()->willReturn($scope);
|
||||||
|
|
||||||
@ -506,7 +506,7 @@ final class AuthorizationHelperTest extends KernelTestCase
|
|||||||
]);
|
]);
|
||||||
$helper = $this->getAuthorizationHelper();
|
$helper = $this->getAuthorizationHelper();
|
||||||
$entity = $this->getProphet()->prophesize();
|
$entity = $this->getProphet()->prophesize();
|
||||||
$entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
|
$entity->willImplement('\\' . \Chill\MainBundle\Entity\HasCenterInterface::class);
|
||||||
$entity->getCenter()->willReturn($centerA);
|
$entity->getCenter()->willReturn($centerA);
|
||||||
|
|
||||||
$this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
|
$this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
|
||||||
|
@ -162,7 +162,7 @@ final class PersonController extends AbstractController
|
|||||||
$cFGroup = null;
|
$cFGroup = null;
|
||||||
|
|
||||||
$cFDefaultGroup = $this->em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup::class)
|
$cFDefaultGroup = $this->em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup::class)
|
||||||
->findOneByEntity('Chill\\PersonBundle\\Entity\\Person');
|
->findOneByEntity(\Chill\PersonBundle\Entity\Person::class);
|
||||||
|
|
||||||
if ($cFDefaultGroup) {
|
if ($cFDefaultGroup) {
|
||||||
$cFGroup = $cFDefaultGroup->getCustomFieldsGroup();
|
$cFGroup = $cFDefaultGroup->getCustomFieldsGroup();
|
||||||
|
@ -125,12 +125,12 @@ class LoadCustomFields extends AbstractFixture implements
|
|||||||
// select a set of people and add data
|
// select a set of people and add data
|
||||||
foreach ($personIds as $id) {
|
foreach ($personIds as $id) {
|
||||||
// add info on 1 person on 2
|
// add info on 1 person on 2
|
||||||
if (mt_rand(0, 1) === 1) {
|
if (random_int(0, 1) === 1) {
|
||||||
/** @var Person $person */
|
/** @var Person $person */
|
||||||
$person = $manager->getRepository(Person::class)->find($id);
|
$person = $manager->getRepository(Person::class)->find($id);
|
||||||
$person->setCFData([
|
$person->setCFData([
|
||||||
'remarques' => $this->createCustomFieldText()
|
'remarques' => $this->createCustomFieldText()
|
||||||
->serialize($faker->text(mt_rand(150, 250)), $this->customFieldText),
|
->serialize($faker->text(random_int(150, 250)), $this->customFieldText),
|
||||||
'document-d-identite' => $this->createCustomFieldChoice()
|
'document-d-identite' => $this->createCustomFieldChoice()
|
||||||
->serialize([$choices[array_rand($choices)]], $this->customFieldChoice),
|
->serialize([$choices[array_rand($choices)]], $this->customFieldChoice),
|
||||||
]);
|
]);
|
||||||
|
@ -1006,7 +1006,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
|
|||||||
'property' => 'step',
|
'property' => 'step',
|
||||||
],
|
],
|
||||||
'supports' => [
|
'supports' => [
|
||||||
'Chill\PersonBundle\Entity\AccompanyingPeriod',
|
\Chill\PersonBundle\Entity\AccompanyingPeriod::class,
|
||||||
],
|
],
|
||||||
'initial_marking' => 'DRAFT',
|
'initial_marking' => 'DRAFT',
|
||||||
'places' => [
|
'places' => [
|
||||||
@ -1043,7 +1043,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
|
|||||||
$container->prependExtensionConfig(
|
$container->prependExtensionConfig(
|
||||||
'chill_custom_fields',
|
'chill_custom_fields',
|
||||||
['customizables_entities' => [
|
['customizables_entities' => [
|
||||||
['class' => 'Chill\PersonBundle\Entity\Person', 'name' => 'PersonEntity'],
|
['class' => \Chill\PersonBundle\Entity\Person::class, 'name' => 'PersonEntity'],
|
||||||
],
|
],
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
@ -30,7 +30,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
public function getConfigTreeBuilder()
|
public function getConfigTreeBuilder()
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('cl_chill_person');
|
$treeBuilder = new TreeBuilder('cl_chill_person');
|
||||||
$rootNode = $treeBuilder->getRootNode('cl_chill_person');
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
|
|
||||||
$rootNode
|
$rootNode
|
||||||
->canBeDisabled()
|
->canBeDisabled()
|
||||||
@ -137,7 +137,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
private function addFieldNode($key)
|
private function addFieldNode($key)
|
||||||
{
|
{
|
||||||
$tree = new TreeBuilder($key, 'enum');
|
$tree = new TreeBuilder($key, 'enum');
|
||||||
$node = $tree->getRootNode($key);
|
$node = $tree->getRootNode();
|
||||||
|
|
||||||
switch ($key) {
|
switch ($key) {
|
||||||
case 'accompanying_period':
|
case 'accompanying_period':
|
||||||
|
@ -200,7 +200,7 @@ class Household
|
|||||||
*/
|
*/
|
||||||
public function getCurrentAddress(?DateTime $at = null): ?Address
|
public function getCurrentAddress(?DateTime $at = null): ?Address
|
||||||
{
|
{
|
||||||
$at = null === $at ? new DateTime('today') : $at;
|
$at = $at ?? new DateTime('today');
|
||||||
|
|
||||||
$addrs = $this->getAddresses()->filter(static function (Address $a) use ($at) {
|
$addrs = $this->getAddresses()->filter(static function (Address $a) use ($at) {
|
||||||
return $a->getValidFrom() <= $at && (
|
return $a->getValidFrom() <= $at && (
|
||||||
@ -412,7 +412,7 @@ class Household
|
|||||||
{
|
{
|
||||||
$criteria = new Criteria();
|
$criteria = new Criteria();
|
||||||
$expr = Criteria::expr();
|
$expr = Criteria::expr();
|
||||||
$date = null === $now ? (new DateTimeImmutable('today')) : $now;
|
$date = $now ?? new DateTimeImmutable('today');
|
||||||
|
|
||||||
$criteria
|
$criteria
|
||||||
->where(
|
->where(
|
||||||
@ -634,7 +634,7 @@ class Household
|
|||||||
{
|
{
|
||||||
$criteria = new Criteria();
|
$criteria = new Criteria();
|
||||||
$expr = Criteria::expr();
|
$expr = Criteria::expr();
|
||||||
$date = null === $now ? (new DateTimeImmutable('today')) : $now;
|
$date = $now ?? new DateTimeImmutable('today');
|
||||||
|
|
||||||
$criteria
|
$criteria
|
||||||
->where($expr->orX(
|
->where($expr->orX(
|
||||||
|
@ -142,7 +142,7 @@ class HouseholdMember
|
|||||||
|
|
||||||
public function isCurrent(?DateTimeImmutable $at = null): bool
|
public function isCurrent(?DateTimeImmutable $at = null): bool
|
||||||
{
|
{
|
||||||
$at = null === $at ? new DateTimeImmutable('now') : $at;
|
$at = $at ?? new DateTimeImmutable('now');
|
||||||
|
|
||||||
return $this->getStartDate() < $at && (
|
return $this->getStartDate() < $at && (
|
||||||
null === $this->getEndDate() || $this->getEndDate() > $at
|
null === $this->getEndDate() || $this->getEndDate() > $at
|
||||||
|
@ -1087,7 +1087,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
|
|||||||
{
|
{
|
||||||
$criteria = new Criteria();
|
$criteria = new Criteria();
|
||||||
$expr = Criteria::expr();
|
$expr = Criteria::expr();
|
||||||
$date = null === $at ? new DateTimeImmutable('today') : $at;
|
$date = $at ?? new DateTimeImmutable('today');
|
||||||
$datef = $date->format('Y-m-d');
|
$datef = $date->format('Y-m-d');
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
@ -42,8 +42,8 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
|
|||||||
{
|
{
|
||||||
$where = $qb->getDQLPart('where');
|
$where = $qb->getDQLPart('where');
|
||||||
|
|
||||||
$min = null !== $data['min_age'] ? $data['min_age'] : 0;
|
$min = $data['min_age'] ?? 0;
|
||||||
$max = null !== $data['max_age'] ? $data['max_age'] : 150;
|
$max = $data['max_age'] ?? 150;
|
||||||
$calc = $this->rollingDateConverter->convert($data['date_calc']);
|
$calc = $this->rollingDateConverter->convert($data['date_calc']);
|
||||||
|
|
||||||
$minDate = $calc->sub(new DateInterval('P' . $max . 'Y'));
|
$minDate = $calc->sub(new DateInterval('P' . $max . 'Y'));
|
||||||
|
@ -98,7 +98,7 @@ class AccompanyingPeriodType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\PersonBundle\Entity\AccompanyingPeriod',
|
'data_class' => \Chill\PersonBundle\Entity\AccompanyingPeriod::class,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$resolver
|
$resolver
|
||||||
|
@ -250,7 +250,7 @@ class PersonType extends AbstractType
|
|||||||
|
|
||||||
$resolver->setAllowedTypes(
|
$resolver->setAllowedTypes(
|
||||||
'cFGroup',
|
'cFGroup',
|
||||||
['null', 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup']
|
['null', \Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,13 +40,13 @@ class Select2MaritalStatusType extends AbstractType
|
|||||||
|
|
||||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||||
{
|
{
|
||||||
$transformer = new ObjectToIdTransformer($this->em, 'Chill\PersonBundle\Entity\MaritalStatus');
|
$transformer = new ObjectToIdTransformer($this->em, \Chill\PersonBundle\Entity\MaritalStatus::class);
|
||||||
$builder->addModelTransformer($transformer);
|
$builder->addModelTransformer($transformer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$maritalStatuses = $this->em->getRepository('Chill\PersonBundle\Entity\MaritalStatus')->findAll();
|
$maritalStatuses = $this->em->getRepository(\Chill\PersonBundle\Entity\MaritalStatus::class)->findAll();
|
||||||
$choices = [];
|
$choices = [];
|
||||||
|
|
||||||
foreach ($maritalStatuses as $ms) {
|
foreach ($maritalStatuses as $ms) {
|
||||||
|
@ -168,7 +168,7 @@ class MembersEditor
|
|||||||
$criteria->where(
|
$criteria->where(
|
||||||
$expr->andX(
|
$expr->andX(
|
||||||
$expr->lt('startDate', $date),
|
$expr->lt('startDate', $date),
|
||||||
$expr->isNull('endDate', $date)
|
$expr->isNull('endDate')
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ class ResidentialAddressRepository extends ServiceEntityRepository
|
|||||||
|
|
||||||
public function buildQueryFindCurrentResidentialAddresses(Person $person, ?DateTimeImmutable $at = null): QueryBuilder
|
public function buildQueryFindCurrentResidentialAddresses(Person $person, ?DateTimeImmutable $at = null): QueryBuilder
|
||||||
{
|
{
|
||||||
$date = null === $at ? new DateTimeImmutable('today') : $at;
|
$date = $at ?? new DateTimeImmutable('today');
|
||||||
$qb = $this->createQueryBuilder('ra');
|
$qb = $this->createQueryBuilder('ra');
|
||||||
|
|
||||||
$dateFilter = $qb->expr()->andX(
|
$dateFilter = $qb->expr()->andX(
|
||||||
|
@ -34,7 +34,7 @@ class OldDraftAccompanyingPeriodRemover implements OldDraftAccompanyingPeriodRem
|
|||||||
|
|
||||||
public function remove(DateInterval $interval): void
|
public function remove(DateInterval $interval): void
|
||||||
{
|
{
|
||||||
$this->logger->debug('[' . __CLASS__ . '] start to remove old periods', [
|
$this->logger->debug('[' . self::class . '] start to remove old periods', [
|
||||||
'interval' => $interval->format('%d days'),
|
'interval' => $interval->format('%d days'),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@ -96,7 +96,7 @@ class OldDraftAccompanyingPeriodRemover implements OldDraftAccompanyingPeriodRem
|
|||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
$this->logger->info('[' . __CLASS__ . '] periods removed', array_merge($results, [
|
$this->logger->info('[' . self::class . '] periods removed', array_merge($results, [
|
||||||
'interval' => $interval->format('%d days'),
|
'interval' => $interval->format('%d days'),
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
@ -162,7 +162,7 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
|
|||||||
->setNextMembership($nextMembership);
|
->setNextMembership($nextMembership);
|
||||||
|
|
||||||
$notificationPersister = $this->prophesize(NotificationPersisterInterface::class);
|
$notificationPersister = $this->prophesize(NotificationPersisterInterface::class);
|
||||||
$notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalled(1);
|
$notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalled();
|
||||||
$eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null);
|
$eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null);
|
||||||
|
|
||||||
$eventSubscriber->resetPeriodLocation($event);
|
$eventSubscriber->resetPeriodLocation($event);
|
||||||
|
@ -89,7 +89,7 @@ final class PersonControllerCreateTest extends WebTestCase
|
|||||||
$form = $crawler->selectButton('Ajouter la personne')->form();
|
$form = $crawler->selectButton('Ajouter la personne')->form();
|
||||||
|
|
||||||
$this->assertInstanceOf(
|
$this->assertInstanceOf(
|
||||||
'Symfony\Component\DomCrawler\Form',
|
\Symfony\Component\DomCrawler\Form::class,
|
||||||
$form,
|
$form,
|
||||||
'The page contains a butto '
|
'The page contains a butto '
|
||||||
);
|
);
|
||||||
|
@ -158,7 +158,7 @@ final class PersonVoterTest extends KernelTestCase
|
|||||||
{
|
{
|
||||||
$token = $this->prophet->prophesize();
|
$token = $this->prophet->prophesize();
|
||||||
$token
|
$token
|
||||||
->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
|
->willImplement('\\' . \Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
|
||||||
|
|
||||||
if (null === $permissions) {
|
if (null === $permissions) {
|
||||||
$token->getUser()->willReturn(null);
|
$token->getUser()->willReturn(null);
|
||||||
|
@ -88,7 +88,7 @@ final class AccompanyingPeriodWorkDocGenNormalizerTest extends KernelTestCase
|
|||||||
$this->assertEqualsCanonicalizing(array_keys($expected), array_keys($actual));
|
$this->assertEqualsCanonicalizing(array_keys($expected), array_keys($actual));
|
||||||
|
|
||||||
foreach ($expected as $key => $item) {
|
foreach ($expected as $key => $item) {
|
||||||
if ('@ignored' === $item) {
|
if (0 === $item) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -187,8 +187,7 @@ final class PersonContextTest extends TestCase
|
|||||||
{
|
{
|
||||||
$builder = $this->prophesize(FormBuilderInterface::class);
|
$builder = $this->prophesize(FormBuilderInterface::class);
|
||||||
|
|
||||||
$builder->add('title', TextType::class, Argument::type('array'))
|
$builder->add('title', TextType::class, Argument::type('array'))->shouldBeCalled();
|
||||||
->shouldBeCalled(1);
|
|
||||||
|
|
||||||
if ($withScope) {
|
if ($withScope) {
|
||||||
$builder->add('scope', ScopePickerType::class, Argument::type('array'))
|
$builder->add('scope', ScopePickerType::class, Argument::type('array'))
|
||||||
|
@ -344,7 +344,7 @@ class ReportController extends AbstractController
|
|||||||
}
|
}
|
||||||
|
|
||||||
$cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
|
$cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
|
||||||
->findByEntity('Chill\ReportBundle\Entity\Report');
|
->findByEntity(\Chill\ReportBundle\Entity\Report::class);
|
||||||
|
|
||||||
if (count($cFGroups) === 1) {
|
if (count($cFGroups) === 1) {
|
||||||
return $this->redirect(
|
return $this->redirect(
|
||||||
@ -403,7 +403,7 @@ class ReportController extends AbstractController
|
|||||||
$em = $this->getDoctrine()->getManager();
|
$em = $this->getDoctrine()->getManager();
|
||||||
|
|
||||||
$cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
|
$cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
|
||||||
->findByEntity('Chill\ReportBundle\Entity\Report');
|
->findByEntity(\Chill\ReportBundle\Entity\Report::class);
|
||||||
|
|
||||||
if (count($cFGroups) === 1) {
|
if (count($cFGroups) === 1) {
|
||||||
return $this->redirect(
|
return $this->redirect(
|
||||||
|
@ -68,15 +68,15 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
|
|||||||
];
|
];
|
||||||
|
|
||||||
for ($i = 0; 25 >= $i; ++$i) {
|
for ($i = 0; 25 >= $i; ++$i) {
|
||||||
$cFType = $cFTypes[mt_rand(0, count($cFTypes) - 1)];
|
$cFType = $cFTypes[random_int(0, count($cFTypes) - 1)];
|
||||||
|
|
||||||
$customField = (new CustomField())
|
$customField = (new CustomField())
|
||||||
->setSlug("cf_report_{$i}")
|
->setSlug("cf_report_{$i}")
|
||||||
->setType($cFType['type'])
|
->setType($cFType['type'])
|
||||||
->setOptions($cFType['options'])
|
->setOptions($cFType['options'])
|
||||||
->setName(['fr' => "CustomField {$i}"])
|
->setName(['fr' => "CustomField {$i}"])
|
||||||
->setOrdering(mt_rand(0, 1000) / 1000)
|
->setOrdering(random_int(0, 1000) / 1000)
|
||||||
->setCustomFieldsGroup($this->getReference('cf_group_report_' . (mt_rand(0, 3))));
|
->setCustomFieldsGroup($this->getReference('cf_group_report_' . (random_int(0, 3))));
|
||||||
|
|
||||||
$manager->persist($customField);
|
$manager->persist($customField);
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ class LoadCustomFieldsGroup extends AbstractFixture implements OrderedFixtureInt
|
|||||||
|
|
||||||
$cFGroup = (new CustomFieldsGroup())
|
$cFGroup = (new CustomFieldsGroup())
|
||||||
->setName($name)
|
->setName($name)
|
||||||
->setEntity('Chill\ReportBundle\Entity\Report')
|
->setEntity(\Chill\ReportBundle\Entity\Report::class)
|
||||||
->setOptions($options);
|
->setOptions($options);
|
||||||
|
|
||||||
$manager->persist($cFGroup);
|
$manager->persist($cFGroup);
|
||||||
|
@ -88,7 +88,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
|
|||||||
$report = (new Report())
|
$report = (new Report())
|
||||||
->setPerson($person)
|
->setPerson($person)
|
||||||
->setCFGroup(
|
->setCFGroup(
|
||||||
mt_rand(0, 10) > 5 ?
|
random_int(0, 10) > 5 ?
|
||||||
$this->getReference('cf_group_report_logement') :
|
$this->getReference('cf_group_report_logement') :
|
||||||
$this->getReference('cf_group_report_education')
|
$this->getReference('cf_group_report_education')
|
||||||
)
|
)
|
||||||
@ -111,7 +111,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
|
|||||||
//set date. 30% of the dates are 2015-05-01
|
//set date. 30% of the dates are 2015-05-01
|
||||||
$expectedDate = new DateTime('2015-01-05');
|
$expectedDate = new DateTime('2015-01-05');
|
||||||
|
|
||||||
if (mt_rand(0, 100) < 30) {
|
if (random_int(0, 100) < 30) {
|
||||||
$report->setDate($expectedDate);
|
$report->setDate($expectedDate);
|
||||||
} else {
|
} else {
|
||||||
$report->setDate($this->faker->dateTimeBetween('-1 year', 'now')
|
$report->setDate($this->faker->dateTimeBetween('-1 year', 'now')
|
||||||
@ -155,7 +155,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
|
|||||||
$selectedPeople = [];
|
$selectedPeople = [];
|
||||||
|
|
||||||
foreach ($people as $person) {
|
foreach ($people as $person) {
|
||||||
if (mt_rand(0, 100) < $percentage) {
|
if (random_int(0, 100) < $percentage) {
|
||||||
$selectedPeople[] = $person;
|
$selectedPeople[] = $person;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -183,7 +183,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
|
|||||||
$picked = [];
|
$picked = [];
|
||||||
|
|
||||||
if ($multiple) {
|
if ($multiple) {
|
||||||
$numberSelected = mt_rand(1, count($choices) - 1);
|
$numberSelected = random_int(1, count($choices) - 1);
|
||||||
|
|
||||||
for ($i = 0; $i < $numberSelected; ++$i) {
|
for ($i = 0; $i < $numberSelected; ++$i) {
|
||||||
$picked[] = $this->pickChoice($choices);
|
$picked[] = $this->pickChoice($choices);
|
||||||
|
@ -41,7 +41,7 @@ class ChillReportExtension extends Extension implements PrependExtensionInterfac
|
|||||||
'chill_custom_fields',
|
'chill_custom_fields',
|
||||||
['customizables_entities' => [
|
['customizables_entities' => [
|
||||||
[
|
[
|
||||||
'class' => 'Chill\ReportBundle\Entity\Report',
|
'class' => \Chill\ReportBundle\Entity\Report::class,
|
||||||
'name' => 'ReportEntity',
|
'name' => 'ReportEntity',
|
||||||
'options' => [
|
'options' => [
|
||||||
'summary_fields' => [
|
'summary_fields' => [
|
||||||
|
@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
public function getConfigTreeBuilder()
|
public function getConfigTreeBuilder()
|
||||||
{
|
{
|
||||||
$treeBuilder = new TreeBuilder('chill_report');
|
$treeBuilder = new TreeBuilder('chill_report');
|
||||||
$rootNode = $treeBuilder->getRootNode('chill_report');
|
$rootNode = $treeBuilder->getRootNode();
|
||||||
|
|
||||||
// Here you should define the parameters that are allowed to
|
// Here you should define the parameters that are allowed to
|
||||||
// configure your bundle. See the documentation linked above for
|
// configure your bundle. See the documentation linked above for
|
||||||
|
@ -88,14 +88,14 @@ class ReportType extends AbstractType
|
|||||||
public function configureOptions(OptionsResolver $resolver)
|
public function configureOptions(OptionsResolver $resolver)
|
||||||
{
|
{
|
||||||
$resolver->setDefaults([
|
$resolver->setDefaults([
|
||||||
'data_class' => 'Chill\ReportBundle\Entity\Report',
|
'data_class' => \Chill\ReportBundle\Entity\Report::class,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$resolver->setRequired([
|
$resolver->setRequired([
|
||||||
'cFGroup',
|
'cFGroup',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$resolver->setAllowedTypes('cFGroup', 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup');
|
$resolver->setAllowedTypes('cFGroup', \Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class);
|
||||||
|
|
||||||
$this->appendScopeChoicesOptions($resolver);
|
$this->appendScopeChoicesOptions($resolver);
|
||||||
}
|
}
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user