From 45063fa6fe3b59a2f145a959016568f0e8e94187 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 23 Nov 2021 12:08:13 +0100
Subject: [PATCH] sa: Fix "...Variable property access on string...".

---
 .../Controller/DocGeneratorController.php     | 17 +++++---------
 .../DocGeneratorTemplateController.php        | 22 ++++++++-----------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorController.php
index f67e3bbe0..a1f19b670 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorController.php
@@ -22,14 +22,10 @@ class DocGeneratorController extends AbstractController
      *  "{_locale}/doc/gen/test",
      *  name="chill_docgenerator_test"
      * )
-     *
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function testAction()
+    public function testAction(): Response
     {
-        return (new Response())
-            ->setContent('Test');
+        return (new Response())->setContent('Test');
     }
 
     /**
@@ -37,11 +33,8 @@ class DocGeneratorController extends AbstractController
      *  "{_locale}/doc/gen/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(
                 'GET',
@@ -50,10 +43,10 @@ class DocGeneratorController extends AbstractController
                 );
 
         $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->setValues(array('firstname' => 'John', 'lastname' => 'Doe'));
+        $templateProcessor->setValues(['firstname' => 'John', 'lastname' => 'Doe']);
 
         $tmpfname2 = tempnam(sys_get_temp_dir(), 'DOC_GENERATED');
         $templateProcessor->saveAs($tmpfname2);
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index d82d8a0a7..ff67cbf8b 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -2,6 +2,7 @@
 
 namespace Chill\DocGeneratorBundle\Controller;
 
+use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
 use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
@@ -22,11 +23,6 @@ use GuzzleHttp\Client;
 // TODO à mettre dans services
 use Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext;
 
-/**
- * Class DocGeneratorTemplateController
- *
- * @package Chill\DocGeneratorBundle\Controller
- */
 class DocGeneratorTemplateController extends AbstractController
 {
     /**
@@ -40,17 +36,17 @@ class DocGeneratorTemplateController extends AbstractController
     {
         $entities = $templateRepository->findByEntity($entityClassName);
 
-        $ret = array();
+        $ret = [];
 
         foreach ($entities as $entity) {
-            $ret[] = array(
+            $ret[] = [
                 'id' => $entity->getId(),
                 'name' => $entity->getName(),
                 'description' => $entity->getDescription()
-            );
+            ];
         }
 
-        return new JsonResponse(["results" => $ret]);
+        return new JsonResponse(['results' => $ret]);
     }
 
     /**
@@ -60,7 +56,7 @@ class DocGeneratorTemplateController extends AbstractController
      * )
      */
     public function generateDocFromTemplateAction(
-        \ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface $tempUrlGenerator,
+        TempUrlGeneratorInterface $tempUrlGenerator,
         DocGeneratorTemplate $template,
         string $entityClassName,
         int $entityId,
@@ -71,7 +67,7 @@ class DocGeneratorTemplateController extends AbstractController
             $template->getFile());
 
         $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);
 
@@ -79,7 +75,7 @@ class DocGeneratorTemplateController extends AbstractController
             $context = new HouseholdMemberSelectionContext();
             $datas = $context->getData($entity);
         } else {
-            throw new \Exception("Not implemented", 1);
+            throw new \Exception('Not implemented', 1);
         }
 
         $templateProcessor = new TemplateProcessor($tmpfname);
@@ -110,7 +106,7 @@ class DocGeneratorTemplateController extends AbstractController
         $client = new Client();
 
         try {
-            $putResponse = $client->request('PUT', $getUrlGen->{'url'}, [
+            $putResponse = $client->request('PUT', $getUrlGen->url, [
                 'body' => $fileContent
             ]);