From 06dd7dd4f53a2a2be44435e04b5f7e414808746b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 28 May 2024 14:58:09 +0200 Subject: [PATCH] apply rector rules --- phpstan-baseline-2024-05.neon | 8 +++++ .../Controller/WebdavController.php | 32 +++++-------------- .../Dav/Exception/ParseRequestException.php | 4 +-- .../DataMapper/StoredObjectDataMapper.php | 8 ++--- .../StoredObjectDataTransformer.php | 3 +- .../Form/StoredObjectType.php | 3 +- .../Security/Guard/DavOnUrlTokenExtractor.php | 3 +- .../Security/Guard/JWTDavTokenProvider.php | 3 +- .../Normalizer/StoredObjectNormalizer.php | 3 +- .../WopiEditTwigExtensionRuntime.php | 3 +- .../Tests/Controller/WebdavControllerTest.php | 10 ++---- .../Request/PropfindRequestAnalyzerTest.php | 2 +- .../Entity/Workflow/EntityWorkflow.php | 2 +- .../Entity/Household/Household.php | 4 +-- .../GeographicalUnitStatFilter.php | 6 +++- 15 files changed, 38 insertions(+), 56 deletions(-) diff --git a/phpstan-baseline-2024-05.neon b/phpstan-baseline-2024-05.neon index 728ec4edc..12cb03856 100644 --- a/phpstan-baseline-2024-05.neon +++ b/phpstan-baseline-2024-05.neon @@ -4,3 +4,11 @@ parameters: message: "#^Parameter \\#1 \\$records of method League\\\\Csv\\\\Writer\\:\\:insertAll\\(\\) expects iterable\\\\>, iterable\\\\> 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 diff --git a/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php b/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php index 70aecbe1e..6e105f9ee 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php @@ -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)) { diff --git a/src/Bundle/ChillDocStoreBundle/Dav/Exception/ParseRequestException.php b/src/Bundle/ChillDocStoreBundle/Dav/Exception/ParseRequestException.php index 70fff1866..0c740be17 100644 --- a/src/Bundle/ChillDocStoreBundle/Dav/Exception/ParseRequestException.php +++ b/src/Bundle/ChillDocStoreBundle/Dav/Exception/ParseRequestException.php @@ -11,6 +11,4 @@ declare(strict_types=1); namespace Chill\DocStoreBundle\Dav\Exception; -class ParseRequestException extends \UnexpectedValueException -{ -} +class ParseRequestException extends \UnexpectedValueException {} diff --git a/src/Bundle/ChillDocStoreBundle/Form/DataMapper/StoredObjectDataMapper.php b/src/Bundle/ChillDocStoreBundle/Form/DataMapper/StoredObjectDataMapper.php index 3ec52134f..4f2f177b4 100644 --- a/src/Bundle/ChillDocStoreBundle/Form/DataMapper/StoredObjectDataMapper.php +++ b/src/Bundle/ChillDocStoreBundle/Form/DataMapper/StoredObjectDataMapper.php @@ -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); diff --git a/src/Bundle/ChillDocStoreBundle/Form/DataTransformer/StoredObjectDataTransformer.php b/src/Bundle/ChillDocStoreBundle/Form/DataTransformer/StoredObjectDataTransformer.php index 520b644b3..e06d8d7cc 100644 --- a/src/Bundle/ChillDocStoreBundle/Form/DataTransformer/StoredObjectDataTransformer.php +++ b/src/Bundle/ChillDocStoreBundle/Form/DataTransformer/StoredObjectDataTransformer.php @@ -21,8 +21,7 @@ class StoredObjectDataTransformer implements DataTransformerInterface { public function __construct( private readonly SerializerInterface $serializer - ) { - } + ) {} public function transform(mixed $value): mixed { diff --git a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php index 5badc458d..3e4ceb163 100644 --- a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php +++ b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php @@ -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) { diff --git a/src/Bundle/ChillDocStoreBundle/Security/Guard/DavOnUrlTokenExtractor.php b/src/Bundle/ChillDocStoreBundle/Security/Guard/DavOnUrlTokenExtractor.php index 543996f57..3881c6251 100644 --- a/src/Bundle/ChillDocStoreBundle/Security/Guard/DavOnUrlTokenExtractor.php +++ b/src/Bundle/ChillDocStoreBundle/Security/Guard/DavOnUrlTokenExtractor.php @@ -27,8 +27,7 @@ final readonly class DavOnUrlTokenExtractor implements TokenExtractorInterface { public function __construct( private LoggerInterface $logger, - ) { - } + ) {} public function extract(Request $request): false|string { diff --git a/src/Bundle/ChillDocStoreBundle/Security/Guard/JWTDavTokenProvider.php b/src/Bundle/ChillDocStoreBundle/Security/Guard/JWTDavTokenProvider.php index 24e89a3ba..0bd0cdb8e 100644 --- a/src/Bundle/ChillDocStoreBundle/Security/Guard/JWTDavTokenProvider.php +++ b/src/Bundle/ChillDocStoreBundle/Security/Guard/JWTDavTokenProvider.php @@ -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 { diff --git a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectNormalizer.php b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectNormalizer.php index 83bc85a9b..f6eb5a1cb 100644 --- a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectNormalizer.php +++ b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectNormalizer.php @@ -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 = []) { diff --git a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php index 3b6c32148..716cb422e 100644 --- a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php +++ b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php @@ -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. diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Controller/WebdavControllerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Controller/WebdavControllerTest.php index e7141199f..d116add92 100644 --- a/src/Bundle/ChillDocStoreBundle/Tests/Controller/WebdavControllerTest.php +++ b/src/Bundle/ChillDocStoreBundle/Tests/Controller/WebdavControllerTest.php @@ -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 {} } diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Dav/Request/PropfindRequestAnalyzerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Dav/Request/PropfindRequestAnalyzerTest.php index babe9932a..b3012f3c6 100644 --- a/src/Bundle/ChillDocStoreBundle/Tests/Dav/Request/PropfindRequestAnalyzerTest.php +++ b/src/Bundle/ChillDocStoreBundle/Tests/Dav/Request/PropfindRequestAnalyzerTest.php @@ -47,7 +47,7 @@ class PropfindRequestAnalyzerTest extends TestCase } } - public function provideRequestedProperties(): iterable + public static function provideRequestedProperties(): iterable { yield [ <<<'XML' diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php index be2676e35..6df054b61 100644 --- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php +++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php @@ -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; /** diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php index 543726eb2..dbc1769f5 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php @@ -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()) { diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php index 5643cb4e0..7adf03d13 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php @@ -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 {