Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

DX: apply rector rulesets up to PHP 73

Browse Source
This commit is contained in:
Julien Fastré
2023-03-29 22:39:11 +02:00
parent b9a7530f7a
commit 4c5dae60a8
37 changed files with 129 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
View File

@@ -120,7 +120,7 @@ class ReassignAccompanyingPeriodController extends AbstractController
$assignForm->handleRequest($request);
if ($assignForm->isSubmitted() && $assignForm->isValid()) {
$assignPeriodIds = json_decode($assignForm->get('periods')->getData(), true);
$assignPeriodIds = json_decode($assignForm->get('periods')->getData(), true, 512, JSON_THROW_ON_ERROR);
$userTo = $assignForm->get('userTo')->getData();
$userFrom = $assignForm->get('userFrom')->getData();
@@ -179,7 +179,7 @@ class ReassignAccompanyingPeriodController extends AbstractController
{
$defaultData = [
'userFrom' => $userFrom,
'periods' => json_encode($periodIds),
'periods' => json_encode($periodIds, JSON_THROW_ON_ERROR),
];
$builder = $this->formFactory->createNamedBuilder('reassign', FormType::class, $defaultData);

6
src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
View File

@@ -182,7 +182,7 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
return '';
}
return $this->translatableStringHelper->localize(json_decode($value, true));
return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
};
case 'locationPersonName':
@@ -226,7 +226,7 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
'|',
array_map(
fn ($s) => $this->translatableStringHelper->localize($s),
json_decode($value, true)
json_decode($value, true, 512, JSON_THROW_ON_ERROR)
)
);
};
@@ -245,7 +245,7 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
'|',
array_map(
fn ($s) => $this->socialIssueRender->renderString($this->socialIssueRepository->find($s), []),
json_decode($value, true)
json_decode($value, true, 512, JSON_THROW_ON_ERROR)
)
);
};

4
src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
View File

