DX: apply rector rulesets up to PHP 73

This commit is contained in:
Julien Fastré 2023-03-29 22:39:11 +02:00
parent b9a7530f7a
commit 4c5dae60a8
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
37 changed files with 129 additions and 131 deletions

View File

@ -152,7 +152,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
return 'circle'; return 'circle';
} }
return $this->translatableStringHelper->localize(json_decode($value, true)); return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
}; };
case 'type_name': case 'type_name':
@ -161,7 +161,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
return 'activity type'; return 'activity type';
} }
return $this->translatableStringHelper->localize(json_decode($value, true)); return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
}; };
default: default:

View File

@ -179,7 +179,7 @@ class ListActivityHelper
} }
} }
$decoded = json_decode($value); $decoded = json_decode($value, null, 512, JSON_THROW_ON_ERROR);
return implode( return implode(
'|', '|',

View File

@ -108,7 +108,7 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
//echo json_encode($customFieldsArrayRet); //echo json_encode($customFieldsArrayRet);
return json_encode($customFieldsArrayRet); return json_encode($customFieldsArrayRet, JSON_THROW_ON_ERROR);
} }
public function transform($customFieldsJSON) public function transform($customFieldsJSON)

View File

@ -44,7 +44,7 @@ final class RelatorioDriver implements DriverInterface
{ {
$form = new FormDataPart( $form = new FormDataPart(
[ [
'variables' => json_encode($data), 'variables' => json_encode($data, JSON_THROW_ON_ERROR),
'template' => new DataPart($template, $templateName ?? uniqid('template_'), $resourceType), 'template' => new DataPart($template, $templateName ?? uniqid('template_'), $resourceType),
] ]
); );
@ -61,7 +61,7 @@ final class RelatorioDriver implements DriverInterface
$content = $e->getResponse()->getContent(false); $content = $e->getResponse()->getContent(false);
if (400 === $e->getResponse()->getStatusCode()) { if (400 === $e->getResponse()->getStatusCode()) {
$content = json_decode($content, true); $content = json_decode($content, true, 512, JSON_THROW_ON_ERROR);
$this->logger->error('relatorio: template error', [ $this->logger->error('relatorio: template error', [
'error' => $content['message'] ?? '_not defined', 'error' => $content['message'] ?? '_not defined',
]); ]);

View File

@ -95,7 +95,7 @@ class StoredObjectType extends AbstractType
return null; return null;
} }
return json_decode($value, true); return json_decode($value, true, 512, JSON_THROW_ON_ERROR);
} }
public function reverseTransformObject($object) public function reverseTransformObject($object)
@ -120,7 +120,7 @@ class StoredObjectType extends AbstractType
return null; return null;
} }
return json_encode($object); return json_encode($object, JSON_THROW_ON_ERROR);
} }
public function transformObject($object = null) public function transformObject($object = null)

View File

@ -665,7 +665,7 @@ class ExportController extends AbstractController
$this->logger->notice('[export] choices for an export unserialized', [ $this->logger->notice('[export] choices for an export unserialized', [
'key' => $key, 'key' => $key,
'rawData' => json_encode($rawData), 'rawData' => json_encode($rawData, JSON_THROW_ON_ERROR),
]); ]);
return $rawData; return $rawData;

View File

@ -109,10 +109,8 @@ class SearchController extends AbstractController
->getHasAdvancedFormSearchServices(); ->getHasAdvancedFormSearchServices();
if (count($advancedSearchProviders) === 1) { if (count($advancedSearchProviders) === 1) {
reset($advancedSearchProviders);
return $this->redirectToRoute('chill_main_advanced_search', [ return $this->redirectToRoute('chill_main_advanced_search', [
'name' => key($advancedSearchProviders), 'name' => array_key_first($advancedSearchProviders),
]); ]);
} }

View File

