sonar

Author: sreichel

app/code/core/Mage/Eav/Model/Attribute/Data/Date.php

@@ -58,17 +58,19 @@ public function validateValue($value)
             $errors = array_merge($errors, $result);
         }
 
-        //range validation
+        // Default date format
+        $format = 'd/m/Y';
+        // Range validation
         $validateRules = $attribute->getValidateRules();
         if ((!empty($validateRules['date_range_min']) && (Carbon::parse($value)->getTimestamp() < $validateRules['date_range_min']))
             || (!empty($validateRules['date_range_max']) && (Carbon::parse($value)->getTimestamp() > $validateRules['date_range_max']))
         ) {
             if (!empty($validateRules['date_range_min']) && !empty($validateRules['date_range_max'])) {
-                $errors[] = Mage::helper('customer')->__('Please enter a valid date between %s and %s at %s.', Carbon::createFromTimestamp($validateRules['date_range_min'])->format('d/m/Y'), Carbon::createFromTimestamp($validateRules['date_range_max'])->format('d/m/Y'), $label);
+                $errors[] = Mage::helper('customer')->__('Please enter a valid date between %s and %s at %s.', Carbon::createFromTimestamp($validateRules['date_range_min'])->format($format), Carbon::createFromTimestamp($validateRules['date_range_max'])->format($format), $label);
             } elseif (!empty($validateRules['date_range_min'])) {
-                $errors[] = Mage::helper('customer')->__('Please enter a valid date equal to or greater than %s at %s.', Carbon::createFromTimestamp($validateRules['date_range_min'])->format('d/m/Y'), $label);
+                $errors[] = Mage::helper('customer')->__('Please enter a valid date equal to or greater than %s at %s.', Carbon::createFromTimestamp($validateRules['date_range_min'])->format($format), $label);
             } elseif (!empty($validateRules['date_range_max'])) {
-                $errors[] = Mage::helper('customer')->__('Please enter a valid date less than or equal to %s at %s.', Carbon::createFromTimestamp($validateRules['date_range_max'])->format('d/m/Y'), $label);
+                $errors[] = Mage::helper('customer')->__('Please enter a valid date less than or equal to %s at %s.', Carbon::createFromTimestamp($validateRules['date_range_max'])->format($format), $label);
             }
         }
 

app/code/core/Mage/Reports/Model/Test.php

@@ -16,6 +16,8 @@
  */
 class Mage_Reports_Model_Test extends Varien_Object
 {
+    public const DATETIME_INTERNAL_FORMAT = 'Y-m-d H:i';
+
     /**
      * @return false|string
      */
@@ -78,11 +80,11 @@ public function getAllLinearExample()
         $allData = [];
         $countOfStartData = 12;
         for ($i = 1; $i <= $countOfStartData; $i++) {
-            $allData[] = ['time' => Carbon::createFromTimestamp($startPoint)->format('Y-m-d H:i'), 'value' => random_int(1, 100)];
+            $allData[] = ['time' => Carbon::createFromTimestamp($startPoint)->format(self::DATETIME_INTERNAL_FORMAT), 'value' => random_int(1, 100)];
             $startPoint += 30 * 60;
         }
 
-        $allData[] = ['time' => Carbon::createFromTimestamp($startPoint + (90 * 60))->format('Y-m-d H:i')];
+        $allData[] = ['time' => Carbon::createFromTimestamp($startPoint + (90 * 60))->format(self::DATETIME_INTERNAL_FORMAT)];
 
         $session -> setData('startPoint', $startPoint);
 
@@ -101,11 +103,11 @@ public function getNewLinearData()
         $reset = 12;
 
         $newData  = [
-            ['time' => Carbon::createFromTimestamp($startPoint)->format('Y-m-d H:i'), 'value' => random_int(1, 100)],
+            ['time' => Carbon::createFromTimestamp($startPoint)->format(self::DATETIME_INTERNAL_FORMAT), 'value' => random_int(1, 100)],
         ];
 
         $startPoint += 30 * 60;
-        $newData[]  = ['time' => Carbon::createFromTimestamp($startPoint + (90 * 60))->format('Y-m-d H:i')];
+        $newData[]  = ['time' => Carbon::createFromTimestamp($startPoint + (90 * 60))->format(self::DATETIME_INTERNAL_FORMAT)];
 
         $session->setData('startPoint', $startPoint);
 

tests/unit/Traits/DataProvider/Mage/Core/Helper/DataTrait.php

@@ -21,7 +21,7 @@ public function provideFormatTimezoneDate(): Generator
         $date           = date_create()->getTimestamp();
         $dateShort      = Carbon::createFromTimestamp($date)->format('n/j/Y');
         $dateLong       = Carbon::createFromTimestamp($date)->format('F j, Y');
-        $dateShortTime  = Carbon::createFromTimestamp($date)->format('n/j/Y g:i A');
+        # $dateShortTime  = Carbon::createFromTimestamp($date)->format('n/j/Y g:i A');
 
         yield 'null' => [
             $dateShort,