fix unit tests

src/Service/Organization/OrganizationFactory.php

@@ -72,6 +72,7 @@ class OrganizationFactory
         private readonly OrganizationIdentificationRepository $organizationIdentificationRepository,
         private readonly ApiLegacyRequestService $apiLegacyRequestService,
         private readonly FunctionTypeRepository $functionTypeRepository,
+        private readonly FileManager $fileManager,
     ) {
         $this->phoneNumberUtil = PhoneNumberUtil::getInstance();
     }
@@ -861,7 +862,7 @@ class OrganizationFactory
             try {
                 $this->fileManager->deletePersonFiles($personId);
             } catch (\Exception $e) {
-                $this->logger->critical("An error happened while deleting the person's files, please proceed manually (id=" . $person->getId() . ").");
+                $this->logger->critical("An error happened while deleting the person's files, please proceed manually (id=" . $personId . ").");
                 $this->logger->debug($e);
                 $withError = true;
             }

tests/Unit/Service/Cron/Job/CleanTempFilesTest.php

@@ -27,16 +27,6 @@ class TestableCleanTempFile extends CleanTempFiles
         parent::deleteFiles($files);
     }
 
-    public function purgeDb(\DateTime $maxDate, bool $commit = true): void
-    {
-        parent::purgeDb($maxDate, $commit);
-    }
-
-    public function purgeFiles(\DateTime $maxDate): int
-    {
-        return parent::purgeFiles($maxDate);
-    }
-
     public function getQueryConditions(QueryBuilder $queryBuilder, \DateTime $maxDate): void
     {
         parent::getQueryConditions($queryBuilder, $maxDate);
@@ -61,7 +51,7 @@ class CleanTempFilesTest extends TestCase
         $this->storage = $this->getMockBuilder(LocalStorage::class)->disableOriginalConstructor()->getMock();
     }
 
-    private function getMockFor(string $method)
+    private function getMockFor(string $method): MockObject | TestableCleanTempFile
     {
         $cleanTempFiles = $this->getMockBuilder(TestableCleanTempFile::class)
             ->setConstructorArgs([$this->connection, $this->fileRepository, $this->storage])
@@ -100,8 +90,6 @@ class CleanTempFilesTest extends TestCase
             ['  * /foo/bar']
         );
 
-        $cleanTempFiles->expects(self::once())->method('purgeDb')->with($maxDate, false);
-
         $cleanTempFiles->preview();
     }
 
@@ -119,16 +107,14 @@ class CleanTempFilesTest extends TestCase
             $this->getMockBuilder(File::class)->getMock(),
         ];
 
-        $cleanTempFiles->method('listFilesToDelete')->willReturn($files)->with($maxDate);
+        $cleanTempFiles->method('listFilesToDelete')->with($maxDate)->willReturn($files);
 
         $cleanTempFiles->expects(self::once())->method('deleteFiles')->with($files);
 
-        $cleanTempFiles->expects(self::once())->method('purgeDb')->with($maxDate);
-
         $cleanTempFiles->execute();
     }
 
-    public function testListFilesToDelete()
+    public function testListFilesToDelete(): void
     {
         $cleanTempFiles = $this->getMockFor('listFilesToDelete');
 
@@ -171,101 +157,60 @@ class CleanTempFilesTest extends TestCase
         $this->assertEquals([], $result);
     }
 