@ -41,7 +41,7 @@ class Point implements JsonSerializable
public static function fromGeoJson(string $geojson): self public static function fromGeoJson(string $geojson): self
{ {
$a = json_decode($geojson); $a = json_decode($geojson, null, 512, JSON_THROW_ON_ERROR);
if (null === $a) { if (null === $a) {
throw PointException::badJsonString($geojson); throw PointException::badJsonString($geojson);
@ -96,7 +96,7 @@ class Point implements JsonSerializable
{ {
$array = $this->toArrayGeoJson(); $array = $this->toArrayGeoJson();
return json_encode($array); return json_encode($array, JSON_THROW_ON_ERROR);
} }
public function toWKT(): string public function toWKT(): string

View File

@ -29,7 +29,7 @@ class AggregateStringHelper
return implode( return implode(
'|', '|',
json_decode($value, true) json_decode($value, true, 512, JSON_THROW_ON_ERROR)
); );
}; };
} }

View File

@ -310,7 +310,7 @@ class ExportAddressHelper
return ''; return '';
} }
return $this->translatableStringHelper->localize(json_decode($value, true)); return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
}; };
case 'isNoAddress': case 'isNoAddress':
@ -369,7 +369,7 @@ class ExportAddressHelper
return ''; return '';
} }
$decodedValues = json_decode($value, true); $decodedValues = json_decode($value, true, 512, JSON_THROW_ON_ERROR);
switch (count($decodedValues)) { switch (count($decodedValues)) {
case 0: case 0:

View File

@ -39,7 +39,7 @@ class TranslatableStringExportLabelHelper
return ''; return '';
} }
return $this->translatableStringHelper->localize(json_decode($value, true)); return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
}; };
} }
@ -54,7 +54,7 @@ class TranslatableStringExportLabelHelper
return ''; return '';
} }
$decoded = json_decode($value, true); $decoded = json_decode($value, true, 512, JSON_THROW_ON_ERROR);
return implode( return implode(
'|', '|',

View File

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

View File

@ -43,7 +43,7 @@ class EntityToJsonTransformer implements DataTransformerInterface
public function reverseTransform($value) public function reverseTransform($value)
{ {
$denormalized = json_decode($value, true); $denormalized = json_decode($value, true, 512, JSON_THROW_ON_ERROR);
if ($this->multiple) { if ($this->multiple) {
if (null === $denormalized) { if (null === $denormalized) {

View File

@ -224,7 +224,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
return null; return null;
} }
$validation = json_decode($response->getBody()->getContents())->carrier->type; $validation = json_decode($response->getBody()->getContents(), null, 512, JSON_THROW_ON_ERROR)->carrier->type;
$item $item
->set($validation) ->set($validation)

View File

@ -44,7 +44,7 @@ final class PermissionApiControllerTest extends WebTestCase
$this->assertResponseIsSuccessful(); $this->assertResponseIsSuccessful();
$data = json_decode($client->getResponse()->getContent(), true); $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertFalse($data['roles']['FOO_ROLE']); $this->assertFalse($data['roles']['FOO_ROLE']);
} }
@ -67,7 +67,7 @@ final class PermissionApiControllerTest extends WebTestCase
$this->assertResponseIsSuccessful(); $this->assertResponseIsSuccessful();
$data = json_decode($client->getResponse()->getContent(), true); $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertTrue($data['roles']['ROLE_USER']); $this->assertTrue($data['roles']['ROLE_USER']);
$this->assertFalse($data['roles']['ROLE_ADMIN']); $this->assertFalse($data['roles']['ROLE_ADMIN']);
} }

View File

@ -35,7 +35,7 @@ final class PostalCodeApiControllerTest extends WebTestCase
$this->assertResponseIsSuccessful(); $this->assertResponseIsSuccessful();
$data = json_decode($client->getResponse()->getContent(), true); $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertEquals('Fontenay Le Comte', $data['results'][0]['name']); $this->assertEquals('Fontenay Le Comte', $data['results'][0]['name']);

View File

@ -47,7 +47,7 @@ final class UserApiControllerTest extends WebTestCase
$this->assertResponseIsSuccessful(); $this->assertResponseIsSuccessful();
$data = json_decode($client->getResponse()->getContent(), true); $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
$this->assertTrue(array_key_exists('count', $data)); $this->assertTrue(array_key_exists('count', $data));
$this->assertGreaterThan(0, $data['count']); $this->assertGreaterThan(0, $data['count']);
$this->assertTrue(array_key_exists('results', $data)); $this->assertTrue(array_key_exists('results', $data));

View File

@ -64,7 +64,7 @@ final class GeographicalUnitBaseImporterTest extends KernelTestCase
$this->assertEquals($results['unitrefid'], 'layer_one'); $this->assertEquals($results['unitrefid'], 'layer_one');
$this->assertEquals($results['unitname'], 'Layer one'); $this->assertEquals($results['unitname'], 'Layer one');
$this->assertEquals(json_decode($results['layername'], true), ['fr' => 'Test Layer']); $this->assertEquals(json_decode($results['layername'], true, 512, JSON_THROW_ON_ERROR), ['fr' => 'Test Layer']);
$this->assertEquals($results['layerrefid'], 'test'); $this->assertEquals($results['layerrefid'], 'test');
$this->assertEquals($results['geom'], 'MULTIPOLYGON(((30 20,45 40,10 40,30 20)),((15 5,40 10,10 20,5 10,15 5)))'); $this->assertEquals($results['geom'], 'MULTIPOLYGON(((30 20,45 40,10 40,30 20)),((15 5,40 10,10 20,5 10,15 5)))');
@ -93,7 +93,7 @@ final class GeographicalUnitBaseImporterTest extends KernelTestCase
$this->assertEquals($results['unitrefid'], 'layer_one'); $this->assertEquals($results['unitrefid'], 'layer_one');
$this->assertEquals($results['unitname'], 'Layer one fixed'); $this->assertEquals($results['unitname'], 'Layer one fixed');
$this->assertEquals(json_decode($results['layername'], true), ['fr' => 'Test Layer fixed']); $this->assertEquals(json_decode($results['layername'], true, 512, JSON_THROW_ON_ERROR), ['fr' => 'Test Layer fixed']);
$this->assertEquals($results['layerrefid'], 'test'); $this->assertEquals($results['layerrefid'], 'test');
$this->assertEquals($results['geom'], 'MULTIPOLYGON(((130 120,45 40,10 40,130 120)),((0 0,15 5,40 10,10 20,0 0)))'); $this->assertEquals($results['geom'], 'MULTIPOLYGON(((130 120,45 40,10 40,130 120)),((0 0,15 5,40 10,10 20,0 0)))');
} }

