sa: Fix "...Variable property access on string...".

This commit is contained in:
Pol Dellaiera 2021-11-23 12:08:13 +01:00
parent 1e804f351c
commit 45063fa6fe
No known key found for this signature in database
GPG Key ID: D476DFE9C67467CA
2 changed files with 14 additions and 25 deletions

View File

@ -22,14 +22,10 @@ class DocGeneratorController extends AbstractController
* "{_locale}/doc/gen/test", * "{_locale}/doc/gen/test",
* name="chill_docgenerator_test" * name="chill_docgenerator_test"
* ) * )
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\Response
*/ */
public function testAction() public function testAction(): Response
{ {
return (new Response()) return (new Response())->setContent('Test');
->setContent('Test');
} }
/** /**
@ -37,11 +33,8 @@ class DocGeneratorController extends AbstractController
* "{_locale}/doc/gen/test", * "{_locale}/doc/gen/test",
* name="chill_docgenerator_test" * name="chill_docgenerator_test"
* ) * )
*
* @param Request $request
* @return \Symfony\Component\HttpFoundation\Response
*/ */
public function getDoc(Request $request, TempUrlOpenstackGenerator $tempUrlGenerator) public function getDoc(Request $request, TempUrlOpenstackGenerator $tempUrlGenerator): Response
{ {
$p = $tempUrlGenerator->generate( $p = $tempUrlGenerator->generate(
'GET', 'GET',
@ -50,10 +43,10 @@ class DocGeneratorController extends AbstractController
); );
$tmpfname = tempnam(sys_get_temp_dir(), 'DOC_TEMPLATE'); $tmpfname = tempnam(sys_get_temp_dir(), 'DOC_TEMPLATE');
file_put_contents($tmpfname, file_get_contents($p->{"url"})); file_put_contents($tmpfname, file_get_contents($p->url));
$templateProcessor = new TemplateProcessor($tmpfname); $templateProcessor = new TemplateProcessor($tmpfname);
$templateProcessor->setValues(array('firstname' => 'John', 'lastname' => 'Doe')); $templateProcessor->setValues(['firstname' => 'John', 'lastname' => 'Doe']);
$tmpfname2 = tempnam(sys_get_temp_dir(), 'DOC_GENERATED'); $tmpfname2 = tempnam(sys_get_temp_dir(), 'DOC_GENERATED');
$templateProcessor->saveAs($tmpfname2); $templateProcessor->saveAs($tmpfname2);

View File

@ -2,6 +2,7 @@
namespace Chill\DocGeneratorBundle\Controller; namespace Chill\DocGeneratorBundle\Controller;
use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository; use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
use Chill\DocStoreBundle\Entity\StoredObject; use Chill\DocStoreBundle\Entity\StoredObject;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
@ -22,11 +23,6 @@ use GuzzleHttp\Client;
// TODO à mettre dans services // TODO à mettre dans services
use Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext; use Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext;
/**
* Class DocGeneratorTemplateController
*
* @package Chill\DocGeneratorBundle\Controller
*/
class DocGeneratorTemplateController extends AbstractController class DocGeneratorTemplateController extends AbstractController
{ {
/** /**
@ -40,17 +36,17 @@ class DocGeneratorTemplateController extends AbstractController
{ {
$entities = $templateRepository->findByEntity($entityClassName); $entities = $templateRepository->findByEntity($entityClassName);
$ret = array(); $ret = [];
foreach ($entities as $entity) { foreach ($entities as $entity) {
$ret[] = array( $ret[] = [
'id' => $entity->getId(), 'id' => $entity->getId(),
'name' => $entity->getName(), 'name' => $entity->getName(),
'description' => $entity->getDescription() 'description' => $entity->getDescription()
); ];
} }
return new JsonResponse(["results" => $ret]); return new JsonResponse(['results' => $ret]);
} }
/** /**
@ -60,7 +56,7 @@ class DocGeneratorTemplateController extends AbstractController
* ) * )
*/ */
public function generateDocFromTemplateAction( public function generateDocFromTemplateAction(
\ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface $tempUrlGenerator, TempUrlGeneratorInterface $tempUrlGenerator,
DocGeneratorTemplate $template, DocGeneratorTemplate $template,
string $entityClassName, string $entityClassName,
int $entityId, int $entityId,
@ -71,7 +67,7 @@ class DocGeneratorTemplateController extends AbstractController
$template->getFile()); $template->getFile());
$tmpfname = tempnam(sys_get_temp_dir(), 'DOC_TEMPLATE'); $tmpfname = tempnam(sys_get_temp_dir(), 'DOC_TEMPLATE');
file_put_contents($tmpfname, file_get_contents($getUrlGen->{"url"})); file_put_contents($tmpfname, file_get_contents($getUrlGen->url));
$entity = $this->getDoctrine()->getRepository($entityClassName)->find($entityId); $entity = $this->getDoctrine()->getRepository($entityClassName)->find($entityId);
@ -79,7 +75,7 @@ class DocGeneratorTemplateController extends AbstractController
$context = new HouseholdMemberSelectionContext(); $context = new HouseholdMemberSelectionContext();
$datas = $context->getData($entity); $datas = $context->getData($entity);
} else { } else {
throw new \Exception("Not implemented", 1); throw new \Exception('Not implemented', 1);
} }
$templateProcessor = new TemplateProcessor($tmpfname); $templateProcessor = new TemplateProcessor($tmpfname);
@ -110,7 +106,7 @@ class DocGeneratorTemplateController extends AbstractController
$client = new Client(); $client = new Client();
try { try {
$putResponse = $client->request('PUT', $getUrlGen->{'url'}, [ $putResponse = $client->request('PUT', $getUrlGen->url, [
'body' => $fileContent 'body' => $fileContent
]); ]);