-    public function testPurgeDbCommitsTransactionIfCommitIsTrue(): void
-    {
-        $cleanTempFiles = $this->getMockFor('purgeDb');
-
-        DatesUtils::setFakeDatetime('2022-01-08 00:00:00');
-        $maxDate = new \DateTime('now');
-
-        $this->connection->expects($this->once())
-            ->method('beginTransaction');
-        $this->connection->expects($this->once())
-            ->method('setAutoCommit')
-            ->with(false);
-
-        $cleanTempFiles->method('purgeFiles')->willReturn(5)->with($maxDate);
-
-        $this->connection->expects($this->once())
-            ->method('commit');
-
-        $this->ui->expects($this->once())
-            ->method('print')
-            ->with('DB purged - 5 records permanently deleted');
-
-        $cleanTempFiles->purgeDb($maxDate);
-    }
-
-    public function testPurgeDbRollsbackTransactionIfCommitIsFalse(): void
-    {
-        $cleanTempFiles = $this->getMockFor('purgeDb');
+    public function testDeleteFiles(): void {
+        $cleanTempFiles = $this->getMockFor('deleteFiles');
 
-        DatesUtils::setFakeDatetime('2022-01-08 00:00:00');
-        $maxDate = DatesUtils::new();
+        $file1 = $this->getMockBuilder(File::class)->getMock();
+        $file1->method('getId')->willReturn(1);
 
-        $this->connection->expects($this->once())
-            ->method('beginTransaction');
-        $this->connection->expects($this->once())
-            ->method('setAutoCommit')
-            ->with(false);
+        $file2 = $this->getMockBuilder(File::class)->getMock();
+        $file2->method('getId')->willReturn(2);
 
-        $cleanTempFiles->method('purgeFiles')->willReturn(5)->with($maxDate);
+        $file3 = $this->getMockBuilder(File::class)->getMock();
+        $file3->method('getId')->willReturn(3);
 
-        $this->connection->expects($this->once())
-            ->method('rollback');
-        $this->ui->expects($this->once())
-            ->method('print')
-            ->with('DB purged - 5 records would be permanently deleted');
+        $files = [$file1, $file2, $file3];
 
-        $cleanTempFiles->purgeDb($maxDate, false);
-    }
+        $this->connection->expects($this->once())->method('beginTransaction');
+        $this->connection->expects($this->once())->method('setAutoCommit')->with(false);
 
-    public function testPurgeDbRollsbackTransactionOnException(): void
-    {
-        $cleanTempFiles = $this->getMockFor('purgeDb');
+        $queryBuilder = $this->getMockBuilder(QueryBuilder::class)->disableOriginalConstructor()->getMock();
+        $this->fileRepository->expects($this->once())->method('createQueryBuilder')->with('f')->willReturn($queryBuilder);
 
-        DatesUtils::setFakeDatetime('2022-01-08 00:00:00');
-        $maxDate = DatesUtils::new();
+        $queryBuilder
+            ->expects(self::exactly(3))
+            ->method('delete')
+            ->willReturnSelf();
 
-        $cleanTempFiles->method('purgeFiles')->willThrowException(new \Exception('error'))->with($maxDate);
+        $queryBuilder
+            ->expects(self::exactly(3))
+            ->method('delete')
+            ->willReturnSelf();
 
-        $this->connection->expects($this->once())
-            ->method('beginTransaction');
-        $this->connection->expects($this->once())
-            ->method('rollback');
-        $this->ui->expects($this->never())
-            ->method('print');
+        $queryBuilder
+            ->expects(self::exactly(3))
+            ->method('where')
+            ->with('f.id = :id')
+            ->willReturnSelf();
 
-        $this->expectException(\Exception::class);
-        $cleanTempFiles->purgeDb($maxDate, true);
-    }
+        $queryBuilder
+            ->expects(self::exactly(3))
+            ->method('setParameter')
+            ->withConsecutive(['id', 1], ['id', 2], ['id', 3]);
 
-    public function testPurgeFilesDeletes()
-    {
-        $cleanTempFiles = $this->getMockFor('purgeFiles');
+        $this->storage
+            ->expects(self::exactly(3))
+            ->method('hardDelete')
+            ->withConsecutive([$file1], [$file1], [$file3]);
 
-        DatesUtils::setFakeDatetime('2022-01-08 00:00:00');
-        $maxDate = DatesUtils::new();
+        $this->connection->expects($this->once())->method('commit');
 
-        $queryBuilder = $this->getMockBuilder(QueryBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $queryBuilder->expects($this->once())
-            ->method('delete')
-            ->willReturnSelf();
-
-        $query = $this->getMockBuilder(AbstractQuery::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $queryBuilder->expects($this->once())
-            ->method('getQuery')
-            ->willReturn($query);
-        $query->expects($this->once())
-            ->method('execute')
-            ->willReturn(3);
-
-        $this->fileRepository->method('createQueryBuilder')->with('f')->willReturn($queryBuilder);
+        $this->logger->expects(self::atLeastOnce())->method('info')->withConsecutive(
+            ['3 temporary files to be removed'],
+            ['Deleting files...'],
+            ['3 files deleted']
+        );
 
-        $this->assertEquals(3, $cleanTempFiles->purgeFiles($maxDate));
+        $cleanTempFiles->deleteFiles($files);
     }
 }

tests/Unit/Service/Dolibarr/DolibarrAccountCreatorTest.php

@@ -118,7 +118,7 @@ class DolibarrAccountCreatorTest extends TestCase
         $accountData = [
             'id' => '2',
             'code_client' => 'C2',
-            'array_options' => ['2iopen_software_opentalent' => 'Opentalent Artist'],
+            'array_options' => ['options_2iopen_software_opentalent' => 'Opentalent Artist'],
         ];
 
         $dolibarrAccount = $dolibarrAccountCreator->createDolibarrAccount($organizationId, $accountData);

tests/Unit/Service/File/FileManagerTest.php

@@ -11,6 +11,7 @@ use App\Entity\Organization\Organization;
 use App\Enum\Core\FileHostEnum;
 use App\Enum\Core\FileTypeEnum;
 use App\Enum\Core\FileVisibilityEnum;
+use App\Repository\Core\FileRepository;
 use App\Service\File\Exception\FileNotFoundException;
 use App\Service\File\Factory\ImageFactory;
 use App\Service\File\FileManager;
@@ -18,6 +19,7 @@ use App\Service\File\Storage\ApiLegacyStorage;
 use App\Service\File\Storage\FileStorageInterface;
 use App\Service\File\Storage\LocalStorage;
 use App\Service\ServiceIterator\StorageIterator;
+use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -34,12 +36,21 @@ class FileManagerTest extends TestCase
         $this->storageIterator = $this->getMockBuilder(StorageIterator::class)->disableOriginalConstructor()->getMock();
         $this->imageFactory = $this->getMockBuilder(ImageFactory::class)->disableOriginalConstructor()->getMock();
         $this->localStorage = $this->getMockBuilder(LocalStorage::class)->disableOriginalConstructor()->getMock();
+        $this->entityManager = $this->getMockBuilder(EntityManagerInterface::class)->disableOriginalConstructor()->getMock();
+        $this->fileRepository = $this->getMockBuilder(FileRepository::class)->disableOriginalConstructor()->getMock();
     }
 
     public function getFileManagerMockFor(string $methodName): FileManager|MockObject
     {
         return $this->getMockBuilder(FileManager::class)
-            ->setConstructorArgs([$this->iriConverter, $this->storageIterator, $this->imageFactory, $this->localStorage])
+            ->setConstructorArgs([
+                $this->iriConverter,
+                $this->storageIterator,
+                $this->imageFactory,
+                $this->localStorage,
+                $this->entityManager,
+                $this->fileRepository,
+            ])
             ->setMethodsExcept([$methodName])
             ->getMock();
     }

tests/Unit/Service/File/Storage/LocalStorageTest.php

@@ -78,6 +78,7 @@ class LocalStorageTest extends TestCase
                 $this->imageFactory,
                 $this->fileUtils,
                 $this->urlBuilder,
+                '/file/storage/dir/'
             ])
             ->setMethodsExcept([$methodName])
             ->getMock();

