Merge pull request #816 from pimcore/add-carbon

alexz707 · web-flow · commit 3b65df8a4e34 · 2025-02-13T15:04:43.000+01:00
add nesbot/carbon to composer
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());

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function format(mixed $theValue): string`
`90`	`90`	`{`
`91`	`91`	`$timestamp = null;`
`92`	`92`	`if (is_int($theValue)) {`
`93`		`- $theValue = Carbon::createFromTimestamp($theValue);`
	`93`	`+ $theValue = Carbon::createFromTimestamp($theValue, date_default_timezone_get());`
`94`	`94`	`}`
`95`	`95`	`if ($theValue instanceof Carbon) {`
`96`	`96`	`$timestamp = $theValue->getTimestamp();`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public static function getFilterCondition(string $filterString, array $matchExac`
`104`	`104`	`*`
`105`	`105`	`* filter: {type : 'date',dateFormat: 'timestamp'}`
`106`	`106`	`*/`
`107`		`- $date = Carbon::createFromTimestamp($f->value)->setTime(0, 0, 0);`
	`107`	`+ $date = Carbon::createFromTimestamp($f->value, date_default_timezone_get())->setTime(0, 0, 0);`
`108`	`108`
`109`	`109`	`if ($f->operator == 'eq') {`
`110`	`110`	`$conditions[$f->property][] = ' ' . $f->property . ' >= ' . $db->quote($date->getTimestamp());`