1 files changed, 48 insertions, 39 deletions

diff --git a/src/Dates.php b/src/Dates.php
index 36b19a8..ff6e318 100644
--- a/src/Dates.php
+++ b/src/Dates.php
@@ -1,5 +1,8 @@
 <?php
 // php/DateTimestamp.php
+//
+// attention à strtotime(), php "devine" le format de la date selon qu'elle comporte des slashs / ou des tirets -
+// pour php une date avec des slashs / est américaine, mais si on fait comme ça aussi par ici
 
 class Dates
 {
@@ -21,27 +24,40 @@ class Dates
         elseif(gettype($input) === 'integer' && $input !== 0)
         {
             $this->setTimestamp($input);
+            $this->setDayMonthYear($this->date);
         }
     }
     
     
+    // getters
+    public function getDate(): string
+    {
+        return($this->date);
+    }
+    public function getDay(): string
+    {
+        return($this->day);
+    }
+    public function getMonth(): string
+    {
+        return($this->month);
+    }
+    public function getYear(): string
+    {
+        return($this->year);
+    }
+    
+    public function getTimestamp(): int
+    {
+        return($this->timestamp);
+    }
+    
+    
+    // setters
     public function setDate(string $input)
     {
-        $input = $this->dashOrSlash($input); // pour strtotime()
-            
-        $splitedDate = preg_split('#\D#', $input); // \D = tout sauf chiffre
-        $this->year = $splitedDate[2];
-        
-        if(self::$date_format === 'euro')
-        {
-            $this->day = $splitedDate[1];
-            $this->month = $splitedDate[0];
-        }
-        else
-        {
-            $this->day = $splitedDate[0];
-            $this->month = $splitedDate[1];
-        }
+        $input = $this->dashOrSlash($input); // formate pour strtotime()
+        $this->setDayMonthYear($input);
         
         //~ if(checkdate($splitedDate[0], $splitedDate[1], $splitedDate[2]))
         if(checkdate($this->day, $this->month, $this->year))
@@ -62,33 +78,26 @@ class Dates
     public function setTimestamp(int $input)
     {
         $this->timestamp = $input;
-        $this->date = $this->timestamp_to_date($input); // timestamp (int) -> date (string)
+        $this->date = $this->timestampToDate($input); // timestamp (int) -> date (string)
     }
     
-    
-    public function getDate(): string
-    {
-        return($this->date);
-    }
-    public function getDay(): string
-    {
-        return($this->day);
-    }
-    public function getMonth(): string
+    public function setDayMonthYear(string $input)
     {
-        return($this->month);
-    }
-    public function getYear(): string
-    {
-        return($this->year);
-    }
-    
-    public function getTimestamp(): int
-    {
-        return($this->timestamp);
+        $splitedDate = preg_split('#\D#', $input); // \D = tout sauf chiffre
+        
+        if(self::$date_format === 'euro')
+        {
+            $this->day = $splitedDate[1];
+            $this->month = $splitedDate[0];
+        }
+        else
+        {
+            $this->day = $splitedDate[0];
+            $this->month = $splitedDate[1];
+        }
+        $this->year = $splitedDate[2];
     }
     
-    
     private function dashOrSlash(string $date): string
     {
         if(self::$date_format === 'euro')
@@ -108,11 +117,11 @@ class Dates
         }
     }
     
-    private function timestamp_to_date(int $timestamp): string
+    private function timestampToDate(int $timestamp): string
     {
         if(self::$date_format === 'euro')
         {
-            return(date("j-m-Y", $timestamp));
+            return(date("d-m-Y", $timestamp));
         }
         elseif(self::$date_format === 'usa')
         {