fixes after merge of master into upgrade-sf4

This commit is contained in:
2024-02-12 22:31:16 +01:00
parent 37af488f69
commit f889d67e94
664 changed files with 795 additions and 1980 deletions

View File

@@ -13,6 +13,4 @@ namespace Chill\AsideActivityBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;
class ChillAsideActivityBundle extends Bundle
{
}
class ChillAsideActivityBundle extends Bundle {}

View File

@@ -14,28 +14,32 @@ namespace Chill\AsideActivityBundle\Controller;
use Chill\AsideActivityBundle\Entity\AsideActivity;
use Chill\AsideActivityBundle\Repository\AsideActivityCategoryRepository;
use Chill\MainBundle\CRUD\Controller\CRUDController;
use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Pagination\PaginatorInterface;
use Chill\MainBundle\Security\ChillSecurity;
use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Security\Core\Security;
final class AsideActivityController extends CRUDController
{
public function __construct(private readonly AsideActivityCategoryRepository $categoryRepository)
{
}
public function __construct(
private readonly AsideActivityCategoryRepository $categoryRepository,
private readonly Security $security
) {}
public function createEntity(string $action, Request $request): object
{
if (!$this->security->isGranted('ROLE_USER')) {
$user = $this->security->getUser();
if (!$this->security->isGranted('ROLE_USER') || !$user instanceof User) {
throw new AccessDeniedHttpException();
}
$asideActivity = new AsideActivity();
$asideActivity->setAgent($this->security->getUser());
$asideActivity->setLocation($this->security->getUser()->getCurrentLocation());
$asideActivity->setAgent($user);
$asideActivity->setLocation($user->getCurrentLocation());
$duration = $request->query->get('duration', '300');
$duration = \DateTime::createFromFormat('U', $duration);

View File

@@ -20,9 +20,7 @@ use Doctrine\Persistence\ObjectManager;
class LoadAsideActivity extends Fixture implements DependentFixtureInterface
{
public function __construct(private readonly UserRepository $userRepository)
{
}
public function __construct(private readonly UserRepository $userRepository) {}
public function getDependencies(): array
{

View File

@@ -23,8 +23,7 @@ class ByActivityTypeAggregator implements AggregatorInterface
public function __construct(
private readonly AsideActivityCategoryRepository $asideActivityCategoryRepository,
private readonly TranslatableStringHelper $translatableStringHelper
) {
}
) {}
public function addRole(): ?string
{

View File

@@ -19,9 +19,7 @@ use Symfony\Component\Form\FormBuilderInterface;
class ByLocationAggregator implements AggregatorInterface
{
public function __construct(private readonly LocationRepository $locationRepository)
{
}
public function __construct(private readonly LocationRepository $locationRepository) {}
public function buildForm(FormBuilderInterface $builder): void
{

View File

@@ -27,8 +27,7 @@ class ByUserJobAggregator implements AggregatorInterface
public function __construct(
private readonly UserJobRepositoryInterface $userJobRepository,
private readonly TranslatableStringHelperInterface $translatableStringHelper
) {
}
) {}
public function addRole(): ?string
{
@@ -66,9 +65,7 @@ class ByUserJobAggregator implements AggregatorInterface
return Declarations::ASIDE_ACTIVITY_TYPE;
}
public function buildForm(FormBuilderInterface $builder)
{
}
public function buildForm(FormBuilderInterface $builder) {}
public function getFormDefaultData(): array
{

View File

@@ -27,8 +27,7 @@ class ByUserScopeAggregator implements AggregatorInterface
public function __construct(
private readonly ScopeRepositoryInterface $scopeRepository,
private readonly TranslatableStringHelperInterface $translatableStringHelper
) {
}
) {}
public function addRole(): ?string
{
@@ -65,9 +64,7 @@ class ByUserScopeAggregator implements AggregatorInterface
return Declarations::ASIDE_ACTIVITY_TYPE;
}
public function buildForm(FormBuilderInterface $builder)
{
}
public function buildForm(FormBuilderInterface $builder) {}
public function getFormDefaultData(): array
{

View File

@@ -22,13 +22,9 @@ use Symfony\Component\Form\FormBuilderInterface;
class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterface
{
public function __construct(private readonly AsideActivityRepository $repository)
{
}
public function __construct(private readonly AsideActivityRepository $repository) {}
public function buildForm(FormBuilderInterface $builder)
{
}
public function buildForm(FormBuilderInterface $builder) {}
public function getFormDefaultData(): array
{

View File

@@ -22,13 +22,9 @@ use Symfony\Component\Form\FormBuilderInterface;
class CountAsideActivity implements ExportInterface, GroupedExportInterface
{
public function __construct(private readonly AsideActivityRepository $repository)
{
}
public function __construct(private readonly AsideActivityRepository $repository) {}
public function buildForm(FormBuilderInterface $builder)
{
}
public function buildForm(FormBuilderInterface $builder) {}
public function getFormDefaultData(): array
{

View File

@@ -42,12 +42,9 @@ final readonly class ListAsideActivity implements ListInterface, GroupedExportIn
private CategoryRender $categoryRender,
private LocationRepository $locationRepository,
private TranslatableStringHelperInterface $translatableStringHelper
) {
}
) {}
public function buildForm(FormBuilderInterface $builder)
{
}
public function buildForm(FormBuilderInterface $builder) {}
public function getFormDefaultData(): array
{

View File

@@ -22,13 +22,9 @@ use Symfony\Component\Form\FormBuilderInterface;
class SumAsideActivityDuration implements ExportInterface, GroupedExportInterface
{
public function __construct(private readonly AsideActivityRepository $repository)
{
}
public function __construct(private readonly AsideActivityRepository $repository) {}
public function buildForm(FormBuilderInterface $builder)
{
}
public function buildForm(FormBuilderInterface $builder) {}
public function getFormDefaultData(): array
{

View File

@@ -28,8 +28,7 @@ class ByActivityTypeFilter implements FilterInterface
private readonly CategoryRender $categoryRender,
private readonly TranslatableStringHelperInterface $translatableStringHelper,
private readonly AsideActivityCategoryRepository $asideActivityTypeRepository
) {
}
) {}
public function addRole(): ?string
{

View File

@@ -22,9 +22,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class ByDateFilter implements FilterInterface
{
public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter, protected TranslatorInterface $translator)
{
}
public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter, protected TranslatorInterface $translator) {}
public function addRole(): ?string
{

View File

@@ -25,8 +25,7 @@ final readonly class ByLocationFilter implements FilterInterface
{
public function __construct(
private Security $security
) {
}
) {}
public function getTitle(): string
{

View File

@@ -20,9 +20,7 @@ use Symfony\Component\Form\FormBuilderInterface;
class ByUserFilter implements FilterInterface
{
public function __construct(private readonly UserRender $userRender)
{
}
public function __construct(private readonly UserRender $userRender) {}
public function addRole(): ?string
{

View File

@@ -28,8 +28,7 @@ class ByUserJobFilter implements FilterInterface
public function __construct(
private readonly TranslatableStringHelperInterface $translatableStringHelper
) {
}
) {}
public function addRole(): ?string
{

View File

@@ -30,8 +30,7 @@ class ByUserScopeFilter implements FilterInterface
public function __construct(
private readonly ScopeRepositoryInterface $scopeRepository,
private readonly TranslatableStringHelperInterface $translatableStringHelper
) {
}
) {}
public function addRole(): ?string
{

View File

@@ -22,9 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
final class AsideActivityCategoryType extends AbstractType
{
public function __construct(private readonly CategoryRender $categoryRender)
{
}
public function __construct(private readonly CategoryRender $categoryRender) {}
public function buildForm(FormBuilderInterface $builder, array $options)
{

View File

@@ -20,9 +20,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
final class PickAsideActivityCategoryType extends AbstractType
{
public function __construct(private readonly CategoryRender $categoryRender)
{
}
public function __construct(private readonly CategoryRender $categoryRender) {}
public function configureOptions(OptionsResolver $resolver)
{

View File

@@ -16,9 +16,7 @@ use Symfony\Component\Security\Core\Security;
final readonly class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
{
public function __construct(private Security $security)
{
}
public function __construct(private Security $security) {}
public function buildMenu($menuId, MenuItem $menu, array $parameters)
{

View File

@@ -21,9 +21,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
*/
class SectionMenuBuilder implements LocalMenuBuilderInterface
{
public function __construct(protected TranslatorInterface $translator, public AuthorizationCheckerInterface $authorizationChecker)
{
}
public function __construct(protected TranslatorInterface $translator, public AuthorizationCheckerInterface $authorizationChecker) {}
public function buildMenu($menuId, MenuItem $menu, array $parameters)
{

View File

@@ -26,9 +26,7 @@ final readonly class CategoryRender implements ChillEntityRenderInterface
public const SEPERATOR_KEY = 'default.separator';
public function __construct(private TranslatableStringHelper $translatableStringHelper, private \Twig\Environment $engine)
{
}
public function __construct(private TranslatableStringHelper $translatableStringHelper, private \Twig\Environment $engine) {}
public function buildParents(AsideActivityCategory $asideActivityCategory)
{