Merge pull request #816 from pimcore/add-carbon

add nesbot/carbon to composer
pimcore · Feb 13, 2025 · 3b65df8 · 3b65df8
2 parents d486071 + 3f3b2ac
commit 3b65df8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -15,8 +15,9 @@
     "php": "~8.3.0 || ~8.4.0",
     "cbschuld/browser.php": "^1.9.6",
     "endroid/qr-code": "^6.0.1",
+    "nesbot/carbon": "^3.8.4",
     "phpoffice/phpspreadsheet": "^2.2 || ^3.3",
-    "pimcore/pimcore": "^12.x-dev",
+    "pimcore/pimcore": "^12.0",
     "symfony/webpack-encore-bundle": "^1.17 || ^2.0"
   },
   "require-dev": {

diff --git a/src/DataObject/GridColumnConfig/Operator/DateFormatter.php b/src/DataObject/GridColumnConfig/Operator/DateFormatter.php
@@ -90,7 +90,7 @@ public function format(mixed $theValue): string
     {
         $timestamp = null;
         if (is_int($theValue)) {
-            $theValue = Carbon::createFromTimestamp($theValue);
+            $theValue = Carbon::createFromTimestamp($theValue, date_default_timezone_get());
         }
         if ($theValue instanceof Carbon) {
             $timestamp = $theValue->getTimestamp();

diff --git a/src/Helper/QueryParams.php b/src/Helper/QueryParams.php
@@ -104,7 +104,7 @@ public static function getFilterCondition(string $filterString, array $matchExac
                  *
                  * filter: {type : 'date',dateFormat: 'timestamp'}
                  */
-                $date = Carbon::createFromTimestamp($f->value)->setTime(0, 0, 0);
+                $date = Carbon::createFromTimestamp($f->value, date_default_timezone_get())->setTime(0, 0, 0);
 
                 if ($f->operator == 'eq') {
                     $conditions[$f->property][] = ' ' . $f->property . ' >= ' . $db->quote($date->getTimestamp());