apply rector rules

This commit is contained in:
Julien Fastré 2024-05-28 14:58:09 +02:00
parent 84f515d451
commit 06dd7dd4f5
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
15 changed files with 38 additions and 56 deletions

View File

@ -4,3 +4,11 @@ parameters:
message: "#^Parameter \\#1 \\$records of method League\\\\Csv\\\\Writer\\:\\:insertAll\\(\\) expects iterable\\<array\\<float\\|int\\|string\\|Stringable\\|null\\>\\>, iterable\\<array\\<string, bool\\|int\\|string\\>\\> given\\.$#"
count: 1
path: src/Bundle/ChillMainBundle/Controller/UserExportController.php
-
message: """
#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
use Order\\:\\:Ascending instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

View File

@ -46,9 +46,7 @@ final readonly class WebdavController
$this->requestAnalyzer = new PropfindRequestAnalyzer();
}
/**
* @Route("/dav/{access_token}/get/{uuid}/", methods={"GET", "HEAD"}, name="chill_docstore_dav_directory_get")
*/
#[Route(path: '/dav/{access_token}/get/{uuid}/', methods: ['GET', 'HEAD'], name: 'chill_docstore_dav_directory_get')]
public function getDirectory(StoredObject $storedObject, string $access_token): Response
{
if (!$this->security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)) {
@ -63,9 +61,7 @@ final readonly class WebdavController
);
}
/**
* @Route("/dav/{access_token}/get/{uuid}/", methods={"OPTIONS"})
*/
#[Route(path: '/dav/{access_token}/get/{uuid}/', methods: ['OPTIONS'])]
public function optionsDirectory(StoredObject $storedObject): Response
{
if (!$this->security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)) {
@ -82,9 +78,7 @@ final readonly class WebdavController
return $response;
}
/**
* @Route("/dav/{access_token}/get/{uuid}/", methods={"PROPFIND"})
*/
#[Route(path: '/dav/{access_token}/get/{uuid}/', methods: ['PROPFIND'])]
public function propfindDirectory(StoredObject $storedObject, string $access_token, Request $request): Response
{
if (!$this->security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)) {
@ -119,9 +113,7 @@ final readonly class WebdavController
return $response;
}
/**
* @Route("/dav/{access_token}/get/{uuid}/d", name="chill_docstore_dav_document_get", methods={"GET"})
*/
#[Route(path: '/dav/{access_token}/get/{uuid}/d', name: 'chill_docstore_dav_document_get', methods: ['GET'])]
public function getDocument(StoredObject $storedObject): Response
{
if (!$this->security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)) {
@ -132,9 +124,7 @@ final readonly class WebdavController
->setEtag($this->storedObjectManager->etag($storedObject));
}
/**
* @Route("/dav/{access_token}/get/{uuid}/d", methods={"HEAD"})
*/
#[Route(path: '/dav/{access_token}/get/{uuid}/d', methods: ['HEAD'])]
public function headDocument(StoredObject $storedObject): Response
{
if (!$this->security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)) {
@ -154,9 +144,7 @@ final readonly class WebdavController
return $response;
}
/**
* @Route("/dav/{access_token}/get/{uuid}/d", methods={"OPTIONS"})
*/
#[Route(path: '/dav/{access_token}/get/{uuid}/d', methods: ['OPTIONS'])]
public function optionsDocument(StoredObject $storedObject): Response
{
if (!$this->security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)) {
@ -172,9 +160,7 @@ final readonly class WebdavController
return $response;
}
/**
* @Route("/dav/{access_token}/get/{uuid}/d", methods={"PROPFIND"})
*/
#[Route(path: '/dav/{access_token}/get/{uuid}/d', methods: ['PROPFIND'])]
public function propfindDocument(StoredObject $storedObject, string $access_token, Request $request): Response
{
if (!$this->security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)) {
@ -206,9 +192,7 @@ final readonly class WebdavController
return $response;
}
/**
* @Route("/dav/{access_token}/get/{uuid}/d", methods={"PUT"})
*/
#[Route(path: '/dav/{access_token}/get/{uuid}/d', methods: ['PUT'])]
public function putDocument(StoredObject $storedObject, Request $request): Response
{
if (!$this->security->isGranted(StoredObjectRoleEnum::EDIT->value, $storedObject)) {

View File

@ -11,6 +11,4 @@ declare(strict_types=1);
namespace Chill\DocStoreBundle\Dav\Exception;
class ParseRequestException extends \UnexpectedValueException
{
}
class ParseRequestException extends \UnexpectedValueException {}

View File

@ -18,14 +18,12 @@ use Symfony\Component\Form\FormInterface;
class StoredObjectDataMapper implements DataMapperInterface
{
public function __construct()
{
}
public function __construct() {}
/**
* @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
*/
public function mapDataToForms($viewData, $forms)
public function mapDataToForms($viewData, \Traversable $forms)
{
if (null === $viewData) {
return;
@ -45,7 +43,7 @@ class StoredObjectDataMapper implements DataMapperInterface
/**
* @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
*/
public function mapFormsToData($forms, &$viewData)
public function mapFormsToData(\Traversable $forms, &$viewData)
{
$forms = iterator_to_array($forms);

View File

@ -21,8 +21,7 @@ class StoredObjectDataTransformer implements DataTransformerInterface
{
public function __construct(
private readonly SerializerInterface $serializer
) {
}
) {}
public function transform(mixed $value): mixed
{

View File

@ -28,8 +28,7 @@ final class StoredObjectType extends AbstractType
public function __construct(
private readonly StoredObjectDataTransformer $storedObjectDataTransformer,
private readonly StoredObjectDataMapper $storedObjectDataMapper,
) {
}
) {}
public function buildForm(FormBuilderInterface $builder, array $options)
{

View File

@ -27,8 +27,7 @@ final readonly class DavOnUrlTokenExtractor implements TokenExtractorInterface
{
public function __construct(
private LoggerInterface $logger,
) {
}
) {}
public function extract(Request $request): false|string
{

View File

@ -24,8 +24,7 @@ final readonly class JWTDavTokenProvider implements JWTDavTokenProviderInterface
public function __construct(
private JWTTokenManagerInterface $JWTTokenManager,
private Security $security,
) {
}
) {}
public function createToken(StoredObject $storedObject, StoredObjectRoleEnum $roleEnum): string
{

View File

@ -33,8 +33,7 @@ final class StoredObjectNormalizer implements NormalizerInterface, NormalizerAwa
public function __construct(
private readonly JWTDavTokenProviderInterface $JWTDavTokenProvider,
private readonly UrlGeneratorInterface $urlGenerator
) {
}
) {}
public function normalize($object, ?string $format = null, array $context = [])
{

View File

@ -128,8 +128,7 @@ final readonly class WopiEditTwigExtensionRuntime implements RuntimeExtensionInt
private NormalizerInterface $normalizer,
private JWTDavTokenProviderInterface $davTokenProvider,
private UrlGeneratorInterface $urlGenerator,
) {
}
) {}
/**
* return true if the document is editable.

View File

@ -36,7 +36,7 @@ class WebdavControllerTest extends KernelTestCase
{
self::bootKernel();
$this->engine = self::$container->get(\Twig\Environment::class);
$this->engine = self::getContainer()->get(\Twig\Environment::class);
}
private function buildController(): WebdavController
@ -399,16 +399,12 @@ class MockedStoredObjectManager implements StoredObjectManagerInterface
return 'abcde';
}
public function write(StoredObject $document, string $clearContent): void
{
}
public function write(StoredObject $document, string $clearContent): void {}
public function etag(StoredObject $document): string
{
return 'ab56b4d92b40713acc5af89985d4b786';
}
public function clearCache(): void
{
}
public function clearCache(): void {}
}

View File

@ -47,7 +47,7 @@ class PropfindRequestAnalyzerTest extends TestCase
}
}
public function provideRequestedProperties(): iterable
public static function provideRequestedProperties(): iterable
{
yield [
<<<'XML'

View File

@ -85,7 +85,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
*/
#[Assert\Valid(traverse: true)]
#[ORM\OneToMany(targetEntity: EntityWorkflowStep::class, mappedBy: 'entityWorkflow', orphanRemoval: true, cascade: ['persist'])]
#[ORM\OrderBy(['transitionAt' => 'ASC', 'id' => 'ASC'])]
#[ORM\OrderBy(['transitionAt' => \Doctrine\Common\Collections\Criteria::ASC, 'id' => 'ASC'])]
private Collection $steps;
/**

View File

@ -40,7 +40,7 @@ class Household implements HasCentersInterface
#[Serializer\Groups(['write'])]
#[ORM\ManyToMany(targetEntity: Address::class, cascade: ['persist', 'remove', 'merge', 'detach'])]
#[ORM\JoinTable(name: 'chill_person_household_to_addresses')]
#[ORM\OrderBy(['validFrom' => 'DESC', 'id' => 'DESC'])]
#[ORM\OrderBy(['validFrom' => Criteria::DESC, 'id' => 'DESC'])]
private Collection $addresses;
#[ORM\Embedded(class: CommentEmbeddable::class, columnPrefix: 'comment_members_')]
@ -597,7 +597,7 @@ class Household implements HasCentersInterface
$addresses = $this->getAddressesOrdered();
for ($i = 0; \count($addresses) - 1 > $i; ++$i) {
if ($i === 0) {
if (0 === $i) {
continue;
}
if ($addresses[$i - 1]->getValidTo() !== $addresses[$i]->getValidFrom()) {

View File

@ -34,7 +34,11 @@ use Symfony\Component\Form\FormBuilderInterface;
class GeographicalUnitStatFilter implements FilterInterface
{
public function __construct(
private readonly GeographicalUnitRepositoryInterface $geographicalUnitRepository, private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter) {}
private readonly GeographicalUnitRepositoryInterface $geographicalUnitRepository,
private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
private readonly TranslatableStringHelperInterface $translatableStringHelper,
private readonly RollingDateConverterInterface $rollingDateConverter
) {}
public function addRole(): ?string
{