préparation date bulletin de paie des CESU, relecture

1 files changed, 9 insertions, 14 deletions

diff --git a/src/model/entities/Facture.php b/src/model/entities/Facture.php
index 2eea0e5..9a9a89d 100644
--- a/src/model/entities/Facture.php
+++ b/src/model/entities/Facture.php
@@ -43,12 +43,8 @@ class Facture
 

     public static EntityManager $entityManager;

 

-    public function __construct(Prestation $presta = null)

-    {

-        if($presta != null)

-        {

-            $this->setPresta($presta);

-        }

+    public function __construct(?Prestation $presta = null){

+        $this->setPresta($presta);

     }

 

     // getters

@@ -62,8 +58,8 @@ class Facture
         return get_object_vars($this);

     }

     public function getTotalMainDOeuvre(): float

-    {
-        return $this->total_main_d_oeuvre;
+    {

+        return $this->total_main_d_oeuvre;

     }

     public function getTotalPieces(): float

     {

@@ -75,7 +71,7 @@ class Facture
     }

     

     public function getAllWithWindowFields(): array

-    {
+    {

         //~ $taches = ["Tâches:" => $this->taches];

         //~ $champs_facture = [

             //~ "PC:" => $this->machine,

@@ -99,7 +95,7 @@ class Facture
             "Pièces:" => $this->pieces,

             "Total des pièces:" => $this->total_pieces,

             "Déplacement:" => $this->deplacement,

-            "Total HT:" => $this->total_HT];
+            "Total HT:" => $this->total_HT];

     }

 

     // setters

@@ -227,17 +223,16 @@ class Facture
         return str_replace($search, '', $data);

     }

     // à mettre plus tard dans une classe mère

-    public function hydrate(string $answers)

+    public function hydrate(string $answers): void

     {

         $answers = $this->cleanSpecialChars($answers); // possibilité que $answers devienne une chaine vide

         if($answers == '')

         {

             echo "erreur de Facture::hydrate(), la chaine \$answers est vide.\n";

-            return false;

+            return;

         }

         $data_array = explode('|', $answers); // array

 

-        $check = false;

         if(count($data_array) === 11) // facture normale

         {

             $this->getPresta()->setModePaiement($data_array[10]);

@@ -254,7 +249,7 @@ class Facture
         else

         {

             echo "erreur de Facture::hydrate(), le tableau \$data_array n'a pas la taille attendue.\n";

-            return false;

+            return;

         }

 

         //self::$entityManager->persist('Prestation');