From 2d82c1e1050c5a979e92451d2344d6faa7156a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 28 Aug 2024 15:32:57 +0200 Subject: [PATCH] rector fixes after rector's upgrade --- .../Entity/StoredObject.php | 2 +- .../StoredObjectVersionRepository.php | 4 +- .../RemoveExpiredStoredObjectCronJob.php | 8 +-- .../RemoveExpiredStoredObjectCronJobTest.php | 4 +- .../RemoveOldVersionCronJobTest.php | 4 +- .../Tests/Service/StoredObjectManagerTest.php | 52 ++++++++----------- 6 files changed, 31 insertions(+), 43 deletions(-) diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php index fe68ec31c..87ddd5785 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php @@ -364,7 +364,7 @@ class StoredObject implements Document, TrackCreationInterface { try { return base_convert(bin2hex(random_bytes(32)), 16, 36); - } catch (RandomException $e) { + } catch (RandomException) { return uniqid(more_entropy: true); } } diff --git a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectVersionRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectVersionRepository.php index 047b024a9..1ab9b9edd 100644 --- a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectVersionRepository.php +++ b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectVersionRepository.php @@ -23,9 +23,9 @@ use Doctrine\Persistence\ObjectRepository; */ class StoredObjectVersionRepository implements ObjectRepository { - private EntityRepository $repository; + private readonly EntityRepository $repository; - private Connection $connection; + private readonly Connection $connection; public function __construct(EntityManagerInterface $entityManager) { diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectCleaner/RemoveExpiredStoredObjectCronJob.php b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectCleaner/RemoveExpiredStoredObjectCronJob.php index 1dbf94080..62ae154bc 100644 --- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectCleaner/RemoveExpiredStoredObjectCronJob.php +++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectCleaner/RemoveExpiredStoredObjectCronJob.php @@ -23,16 +23,16 @@ use Symfony\Component\Messenger\MessageBusInterface; * This cronjob is executed every 7days, to remove expired stored object. For every * expired stored object, every version is sent to message bus for async deletion. */ -final class RemoveExpiredStoredObjectCronJob implements CronJobInterface +final readonly class RemoveExpiredStoredObjectCronJob implements CronJobInterface { public const string KEY = 'remove-expired-stored-object'; private const string LAST_DELETED_KEY = 'last-deleted-stored-object-id'; public function __construct( - private readonly ClockInterface $clock, - private readonly MessageBusInterface $messageBus, - private readonly StoredObjectRepositoryInterface $storedObjectRepository + private ClockInterface $clock, + private MessageBusInterface $messageBus, + private StoredObjectRepositoryInterface $storedObjectRepository ) {} public function canRun(?CronJobExecution $cronJobExecution): bool diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectCleaner/RemoveExpiredStoredObjectCronJobTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectCleaner/RemoveExpiredStoredObjectCronJobTest.php index ed7341a38..3d6d758fa 100644 --- a/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectCleaner/RemoveExpiredStoredObjectCronJobTest.php +++ b/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectCleaner/RemoveExpiredStoredObjectCronJobTest.php @@ -106,9 +106,7 @@ class RemoveExpiredStoredObjectCronJobTest extends TestCase false => $messageBus->method('dispatch'), }; - $methodDispatch->willReturnCallback(function (RemoveOldVersionMessage $message) { - return new Envelope($message); - }); + $methodDispatch->willReturnCallback(fn (RemoveOldVersionMessage $message) => new Envelope($message)); return $messageBus; } diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectCleaner/RemoveOldVersionCronJobTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectCleaner/RemoveOldVersionCronJobTest.php index f27727d20..937253c81 100644 --- a/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectCleaner/RemoveOldVersionCronJobTest.php +++ b/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectCleaner/RemoveOldVersionCronJobTest.php @@ -95,9 +95,7 @@ class RemoveOldVersionCronJobTest extends KernelTestCase false => $messageBus->method('dispatch'), }; - $methodDispatch->willReturnCallback(function (RemoveOldVersionMessage $message) { - return new Envelope($message); - }); + $methodDispatch->willReturnCallback(fn (RemoveOldVersionMessage $message) => new Envelope($message)); return $messageBus; } diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectManagerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectManagerTest.php index 4bb370ba3..e09a2dc1e 100644 --- a/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectManagerTest.php +++ b/src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectManagerTest.php @@ -217,13 +217,11 @@ final class StoredObjectManagerTest extends TestCase ->expects($this->once()) ->method('generate') ->with($this->identicalTo('DELETE'), $this->identicalTo('object_name')) - ->willReturnCallback(function (string $method, string $objectName) { - return new SignedUrl( - $method, - 'https://example.com/'.$objectName, - new \DateTimeImmutable('1 hours') - ); - }); + ->willReturnCallback(fn (string $method, string $objectName) => new SignedUrl( + $method, + 'https://example.com/'.$objectName, + new \DateTimeImmutable('1 hours') + )); $storedObjectManager = new StoredObjectManager($httpClient, $tempUrlGenerator); $storedObjectManager->delete($version); @@ -276,14 +274,12 @@ final class StoredObjectManagerTest extends TestCase ->expects($this->never()) ->method('generate') ->with($this->identicalTo('HEAD'), $this->isType('string')) - ->willReturnCallback(function (string $method, string $objectName) { - return new SignedUrl( - $method, - 'https://example.com/'.$objectName, - new \DateTimeImmutable('1 hours'), - $objectName - ); - }); + ->willReturnCallback(fn (string $method, string $objectName) => new SignedUrl( + $method, + 'https://example.com/'.$objectName, + new \DateTimeImmutable('1 hours'), + $objectName + )); $manager = new StoredObjectManager($client, $tempUrlGenerator); @@ -307,13 +303,11 @@ final class StoredObjectManagerTest extends TestCase ->expects($this->atLeastOnce()) ->method('generate') ->with($this->identicalTo('HEAD'), $this->isType('string')) - ->willReturnCallback(function (string $method, string $objectName) { - return new SignedUrl( - $method, - 'https://example.com/'.$objectName, - new \DateTimeImmutable('1 hours') - ); - }); + ->willReturnCallback(fn (string $method, string $objectName) => new SignedUrl( + $method, + 'https://example.com/'.$objectName, + new \DateTimeImmutable('1 hours') + )); $manager = new StoredObjectManager($client, $tempUrlGenerator); @@ -368,14 +362,12 @@ final class StoredObjectManagerTest extends TestCase ->expects($this->atLeastOnce()) ->method('generate') ->with($this->logicalOr($this->identicalTo('GET'), $this->identicalTo('PUT')), $this->isType('string')) - ->willReturnCallback(function (string $method, string $objectName) { - return new SignedUrl( - $method, - 'https://example.com/'.$objectName, - new \DateTimeImmutable('1 hours'), - $objectName - ); - }); + ->willReturnCallback(fn (string $method, string $objectName) => new SignedUrl( + $method, + 'https://example.com/'.$objectName, + new \DateTimeImmutable('1 hours'), + $objectName + )); return $tempUrlGenerator; }