@@ -334,7 +334,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
return $this->customFieldProvider
->getCustomFieldByType($cf->getType())
->render(json_decode($value, true), $cf, 'csv');
->render(json_decode($value, true, 512, JSON_THROW_ON_ERROR), $cf, 'csv');
};
if ($cfType instanceof CustomFieldChoice && $cfType->isMultiple($cf)) {
@@ -344,7 +344,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
if (null === $value) {
return '';
}
$decoded = json_decode($value, true);
$decoded = json_decode($value, true, 512, JSON_THROW_ON_ERROR);
if ('_header' === $value) {
$label = $cfType->getChoices($cf)[$slugChoice];

2
src/Bundle/ChillPersonBundle/Export/Helper/LabelPersonHelper.php
View File

@@ -39,7 +39,7 @@ class LabelPersonHelper
return '';
}
$decoded = json_decode($value);
$decoded = json_decode($value, null, 512, JSON_THROW_ON_ERROR);
if (0 === count($decoded)) {
return '';

2
src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
View File

@@ -361,7 +361,7 @@ class ListPersonHelper
return '';
}
$ids = json_decode($value);
$ids = json_decode($value, null, 512, JSON_THROW_ON_ERROR);
return
implode(

2
src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
View File

@@ -110,7 +110,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
[], // parameters
[], // files
[], // server parameters
json_encode(['type' => 'accompanying_period', 'user' => $user])
json_encode(['type' => 'accompanying_period', 'user' => $user], JSON_THROW_ON_ERROR)
);
$response = $this->client->getResponse();

42
src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
View File

@@ -313,10 +313,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters
[], // files
[], // server parameters
json_encode(['type' => 'person', 'id' => $personId])
json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
);
$response = $this->client->getResponse();
$data = json_decode($response->getContent(), true);
$data = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@@ -338,7 +338,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
}
$response = $this->client->getResponse();
$data = json_decode($response->getContent());
$data = json_decode($response->getContent(), null, 512, JSON_THROW_ON_ERROR);
// check that the person id is contained
$participationsPersonsIds = array_map(
@@ -357,10 +357,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters
[], // files
[], // server parameters
json_encode(['type' => 'person', 'id' => $personId])
json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
);
$response = $this->client->getResponse();
$data = json_decode($response->getContent(), true);
$data = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@@ -387,7 +387,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[],
[],
[],
json_encode(['type' => 'social_issue', 'id' => $si->getId()])
json_encode(['type' => 'social_issue', 'id' => $si->getId()], JSON_THROW_ON_ERROR)
);
$this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
@@ -396,7 +396,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
$this->markTestSkipped('the next tests should appears only on valid accompanying period');
}
$data = json_decode($this->client->getResponse()->getContent(), true);
$data = json_decode($this->client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertArrayHasKey('id', $data);
$this->assertArrayHasKey('type', $data);
$this->assertEquals('social_issue', $data['type']);
@@ -407,7 +407,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[],
[],
[],
json_encode(['type' => 'social_issue', 'id' => $si->getId()])
json_encode(['type' => 'social_issue', 'id' => $si->getId()], JSON_THROW_ON_ERROR)
);
$this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
@@ -427,7 +427,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
$this->markTestSkipped('the next tests should appears only on valid accompanying period');
}
$data = json_decode($response->getContent());
$data = json_decode($response->getContent(), null, 512, JSON_THROW_ON_ERROR);
$this->assertEquals(
$data->id,
$periodId,
@@ -453,7 +453,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters
[], // files
[], // server parameters
json_encode(['type' => 'accompanying_period', 'emergency' => !$initialValueEmergency])
json_encode(['type' => 'accompanying_period', 'emergency' => !$initialValueEmergency], JSON_THROW_ON_ERROR)
);
$response = $this->client->getResponse();
@@ -492,7 +492,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
json_encode(['type' => 'accompanying_period_comment', 'content' => 'this is a text'])
);
$response = $this->client->getResponse();
$data = json_decode($response->getContent(), true);
$data = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@@ -508,10 +508,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters
[], // files
[], // server parameters
json_encode(['type' => 'accompanying_period_comment', 'id' => $data['id']])
json_encode(['type' => 'accompanying_period_comment', 'id' => $data['id']], JSON_THROW_ON_ERROR)
);
$response = $this->client->getResponse();
$data = json_decode($response->getContent(), true);
$data = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
}
@@ -568,10 +568,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters
[], // files
[], // server parameters
json_encode(['type' => 'person', 'id' => $personId])
json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
);
$response = $this->client->getResponse();
$data = json_decode($response->getContent(), true);
$data = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@@ -595,10 +595,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters
[], // files
[], // server parameters
json_encode(['type' => 'thirdparty', 'id' => $thirdPartyId])
json_encode(['type' => 'thirdparty', 'id' => $thirdPartyId], JSON_THROW_ON_ERROR)
);
$response = $this->client->getResponse();
$data = json_decode($response->getContent(), true);
$data = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@@ -655,7 +655,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
json_encode(['type' => 'accompanying_period_resource', 'resource' => ['type' => 'person', 'id' => $personId]])
);
$response = $this->client->getResponse();
$data = json_decode($response->getContent(), true);
$data = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@@ -680,7 +680,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[],
[],
[], //server
json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()])
json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()], JSON_THROW_ON_ERROR)
);
$response = $this->client->getResponse();
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@@ -699,7 +699,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
json_encode(['type' => 'accompanying_period_resource', 'resource' => ['type' => 'thirdparty', 'id' => $thirdPartyId]])
);
$response = $this->client->getResponse();
$data = json_decode($response->getContent(), true);
$data = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@@ -724,7 +724,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[],
[],
[], //server
json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()])
json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()], JSON_THROW_ON_ERROR)
);
$response = $this->client->getResponse();
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));

2
src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
View File

@@ -157,7 +157,7 @@ final class HouseholdApiControllerTest extends WebTestCase
);
$this->assertResponseIsSuccessful();
$data = json_decode($client->getResponse()->getContent(), true);
$data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertArrayHasKey('count', $data);
$this->assertArrayHasKey('results', $data);

4
src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
View File

@@ -179,7 +179,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
$client->getResponse()->getStatusCode()
);
$data = json_decode($client->getResponse()->getContent(), true);
$data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertEquals(null, $data);
}
@@ -284,7 +284,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
$client->getResponse()->getStatusCode()
);
$data = json_decode($client->getResponse()->getContent(), true);
$data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertIsArray($data);
$this->assertArrayHasKey('members', $data);

2
src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
View File

@@ -112,7 +112,7 @@ final class PersonApiControllerTest extends WebTestCase
$this->assertResponseIsSuccessful();
$data = json_decode($client->getResponse()->getContent(), true);
$data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertArrayHasKey('type', $data);
$this->assertArrayHasKey('id', $data);

2
src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
View File