tests/Unit/Service/Organization/OrganizationFactoryTest.php

@@ -38,6 +38,7 @@ use App\Repository\Organization\OrganizationRepository;
 use App\Repository\Person\PersonRepository;
 use App\Service\ApiLegacy\ApiLegacyRequestService;
 use App\Service\Dolibarr\DolibarrApiService;
+use App\Service\File\FileManager;
 use App\Service\Organization\OrganizationFactory;
 use App\Service\Organization\Utils as OrganizationUtils;
 use App\Service\Typo3\BindFileService;
@@ -152,14 +153,9 @@ class TestableOrganizationFactory extends OrganizationFactory
         return parent::normalizeIdentificationField($value);
     }
 
-    public function deleteOrganizationAccesses(Organization $organization): void
+    public function deleteTypo3Website(int $organizationId): void
     {
-        parent::deleteOrganizationAccesses($organization);
-    }
-
-    public function deleteTypo3Website(Organization $organization): void
-    {
-        parent::deleteTypo3Website($organization);
+        parent::deleteTypo3Website($organizationId);
     }
 
     public function switchDolibarrSocietyToProspect(Organization $organization): void
@@ -167,19 +163,9 @@ class TestableOrganizationFactory extends OrganizationFactory
         parent::switchDolibarrSocietyToProspect($organization);
     }
 
-    public function deleteOrganizationFiles(Organization $organization): void
-    {
-        parent::deleteOrganizationFiles($organization);
-    }
-
-    public function deleteDirectoriesV1(Organization $organization): void
-    {
-        parent::deleteDirectoriesV1($organization);
-    }
-
-    public function deleteDirectories59(Organization $organization): void
+    public function getFutureOrphanPersons(Organization $organization): array
     {
-        parent::deleteDirectories59($organization);
+        return parent::getFutureOrphanPersons($organization);
     }
 }
 
