diff --git a/app/Models/Traits/DynamicScopes/FilterBetweenDatesScope.php b/app/Models/Traits/DynamicScopes/FilterBetweenDatesScope.php index 9896020..1347d33 100644 --- a/app/Models/Traits/DynamicScopes/FilterBetweenDatesScope.php +++ b/app/Models/Traits/DynamicScopes/FilterBetweenDatesScope.php @@ -4,9 +4,9 @@ namespace App\Models\Traits\DynamicScopes; -use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Carbon; /** * @template TModel of Model @@ -20,11 +20,11 @@ trait FilterBetweenDatesScope public function scopeFilterBetweenDates( Builder $query, string $column, - string $start_date, - string $end_date, + Carbon $startDate, + Carbon $endDate, ): Builder { return $query - ->where($column, '>=', Carbon::parse($start_date)->startOfDay()) - ->where($column, '<=', Carbon::parse($end_date)->endOfDay()); + ->where($column, '>=', $startDate->startOfDay()) + ->where($column, '<=', $endDate->endOfDay()); } } diff --git a/composer.lock b/composer.lock index 7ca4465..cf0aeef 100644 --- a/composer.lock +++ b/composer.lock @@ -986,16 +986,16 @@ }, { "name": "filament/actions", - "version": "v3.2.130", + "version": "v3.2.131", "source": { "type": "git", "url": "https://github.com/filamentphp/actions.git", - "reference": "1ee8b0a890b53e8b0b341134d3ba9bdaeee294d3" + "reference": "8d9ceaf392eeff55fd335f5169d14f84af8c325e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/actions/zipball/1ee8b0a890b53e8b0b341134d3ba9bdaeee294d3", - "reference": "1ee8b0a890b53e8b0b341134d3ba9bdaeee294d3", + "url": "https://api.github.com/repos/filamentphp/actions/zipball/8d9ceaf392eeff55fd335f5169d14f84af8c325e", + "reference": "8d9ceaf392eeff55fd335f5169d14f84af8c325e", "shasum": "" }, "require": { @@ -1035,20 +1035,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-12-05T08:56:37+00:00" + "time": "2024-12-17T13:03:16+00:00" }, { "name": "filament/filament", - "version": "v3.2.130", + "version": "v3.2.131", "source": { "type": "git", "url": "https://github.com/filamentphp/panels.git", - "reference": "9a327a54dec24e0b12c437ef799828f492cb882a" + "reference": "21febddcc6720b250b41386805a8dbd1deef2c56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/panels/zipball/9a327a54dec24e0b12c437ef799828f492cb882a", - "reference": "9a327a54dec24e0b12c437ef799828f492cb882a", + "url": "https://api.github.com/repos/filamentphp/panels/zipball/21febddcc6720b250b41386805a8dbd1deef2c56", + "reference": "21febddcc6720b250b41386805a8dbd1deef2c56", "shasum": "" }, "require": { @@ -1100,20 +1100,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-12-11T09:05:49+00:00" + "time": "2024-12-17T13:03:11+00:00" }, { "name": "filament/forms", - "version": "v3.2.130", + "version": "v3.2.131", "source": { "type": "git", "url": "https://github.com/filamentphp/forms.git", - "reference": "e6133bdc03de05dfe23eac386b49e51093338883" + "reference": "72429b0df9c3d123273dd51ba62b764e2114697c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/forms/zipball/e6133bdc03de05dfe23eac386b49e51093338883", - "reference": "e6133bdc03de05dfe23eac386b49e51093338883", + "url": "https://api.github.com/repos/filamentphp/forms/zipball/72429b0df9c3d123273dd51ba62b764e2114697c", + "reference": "72429b0df9c3d123273dd51ba62b764e2114697c", "shasum": "" }, "require": { @@ -1156,20 +1156,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-12-11T09:05:38+00:00" + "time": "2024-12-17T13:03:11+00:00" }, { "name": "filament/infolists", - "version": "v3.2.130", + "version": "v3.2.131", "source": { "type": "git", "url": "https://github.com/filamentphp/infolists.git", - "reference": "0db994330e7fe21a9684256ea1fc34fee916a8d6" + "reference": "15c200a3172b88a6247ff4b7230f69982d848194" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/infolists/zipball/0db994330e7fe21a9684256ea1fc34fee916a8d6", - "reference": "0db994330e7fe21a9684256ea1fc34fee916a8d6", + "url": "https://api.github.com/repos/filamentphp/infolists/zipball/15c200a3172b88a6247ff4b7230f69982d848194", + "reference": "15c200a3172b88a6247ff4b7230f69982d848194", "shasum": "" }, "require": { @@ -1207,11 +1207,11 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-12-11T09:05:38+00:00" + "time": "2024-12-17T13:03:14+00:00" }, { "name": "filament/notifications", - "version": "v3.2.130", + "version": "v3.2.131", "source": { "type": "git", "url": "https://github.com/filamentphp/notifications.git", @@ -1263,16 +1263,16 @@ }, { "name": "filament/support", - "version": "v3.2.130", + "version": "v3.2.131", "source": { "type": "git", "url": "https://github.com/filamentphp/support.git", - "reference": "1654851f04733f48faed7235b032b2c5842b5629" + "reference": "ddc16d8da50d73f7300671b70c9dcb942d845d9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/support/zipball/1654851f04733f48faed7235b032b2c5842b5629", - "reference": "1654851f04733f48faed7235b032b2c5842b5629", + "url": "https://api.github.com/repos/filamentphp/support/zipball/ddc16d8da50d73f7300671b70c9dcb942d845d9d", + "reference": "ddc16d8da50d73f7300671b70c9dcb942d845d9d", "shasum": "" }, "require": { @@ -1283,7 +1283,7 @@ "illuminate/support": "^10.45|^11.0", "illuminate/view": "^10.45|^11.0", "kirschbaum-development/eloquent-power-joins": "^3.0|^4.0", - "livewire/livewire": "^3.5", + "livewire/livewire": "3.5.12", "php": "^8.1", "ryangjchandler/blade-capture-directive": "^0.2|^0.3|^1.0", "spatie/color": "^1.5", @@ -1318,20 +1318,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-12-11T12:57:14+00:00" + "time": "2024-12-17T13:03:15+00:00" }, { "name": "filament/tables", - "version": "v3.2.130", + "version": "v3.2.131", "source": { "type": "git", "url": "https://github.com/filamentphp/tables.git", - "reference": "d7dcaa4d5f04c7e6fb7b9d457083e6fa588ca600" + "reference": "224aea12a4a4cfcd158b53df94cdd190f8226cac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/tables/zipball/d7dcaa4d5f04c7e6fb7b9d457083e6fa588ca600", - "reference": "d7dcaa4d5f04c7e6fb7b9d457083e6fa588ca600", + "url": "https://api.github.com/repos/filamentphp/tables/zipball/224aea12a4a4cfcd158b53df94cdd190f8226cac", + "reference": "224aea12a4a4cfcd158b53df94cdd190f8226cac", "shasum": "" }, "require": { @@ -1370,20 +1370,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-12-11T12:57:12+00:00" + "time": "2024-12-17T13:03:09+00:00" }, { "name": "filament/widgets", - "version": "v3.2.130", + "version": "v3.2.131", "source": { "type": "git", "url": "https://github.com/filamentphp/widgets.git", - "reference": "6de1c84d71168fd1c6a5b1ae1e1b4ec5ee4b6f55" + "reference": "869a419fe42e2cf1b9461f2d1e702e2fcad030ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/widgets/zipball/6de1c84d71168fd1c6a5b1ae1e1b4ec5ee4b6f55", - "reference": "6de1c84d71168fd1c6a5b1ae1e1b4ec5ee4b6f55", + "url": "https://api.github.com/repos/filamentphp/widgets/zipball/869a419fe42e2cf1b9461f2d1e702e2fcad030ae", + "reference": "869a419fe42e2cf1b9461f2d1e702e2fcad030ae", "shasum": "" }, "require": { @@ -1414,7 +1414,7 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2024-11-27T16:52:29+00:00" + "time": "2024-12-17T13:03:07+00:00" }, { "name": "fruitcake/php-cors", @@ -2025,16 +2025,16 @@ }, { "name": "laravel/framework", - "version": "v11.35.1", + "version": "v11.36.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "dcfa130ede1a6fa4343dc113410963e791ad34fb" + "reference": "df06f5163f4550641fdf349ebc04916a61135a64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/dcfa130ede1a6fa4343dc113410963e791ad34fb", - "reference": "dcfa130ede1a6fa4343dc113410963e791ad34fb", + "url": "https://api.github.com/repos/laravel/framework/zipball/df06f5163f4550641fdf349ebc04916a61135a64", + "reference": "df06f5163f4550641fdf349ebc04916a61135a64", "shasum": "" }, "require": { @@ -2055,7 +2055,7 @@ "guzzlehttp/uri-template": "^1.0", "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0", "laravel/serializable-closure": "^1.3|^2.0", - "league/commonmark": "^2.2.1", + "league/commonmark": "^2.6", "league/flysystem": "^3.25.1", "league/flysystem-local": "^3.25.1", "league/uri": "^7.5.1", @@ -2070,7 +2070,7 @@ "symfony/console": "^7.0.3", "symfony/error-handler": "^7.0.3", "symfony/finder": "^7.0.3", - "symfony/http-foundation": "^7.0.3", + "symfony/http-foundation": "^7.2.0", "symfony/http-kernel": "^7.0.3", "symfony/mailer": "^7.0.3", "symfony/mime": "^7.0.3", @@ -2236,7 +2236,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-12-12T18:25:58+00:00" + "time": "2024-12-17T22:32:08+00:00" }, { "name": "laravel/prompts", @@ -2299,16 +2299,16 @@ }, { "name": "laravel/serializable-closure", - "version": "v2.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "0d8d3d8086984996df86596a86dea60398093a81" + "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/0d8d3d8086984996df86596a86dea60398093a81", - "reference": "0d8d3d8086984996df86596a86dea60398093a81", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/613b2d4998f85564d40497e05e89cb6d9bd1cbe8", + "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8", "shasum": "" }, "require": { @@ -2356,7 +2356,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2024-11-19T01:38:44+00:00" + "time": "2024-12-16T15:26:28+00:00" }, { "name": "league/commonmark", @@ -2549,16 +2549,16 @@ }, { "name": "league/csv", - "version": "9.20.0", + "version": "9.20.1", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "553579df208641ada6ffb450b3a151e2fcfa4f31" + "reference": "491d1e79e973a7370c7571dc0fe4a7241f4936ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/553579df208641ada6ffb450b3a151e2fcfa4f31", - "reference": "553579df208641ada6ffb450b3a151e2fcfa4f31", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/491d1e79e973a7370c7571dc0fe4a7241f4936ee", + "reference": "491d1e79e973a7370c7571dc0fe4a7241f4936ee", "shasum": "" }, "require": { @@ -2632,7 +2632,7 @@ "type": "github" } ], - "time": "2024-12-13T15:49:27+00:00" + "time": "2024-12-18T10:11:15+00:00" }, { "name": "league/flysystem", @@ -2998,16 +2998,16 @@ }, { "name": "livewire/livewire", - "version": "v3.5.17", + "version": "v3.5.12", "source": { "type": "git", "url": "https://github.com/livewire/livewire.git", - "reference": "7bbf80d93db9b866776bf957ca6229364bca8d87" + "reference": "3c8d1f9d7d9098aaea663093ae168f2d5d2ae73d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/7bbf80d93db9b866776bf957ca6229364bca8d87", - "reference": "7bbf80d93db9b866776bf957ca6229364bca8d87", + "url": "https://api.github.com/repos/livewire/livewire/zipball/3c8d1f9d7d9098aaea663093ae168f2d5d2ae73d", + "reference": "3c8d1f9d7d9098aaea663093ae168f2d5d2ae73d", "shasum": "" }, "require": { @@ -3062,7 +3062,7 @@ "description": "A front-end framework for Laravel.", "support": { "issues": "https://github.com/livewire/livewire/issues", - "source": "https://github.com/livewire/livewire/tree/v3.5.17" + "source": "https://github.com/livewire/livewire/tree/v3.5.12" }, "funding": [ { @@ -3070,7 +3070,7 @@ "type": "github" } ], - "time": "2024-12-06T13:41:21+00:00" + "time": "2024-10-15T19:35:06+00:00" }, { "name": "maks-oleksyuk/laravel-composer-scaffold", @@ -3301,16 +3301,16 @@ }, { "name": "nesbot/carbon", - "version": "3.8.2", + "version": "3.8.3", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947" + "reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947", - "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f01cfa96468f4c38325f507ab81a4f1d2cd93cfe", + "reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe", "shasum": "" }, "require": { @@ -3342,10 +3342,6 @@ ], "type": "library", "extra": { - "branch-alias": { - "dev-master": "3.x-dev", - "dev-2.x": "2.x-dev" - }, "laravel": { "providers": [ "Carbon\\Laravel\\ServiceProvider" @@ -3355,6 +3351,10 @@ "includes": [ "extension.neon" ] + }, + "branch-alias": { + "dev-2.x": "2.x-dev", + "dev-master": "3.x-dev" } }, "autoload": { @@ -3403,7 +3403,7 @@ "type": "tidelift" } ], - "time": "2024-11-07T17:46:48+00:00" + "time": "2024-12-21T18:03:19+00:00" }, { "name": "nette/schema", @@ -3642,16 +3642,16 @@ }, { "name": "openspout/openspout", - "version": "v4.28.2", + "version": "v4.28.3", "source": { "type": "git", "url": "https://github.com/openspout/openspout.git", - "reference": "d6dd654b5db502f28c5773edfa785b516745a142" + "reference": "12b5eddcc230a97a9a67a722ad75c247e1a16750" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/openspout/openspout/zipball/d6dd654b5db502f28c5773edfa785b516745a142", - "reference": "d6dd654b5db502f28c5773edfa785b516745a142", + "url": "https://api.github.com/repos/openspout/openspout/zipball/12b5eddcc230a97a9a67a722ad75c247e1a16750", + "reference": "12b5eddcc230a97a9a67a722ad75c247e1a16750", "shasum": "" }, "require": { @@ -3671,7 +3671,7 @@ "phpstan/phpstan": "^2.0.3", "phpstan/phpstan-phpunit": "^2.0.1", "phpstan/phpstan-strict-rules": "^2", - "phpunit/phpunit": "^11.4.4" + "phpunit/phpunit": "^11.5.0" }, "suggest": { "ext-iconv": "To handle non UTF-8 CSV files (if \"php-mbstring\" is not already installed or is too limited)", @@ -3719,7 +3719,7 @@ ], "support": { "issues": "https://github.com/openspout/openspout/issues", - "source": "https://github.com/openspout/openspout/tree/v4.28.2" + "source": "https://github.com/openspout/openspout/tree/v4.28.3" }, "funding": [ { @@ -3731,7 +3731,7 @@ "type": "github" } ], - "time": "2024-12-06T06:17:37+00:00" + "time": "2024-12-17T11:28:11+00:00" }, { "name": "phpoption/phpoption", @@ -7049,31 +7049,33 @@ }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "v2.2.7", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb" + "reference": "0d72ac1c00084279c1816675284073c5a337c20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb", - "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d", + "reference": "0d72ac1c00084279c1816675284073c5a337c20d", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "php": "^5.5 || ^7.0 || ^8.0", - "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" + "php": "^7.4 || ^8.0", + "symfony/css-selector": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10" + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpunit/phpunit": "^8.5.21 || ^9.5.10" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -7096,9 +7098,9 @@ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "support": { "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", - "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7" + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0" }, - "time": "2023-12-08T13:03:43+00:00" + "time": "2024-12-21T16:25:41+00:00" }, { "name": "vlucas/phpdotenv", @@ -7664,16 +7666,16 @@ }, { "name": "phpstan/phpstan", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "46b4d3529b12178112d9008337beda0cc2a1a6b4" + "reference": "50d276fc3bf1430ec315f2f109bbde2769821524" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46b4d3529b12178112d9008337beda0cc2a1a6b4", - "reference": "46b4d3529b12178112d9008337beda0cc2a1a6b4", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/50d276fc3bf1430ec315f2f109bbde2769821524", + "reference": "50d276fc3bf1430ec315f2f109bbde2769821524", "shasum": "" }, "require": { @@ -7718,7 +7720,7 @@ "type": "github" } ], - "time": "2024-11-28T22:19:37+00:00" + "time": "2024-12-17T17:14:01+00:00" }, { "name": "rector/rector",