@@ -136,7 +136,7 @@ final class RelationshipApiControllerTest extends WebTestCase
'toPerson' => ['id' => $toPersonId, 'type' => 'person'],
'relation' => ['id' => $relationId, 'type' => 'relation'],
'reverse' => $isReverse,
])
], JSON_THROW_ON_ERROR)
);
$response = $this->client->getResponse();

4
src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
View File

@@ -47,7 +47,7 @@ final class SocialIssueApiControllerTest extends WebTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$data = json_decode($client->getResponse()->getContent(), true);
$data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertArrayHasKey('id', $data);
$this->assertArrayHasKey('type', $data);
@@ -60,7 +60,7 @@ final class SocialIssueApiControllerTest extends WebTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$data = json_decode($client->getResponse()->getContent(), true);
$data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertGreaterThan(0, $data['count']);
$this->assertGreaterThan(0, count($data['results']));

2
src/Bundle/ChillPersonBundle/Tests/Controller/SocialWorkEvaluationApiControllerTest.php
View File

@@ -77,7 +77,7 @@ final class SocialWorkEvaluationApiControllerTest extends WebTestCase
$this->assertResponseIsSuccessful();
$content = json_decode($client->getResponse()->getContent(), true);
$content = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$ids = array_map(static fn (array $item) => $item['id'], $content['results']);

2
src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php
View File

@@ -45,7 +45,7 @@ class Version20160818113633 extends AbstractMigration
foreach ($personIdAndCFData as $person) {
$personId = $person['id'];
$cFDataArray = unserialize($person['cfdata']);
$cFDataJson = json_encode($cFDataArray);
$cFDataJson = json_encode($cFDataArray, JSON_THROW_ON_ERROR);
$this->addSql(
'UPDATE person set cfdata = :cfdatajson WHERE id = :id',
['cfdatajson' => $cFDataJson, 'id' => $personId]

50
src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
View File

@@ -40,20 +40,20 @@ final class Version20181023101621 extends AbstractMigration
$this->addSql('CREATE INDEX fullnameCanonical_trgm_idx ON chill_person_person USING GIN (fullnameCanonical gin_trgm_ops)');
$this->addSql(
<<<'SQL'
CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS
$BODY$
BEGIN
IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname
THEN
UPDATE chill_person_person
SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
WHERE id=NEW.id;
END IF;
RETURN NEW;
END;
$BODY$ LANGUAGE PLPGSQL;
SQL
<<<'SQL_WRAP'
CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS
$BODY$
BEGIN
IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname
THEN
UPDATE chill_person_person
SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
WHERE id=NEW.id;
END IF;
RETURN NEW;
END;
$BODY$ LANGUAGE PLPGSQL;
SQL_WRAP
);
$this->addSql(
<<<'SQL'
@@ -67,17 +67,17 @@ final class Version20181023101621 extends AbstractMigration
);
$this->addSql(
<<<'SQL'
CREATE OR REPLACE FUNCTION canonicalize_fullname_on_insert() RETURNS TRIGGER AS
$BODY$
BEGIN
UPDATE chill_person_person
SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
WHERE id=NEW.id;
RETURN NEW;
END;
$BODY$ LANGUAGE PLPGSQL;
SQL
<<<'SQL_WRAP'
CREATE OR REPLACE FUNCTION canonicalize_fullname_on_insert() RETURNS TRIGGER AS
$BODY$
BEGIN
UPDATE chill_person_person
SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
WHERE id=NEW.id;
RETURN NEW;
END;
$BODY$ LANGUAGE PLPGSQL;
SQL_WRAP
);
$this->addSql(
<<<'SQL'

28
src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php
View File

@@ -130,20 +130,20 @@ final class Version20200130213446 extends AbstractMigration
$this->addSql('DROP TRIGGER canonicalize_fullname_on_alt_name_delete ON chill_person_alt_name;');
$this->addSql('DROP FUNCTION canonicalize_fullname_on_alt_name_alter();');
$this->addSql(
<<<'SQL'
CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS
$BODY$
BEGIN
IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname
THEN
UPDATE chill_person_person
SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
WHERE id=NEW.id;
END IF;
RETURN NEW;
END;
$BODY$ LANGUAGE PLPGSQL;
SQL
<<<'SQL_WRAP'
CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS
$BODY$
BEGIN
IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname
THEN
UPDATE chill_person_person
SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
WHERE id=NEW.id;
END IF;
RETURN NEW;
END;
$BODY$ LANGUAGE PLPGSQL;
SQL_WRAP
);
}