@@ -216,6 +202,7 @@ class OrganizationFactoryTest extends TestCase
         $this->apiLegacyRequestService = $this->getMockBuilder(ApiLegacyRequestService::class)->disableOriginalConstructor()->getMock();
         $this->phoneNumberUtil = $this->getMockBuilder(PhoneNumberUtil::class)->disableOriginalConstructor()->getMock();
         $this->functionTypeRepository = $this->getMockBuilder(FunctionTypeRepository::class)->disableOriginalConstructor()->getMock();
+        $this->fileManager = $this->getMockBuilder(FileManager::class)->disableOriginalConstructor()->getMock();
     }
 
     public function tearDown(): void
@@ -241,6 +228,7 @@ class OrganizationFactoryTest extends TestCase
                     $this->organizationIdentificationRepository,
                     $this->apiLegacyRequestService,
                     $this->functionTypeRepository,
+                    $this->fileManager
                 ])
             ->setMethodsExcept(['setLoggerInterface', 'setPhoneNumberUtil', $methodName])
             ->getMock();
@@ -1019,7 +1007,7 @@ class OrganizationFactoryTest extends TestCase
         $organizationFactory->makeOrganizationWithRelations($organizationCreationRequest);
     }
 
-    public function testMakeOrganization()
+    public function testMakeOrganization(): void
     {
         $organizationFactory = $this->getOrganizationFactoryMockFor('makeOrganization');
 
@@ -1130,7 +1118,7 @@ class OrganizationFactoryTest extends TestCase
         );
     }
 
-    public function testMakePostalAddressUnexistingCountry(): void
+    public function testMakePostalAddressNonExistingCountry(): void
     {
         $organizationFactory = $this->getOrganizationFactoryMockFor('makePostalAddress');
 
@@ -1596,7 +1584,7 @@ class OrganizationFactoryTest extends TestCase
         );
     }
 