View File

@ -49,18 +49,18 @@ final class Version20180709181423 extends AbstractMigration
$this->addSql('CREATE UNIQUE INDEX UNIQ_1483A5E9885281E ON users (emailCanonical)'); $this->addSql('CREATE UNIQUE INDEX UNIQ_1483A5E9885281E ON users (emailCanonical)');
$this->addSql( $this->addSql(
<<<'SQL' <<<'SQL_WRAP'
CREATE OR REPLACE FUNCTION canonicalize_user_on_update() RETURNS TRIGGER AS CREATE OR REPLACE FUNCTION canonicalize_user_on_update() RETURNS TRIGGER AS
$BODY$ $BODY$
BEGIN BEGIN
IF NEW.username <> OLD.username OR NEW.email <> OLD.email OR OLD.emailcanonical IS NULL OR OLD.usernamecanonical IS NULL THEN IF NEW.username <> OLD.username OR NEW.email <> OLD.email OR OLD.emailcanonical IS NULL OR OLD.usernamecanonical IS NULL THEN
UPDATE users SET usernamecanonical=LOWER(UNACCENT(NEW.username)), emailcanonical=LOWER(UNACCENT(NEW.email)) WHERE id=NEW.id; UPDATE users SET usernamecanonical=LOWER(UNACCENT(NEW.username)), emailcanonical=LOWER(UNACCENT(NEW.email)) WHERE id=NEW.id;
END IF; END IF;
RETURN NEW; RETURN NEW;
END; END;
$BODY$ LANGUAGE PLPGSQL $BODY$ LANGUAGE PLPGSQL
SQL SQL_WRAP
); );
$this->addSql( $this->addSql(
@ -74,16 +74,16 @@ final class Version20180709181423 extends AbstractMigration
); );
$this->addSql( $this->addSql(
<<<'SQL' <<<'SQL_WRAP'
CREATE OR REPLACE FUNCTION canonicalize_user_on_insert() RETURNS TRIGGER AS CREATE OR REPLACE FUNCTION canonicalize_user_on_insert() RETURNS TRIGGER AS
$BODY$ $BODY$
BEGIN BEGIN
UPDATE users SET usernamecanonical=LOWER(UNACCENT(NEW.username)), emailcanonical=LOWER(UNACCENT(NEW.email)) WHERE id=NEW.id; UPDATE users SET usernamecanonical=LOWER(UNACCENT(NEW.username)), emailcanonical=LOWER(UNACCENT(NEW.email)) WHERE id=NEW.id;
RETURN NEW; RETURN NEW;
END; END;
$BODY$ LANGUAGE PLPGSQL; $BODY$ LANGUAGE PLPGSQL;
SQL SQL_WRAP
); );
$this->addSql( $this->addSql(

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -313,10 +313,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters [], // parameters
[], // files [], // files
[], // server parameters [], // server parameters
json_encode(['type' => 'person', 'id' => $personId]) json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
); );
$response = $this->client->getResponse(); $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)); $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@ -338,7 +338,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
} }
$response = $this->client->getResponse(); $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 // check that the person id is contained
$participationsPersonsIds = array_map( $participationsPersonsIds = array_map(
@ -357,10 +357,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters [], // parameters
[], // files [], // files
[], // server parameters [], // server parameters
json_encode(['type' => 'person', 'id' => $personId]) json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
); );
$response = $this->client->getResponse(); $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)); $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)); $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'); $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('id', $data);
$this->assertArrayHasKey('type', $data); $this->assertArrayHasKey('type', $data);
$this->assertEquals('social_issue', $data['type']); $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)); $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'); $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( $this->assertEquals(
$data->id, $data->id,
$periodId, $periodId,
@ -453,7 +453,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters [], // parameters
[], // files [], // files
[], // server parameters [], // server parameters
json_encode(['type' => 'accompanying_period', 'emergency' => !$initialValueEmergency]) json_encode(['type' => 'accompanying_period', 'emergency' => !$initialValueEmergency], JSON_THROW_ON_ERROR)
); );
$response = $this->client->getResponse(); $response = $this->client->getResponse();
@ -492,7 +492,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
json_encode(['type' => 'accompanying_period_comment', 'content' => 'this is a text']) json_encode(['type' => 'accompanying_period_comment', 'content' => 'this is a text'])
); );
$response = $this->client->getResponse(); $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)); $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@ -508,10 +508,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters [], // parameters
[], // files [], // files
[], // server parameters [], // 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(); $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)); $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
} }
@ -568,10 +568,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters [], // parameters
[], // files [], // files
[], // server parameters [], // server parameters
json_encode(['type' => 'person', 'id' => $personId]) json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
); );
$response = $this->client->getResponse(); $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)); $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@ -595,10 +595,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], // parameters [], // parameters
[], // files [], // files
[], // server parameters [], // server parameters
json_encode(['type' => 'thirdparty', 'id' => $thirdPartyId]) json_encode(['type' => 'thirdparty', 'id' => $thirdPartyId], JSON_THROW_ON_ERROR)
); );
$response = $this->client->getResponse(); $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)); $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]]) json_encode(['type' => 'accompanying_period_resource', 'resource' => ['type' => 'person', 'id' => $personId]])
); );
$response = $this->client->getResponse(); $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)); $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@ -680,7 +680,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], [],
[], [],
[], //server [], //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(); $response = $this->client->getResponse();
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true)); $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]]) json_encode(['type' => 'accompanying_period_resource', 'resource' => ['type' => 'thirdparty', 'id' => $thirdPartyId]])
); );
$response = $this->client->getResponse(); $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)); $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
@ -724,7 +724,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
[], [],
[], [],
[], //server [], //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(); $response = $this->client->getResponse();
$this->assertTrue(in_array($response->getStatusCode(), [200, 422], true)); $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));

View File

@ -157,7 +157,7 @@ final class HouseholdApiControllerTest extends WebTestCase
); );
$this->assertResponseIsSuccessful(); $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('count', $data);
$this->assertArrayHasKey('results', $data); $this->assertArrayHasKey('results', $data);

View File

@ -179,7 +179,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
$client->getResponse()->getStatusCode() $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); $this->assertEquals(null, $data);
} }
@ -284,7 +284,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
$client->getResponse()->getStatusCode() $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->assertIsArray($data);
$this->assertArrayHasKey('members', $data); $this->assertArrayHasKey('members', $data);

View File

@ -112,7 +112,7 @@ final class PersonApiControllerTest extends WebTestCase
$this->assertResponseIsSuccessful(); $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('type', $data);
$this->assertArrayHasKey('id', $data); $this->assertArrayHasKey('id', $data);

View File

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

View File

@ -47,7 +47,7 @@ final class SocialIssueApiControllerTest extends WebTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode()); $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('id', $data);
$this->assertArrayHasKey('type', $data); $this->assertArrayHasKey('type', $data);
@ -60,7 +60,7 @@ final class SocialIssueApiControllerTest extends WebTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode()); $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, $data['count']);
$this->assertGreaterThan(0, count($data['results'])); $this->assertGreaterThan(0, count($data['results']));