-    public function testMakeAccessPostalAddress()
+    public function testMakeAccessPostalAddress(): void
     {
         $organizationFactory = $this->getOrganizationFactoryMockFor('makePersonPostalAddress');
 
@@ -1893,8 +1881,8 @@ class OrganizationFactoryTest extends TestCase
 
         $this->apiLegacyRequestService
             ->expects(self::once())
-            ->method('post')
-            ->with('/_internal/secure/organization/creation-event', ['organizationId' => 123])
+            ->method('get')
+            ->with('/_internal/request/adminassos/create/organization/123')
             ->willReturn($response);
 
         $organization = $this->getMockBuilder(Organization::class)->getMock();
@@ -1913,8 +1901,8 @@ class OrganizationFactoryTest extends TestCase
 
         $this->apiLegacyRequestService
             ->expects(self::once())
-            ->method('post')
-            ->with('/_internal/secure/organization/creation-event', ['organizationId' => 123])
+            ->method('get')
+            ->with('/_internal/request/adminassos/create/organization/123')
             ->willReturn($response);
 
         $organization = $this->getMockBuilder(Organization::class)->getMock();
@@ -1959,18 +1947,37 @@ class OrganizationFactoryTest extends TestCase
         $this->entityManager->expects(self::once())->method('commit');
         $this->entityManager->expects(self::never())->method('rollback');
 
-        $organizationFactory->expects(self::once())->method('deleteOrganizationAccesses')->with($organization);
+        $person1 = $this->getMockBuilder(Person::class)->getMock();
+        $person1->method('getId')->willReturn(1);
+
+        $person2 = $this->getMockBuilder(Person::class)->getMock();
+        $person2->method('getId')->willReturn(2);
+
+        $person3 = $this->getMockBuilder(Person::class)->getMock();
+        $person3->method('getId')->willReturn(3);
+
+        $organizationFactory
+            ->method('getFutureOrphanPersons')
+            ->with($organization)
+            ->willReturn([$person1, $person2, $person3]);
 
-        $this->entityManager->expects(self::exactly(2))->method('remove')->withConsecutive(
+        $this->entityManager->expects(self::exactly(5))->method('remove')->withConsecutive(
             [$parameters],
-            [$organization]
+            [$organization],
+            [$person1],
+            [$person2],
+            [$person3],
         );
 
-        $organizationFactory->expects(self::once())->method('deleteTypo3Website')->with($organization);
+        $organizationFactory->expects(self::once())->method('deleteTypo3Website')->with(123);
         $organizationFactory->expects(self::once())->method('switchDolibarrSocietyToProspect')->with($organization);
-        $organizationFactory->expects(self::once())->method('deleteOrganizationFiles')->with($organization);
-        $organizationFactory->expects(self::once())->method('deleteDirectoriesV1')->with($organization);
-        $organizationFactory->expects(self::once())->method('deleteDirectories59')->with($organization);
+
+        $this->fileManager->expects(self::once())->method('deleteOrganizationFiles')->with(123);
+
+        $this->fileManager
+            ->expects(self::exactly(3))
+            ->method('deletePersonFiles')
+            ->withConsecutive([1], [2], [3]);
 
         $organizationDeletionRequest
             ->expects(self::once())
@@ -1997,6 +2004,20 @@ class OrganizationFactoryTest extends TestCase
         $organization = $this->getMockBuilder(Organization::class)->getMock();
         $organization->method('getParameters')->willReturn($parameters);
 
+        $person1 = $this->getMockBuilder(Person::class)->getMock();
+        $person1->method('getId')->willReturn(1);
+
+        $person2 = $this->getMockBuilder(Person::class)->getMock();
+        $person2->method('getId')->willReturn(2);
+
+        $person3 = $this->getMockBuilder(Person::class)->getMock();
+        $person3->method('getId')->willReturn(3);
+
+        $organizationFactory
+            ->method('getFutureOrphanPersons')
+            ->with($organization)
+            ->willReturn([$person1, $person2, $person3]);
+
         $this->organizationRepository
             ->expects(self::once())
             ->method('find')
@@ -2008,15 +2029,10 @@ class OrganizationFactoryTest extends TestCase
         $this->entityManager->expects(self::never())->method('commit');
         $this->entityManager->expects(self::once())->method('rollback');
 
-        $organizationFactory->expects(self::once())->method('deleteOrganizationAccesses')->with($organization);
-
         $this->entityManager->method('remove')->willThrowException(new \Exception('some error'));
 
         $organizationFactory->expects(self::never())->method('deleteTypo3Website');
         $organizationFactory->expects(self::never())->method('switchDolibarrSocietyToProspect');
-        $organizationFactory->expects(self::never())->method('deleteOrganizationFiles');
-        $organizationFactory->expects(self::never())->method('deleteDirectoriesV1');
-        $organizationFactory->expects(self::never())->method('deleteDirectories59');
 
         $organizationDeletionRequest
             ->expects(self::never())
@@ -2047,6 +2063,20 @@ class OrganizationFactoryTest extends TestCase
         $organization->method('getId')->willReturn(123);
         $organization->method('getParameters')->willReturn($parameters);
 
+        $person1 = $this->getMockBuilder(Person::class)->getMock();
+        $person1->method('getId')->willReturn(1);
+
+        $person2 = $this->getMockBuilder(Person::class)->getMock();
+        $person2->method('getId')->willReturn(2);
+
+        $person3 = $this->getMockBuilder(Person::class)->getMock();
+        $person3->method('getId')->willReturn(3);
+
+        $organizationFactory
+            ->method('getFutureOrphanPersons')
+            ->with($organization)
+            ->willReturn([$person1, $person2, $person3]);
+
         $this->organizationRepository
             ->expects(self::once())
             ->method('find')
@@ -2058,33 +2088,45 @@ class OrganizationFactoryTest extends TestCase
         $this->entityManager->expects(self::once())->method('commit');
         $this->entityManager->expects(self::never())->method('rollback');
 
-        $organizationFactory->expects(self::once())->method('deleteOrganizationAccesses')->with($organization);
-
-        $this->entityManager->expects(self::exactly(2))->method('remove')->withConsecutive(
+        $this->entityManager->expects(self::exactly(5))->method('remove')->withConsecutive(
             [$parameters],
-            [$organization]
+            [$organization],
+            [$person1],
+            [$person2],
+            [$person3],
         );
 
         $organizationFactory->expects(self::once())->method('deleteTypo3Website')->willThrowException(new \Exception('some error'));
         $organizationFactory->expects(self::once())->method('switchDolibarrSocietyToProspect')->willThrowException(new \Exception('some error'));
-        $organizationFactory->expects(self::once())->method('deleteOrganizationFiles')->willThrowException(new \Exception('some error'));
-        $organizationFactory->expects(self::once())->method('deleteDirectoriesV1')->willThrowException(new \Exception('some error'));
-        $organizationFactory->expects(self::once())->method('deleteDirectories59')->willThrowException(new \Exception('some error'));
 
         $organizationDeletionRequest
             ->expects(self::once())
             ->method('setStatus')
             ->with(OrganizationDeletionRequest::STATUS_OK_WITH_ERRORS);
 
+        $this->fileManager
+            ->expects(self::once())
+            ->method('deleteOrganizationFiles')
+            ->with(123)
+            ->willThrowException(new \Exception('some error'));
+        ;
+
+        $this->fileManager
+            ->expects(self::exactly(3))
+            ->method('deletePersonFiles')
+            ->withConsecutive([1], [2], [3])
+            ->willThrowException(new \Exception('some error'));
+
         $this->logger
-            ->expects(self::exactly(5))
+            ->expects(self::exactly(6))
             ->method('critical')
         ->withConsecutive(
             ['An error happened while deleting the Typo3 website, please proceed manually.'],
             ['An error happened while updating the Dolibarr society, please proceed manually.'],
-            ['An error happened while deleting the local directories, please proceed manually.'],
-            ['An error happened while deleting the V1 directories, please proceed manually.'],
-            ['An error happened while deleting the 5.9 directories, please proceed manually.'],
+            ["An error happened while deleting the organization's files, please proceed manually."],
+            ["An error happened while deleting the person's files, please proceed manually (id=1)."],
+            ["An error happened while deleting the person's files, please proceed manually (id=2)."],
+            ["An error happened while deleting the person's files, please proceed manually (id=3)."],
         );
 
         $result = $organizationFactory->delete($organizationDeletionRequest);
@@ -2095,38 +2137,6 @@ class OrganizationFactoryTest extends TestCase
         );
     }
 
-    public function testDeleteOrganizationAccesses(): void
-    {
-        $organizationFactory = $this->getOrganizationFactoryMockFor('deleteOrganizationAccesses');
-
-        $organization = $this->getMockBuilder(Organization::class)->getMock();
-
-        $access1 = $this->getMockBuilder(Access::class)->getMock();
-        $access2 = $this->getMockBuilder(Access::class)->getMock();
-        $access_other = $this->getMockBuilder(Access::class)->getMock();
-
-        $person1 = $this->getMockBuilder(Person::class)->getMock();
-        $person1->method('getAccesses')->willReturn(new ArrayCollection([$access1]));
-        $access1->method('getPerson')->willReturn($person1);
-
-        $person2 = $this->getMockBuilder(Person::class)->getMock();
-        $person2->method('getAccesses')->willReturn(new ArrayCollection([$access2, $access_other]));
-        $access2->method('getPerson')->willReturn($person2);
-
-        $organization->method('getAccesses')->willReturn(new ArrayCollection([$access1, $access2]));
-
-        $this->entityManager
-            ->expects(self::exactly(3))
-            ->method('remove')
-            ->withConsecutive(
-                [$person1],
-                [$access1],
-                [$access2],
-            );
-
-        $organizationFactory->deleteOrganizationAccesses($organization);
-    }
-
     public function testSwitchDolibarrSocietyToProspect(): void
     {
         $organizationFactory = $this->getOrganizationFactoryMockFor('switchDolibarrSocietyToProspect');

tests/Unit/Service/Security/InternalRequestsServiceTest.php

@@ -11,9 +11,9 @@ use Symfony\Component\Security\Core\User\UserInterface;
 
 class TestableInternalRequestsService extends InternalRequestsService
 {
-    public function isInternalIp(string $ip): bool
+    public function isInternalIp(string $clientIp): bool
     {
-        return parent::isInternalIp($ip);
+        return parent::isInternalIp($clientIp);
     }
 
     public function tokenIsValid(string|null $token): bool

tests/Unit/Service/Typo3/Typo3ServiceTest.php

@@ -11,9 +11,9 @@ use Symfony\Contracts\HttpClient\ResponseInterface;
 
 class TestableTypo3Service extends Typo3Service
 {
-    public function sendCommand(string $route, array $parameters): ResponseInterface
+    public function sendCommand(string $route, array $parameters, array $headers = []): ResponseInterface
     {
-        return parent::sendCommand($route, $parameters);
+        return parent::sendCommand($route, $parameters, $headers);
     }
 }