View File

@ -77,7 +77,7 @@ final class SocialWorkEvaluationApiControllerTest extends WebTestCase
$this->assertResponseIsSuccessful(); $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']); $ids = array_map(static fn (array $item) => $item['id'], $content['results']);

View File

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

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

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 TRIGGER canonicalize_fullname_on_alt_name_delete ON chill_person_alt_name;');
$this->addSql('DROP FUNCTION canonicalize_fullname_on_alt_name_alter();'); $this->addSql('DROP FUNCTION canonicalize_fullname_on_alt_name_alter();');
$this->addSql( $this->addSql(
<<<'SQL' <<<'SQL_WRAP'
CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS
$BODY$ $BODY$
BEGIN BEGIN
IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname
THEN THEN
UPDATE chill_person_person UPDATE chill_person_person
SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname))) SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
WHERE id=NEW.id; WHERE id=NEW.id;
END IF; END IF;
RETURN NEW; RETURN NEW;
END; END;
$BODY$ LANGUAGE PLPGSQL; $BODY$ LANGUAGE PLPGSQL;
SQL SQL_WRAP
); );
} }

View File

@ -276,7 +276,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
return ''; return '';
} }
return $this->translatableStringHelper->localize(json_decode($value, true)); return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
}; };
default: default:
@ -526,13 +526,13 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
return $this->customFieldProvider return $this->customFieldProvider
->getCustomFieldByType($cf->getType()) ->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)) { if ($cfType instanceof CustomFieldChoice && $cfType->isMultiple($cf)) {
return function ($value) use ($cf, $cfType, $key) { return function ($value) use ($cf, $cfType, $key) {
$slugChoice = $this->extractInfosFromSlug($key)['additionnalInfos']['choiceSlug']; $slugChoice = $this->extractInfosFromSlug($key)['additionnalInfos']['choiceSlug'];
$decoded = json_decode($value, true); $decoded = json_decode($value, true, 512, JSON_THROW_ON_ERROR);
if ('_header' === $value) { if ('_header' === $value) {
$label = $cfType->getChoices($cf)[$slugChoice]; $label = $cfType->getChoices($cf)[$slugChoice];

View File

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