diff --git a/.env.example b/.env.example index 63ccc88e..444af1af 100644 --- a/.env.example +++ b/.env.example @@ -62,14 +62,18 @@ SAML2_CONTACT_TECHNICAL_EMAIL= SAML2_CONTACT_SUPPORT_EMAIL= SAML2_DEFAULT_TENANT_UUID= -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= +AWS_ACCESS_KEY_ID=minioadmin +AWS_SECRET_ACCESS_KEY=minioadmin AWS_DEFAULT_REGION=us-east-1 -AWS_BUCKET= -AWS_USE_PATH_STYLE_ENDPOINT=false +AWS_BUCKET=ovoteam +AWS_ENDPOINT=http://127.0.0.1:9000 +AWS_URL=http://127.0.0.1:9000/ovoteam +AWS_USE_PATH_STYLE_ENDPOINT=true VITE_APP_NAME="${APP_NAME}" SCOUT_DRIVER=meilisearch MEILISEARCH_HOST= MEILISEARCH_KEY= + +STORAGE_SERVICE_PREFIX=media diff --git a/_ide_helper.php b/_ide_helper.php index 9ac12e43..b8aa681c 100644 --- a/_ide_helper.php +++ b/_ide_helper.php @@ -5,7 +5,7 @@ /** * A helper file for Laravel, to provide autocomplete information to your IDE - * Generated for Laravel 13.37.0. + * Generated for Laravel 13.40.0. * * This file should not be included in your code, only analyzed by your IDE! * @@ -1781,7 +1781,7 @@ namespace Illuminate\Support\Facades { /** * Get the name of the binding the container is currently resolving. * - * @return class-string|string|null + * @return class-string|string|int|null * @static */ public static function currentlyResolving() @@ -1876,7 +1876,7 @@ namespace Illuminate\Support\Facades { /** * Set the callback which determines the current container environment. * - * @param (callable(array|string): bool|string)|null $callback + * @param (callable(array|string): (bool|string))|null $callback * @return void * @static */ @@ -1916,7 +1916,7 @@ namespace Illuminate\Support\Facades { /** * Set the shared instance of the container. * - * @return \Illuminate\Contracts\Container\Container|static + * @return \Illuminate\Contracts\Container\Container|static|null * @static */ public static function setInstance($container = null) @@ -2669,7 +2669,7 @@ namespace Illuminate\Support\Facades { /** * Get the last user we attempted to authenticate. * - * @return \Uwil\LaravelBackend\Models\User + * @return \Uwil\LaravelBackend\Models\User|null * @static */ public static function getLastAttempted() @@ -2756,7 +2756,7 @@ namespace Illuminate\Support\Facades { /** * Get the event dispatcher instance. * - * @return \Illuminate\Contracts\Events\Dispatcher + * @return \Illuminate\Contracts\Events\Dispatcher|null * @static */ public static function getDispatcher() @@ -7484,6 +7484,47 @@ namespace Illuminate\Support\Facades { return $instance->getServerVersion(); } + /** + * Get the ID of the last committed transaction. + * + * @return string + * @throws \RuntimeException + * @static + */ + public static function getLastCommitId() + { + /** @var \Illuminate\Database\MariaDbConnection $instance */ + return $instance->getLastCommitId(); + } + + /** + * Calculate the commit ID for a set of commit IDs that includes all of them. + * + * @param string[] $values + * @return string + * @throws \RuntimeException + * @static + */ + public static function mergeCommitIds($values) + { + /** @var \Illuminate\Database\MariaDbConnection $instance */ + return $instance->mergeCommitIds($values); + } + + /** + * Determine if the given commit ID has been applied. + * + * @param string $value + * @param int $wait + * @return bool + * @static + */ + public static function hasCommitId($value, $wait = 0) + { + /** @var \Illuminate\Database\MariaDbConnection $instance */ + return $instance->hasCommitId($value, $wait); + } + /** * Get a schema builder instance for the connection. * @@ -7992,7 +8033,7 @@ namespace Illuminate\Support\Facades { /** * Register a database query listener with the connection. * - * @param \Closure(\Illuminate\Database\Events\QueryExecuted) $callback + * @param \Closure(\Illuminate\Database\Events\QueryExecuted): mixed $callback * @return void * @static */ @@ -8101,6 +8142,21 @@ namespace Illuminate\Support\Facades { return $instance->useWriteConnectionWhenReading($value); } + /** + * Execute the given callback using the write PDO connection for reads. + * + * @template TReturn + * @param (\Closure($this): TReturn) $callback + * @return TReturn + * @static + */ + public static function usingWritePdo($callback) + { + //Method inherited from \Illuminate\Database\Connection + /** @var \Illuminate\Database\MariaDbConnection $instance */ + return $instance->usingWritePdo($callback); + } + /** * Get the current PDO connection. * @@ -10947,7 +11003,7 @@ namespace Illuminate\Support\Facades { /** * Get a collection of the request / response pairs matching the given truth test. * - * @param (\Closure(\Illuminate\Http\Client\Request, \Illuminate\Http\Client\Response|null): bool)|callable $callback + * @param (\Closure(\Illuminate\Http\Client\Request, \Illuminate\Http\Client\Response|null): bool)|callable|null $callback * @return \Illuminate\Support\Collection * @static */ @@ -11992,8 +12048,6 @@ namespace Illuminate\Support\Facades { * @method static void alwaysReplyTo(string $address, string|null $name = null) * @method static void alwaysReturnPath(string $address) * @method static void alwaysTo(string $address, string|null $name = null) - * @method static \Illuminate\Mail\SentMessage|null html(string $html, mixed $callback) - * @method static \Illuminate\Mail\SentMessage|null plain(string $view, array $data, mixed $callback) * @method static string render(string|array $view, array $data = []) * @method static \Symfony\Component\Mailer\Transport\TransportInterface getSymfonyTransport() * @method static \Illuminate\Contracts\View\Factory getViewFactory() @@ -12441,6 +12495,20 @@ namespace Illuminate\Support\Facades { return $instance->bcc($users); } + /** + * Send a new message with only an HTML part. + * + * @param string $html + * @param \Closure|string $callback + * @return void + * @static + */ + public static function html($html, $callback) + { + /** @var \Illuminate\Support\Testing\Fakes\MailFake $instance */ + $instance->html($html, $callback); + } + /** * Send a new message with only a raw text part. * @@ -12455,6 +12523,21 @@ namespace Illuminate\Support\Facades { $instance->raw($text, $callback); } + /** + * Send a new message with only a plain part. + * + * @param string $view + * @param array $data + * @param \Closure|string $callback + * @return void + * @static + */ + public static function plain($view, $data, $callback) + { + /** @var \Illuminate\Support\Testing\Fakes\MailFake $instance */ + $instance->plain($view, $data, $callback); + } + /** * Send a new message using a view. * @@ -13088,7 +13171,7 @@ namespace Illuminate\Support\Facades { * @method static \Illuminate\Process\PendingProcess tty(bool $tty = true) * @method static \Illuminate\Process\PendingProcess options(array $options) * @method static \Illuminate\Contracts\Process\ProcessResult run(array|string|null $command = null, callable|null $output = null) - * @method static \Illuminate\Process\InvokedProcess start(array|string|null $command = null, callable|null $output = null) + * @method static \Illuminate\Process\InvokedProcess|\Illuminate\Process\FakeInvokedProcess start(array|string|null $command = null, callable|null $output = null) * @method static bool supportsTty() * @method static \Illuminate\Process\PendingProcess withFakeHandlers(array $fakeHandlers) * @method static \Illuminate\Process\PendingProcess|mixed when(\Closure|mixed|null $value = null, callable|null $callback = null, callable|null $default = null) @@ -13509,6 +13592,20 @@ namespace Illuminate\Support\Facades { $instance->stopping($callback); } + /** + * Register a callback to be invoked when a job runs for longer than a given amount of time. + * + * @param \DateTimeInterface|\Carbon\CarbonInterval|float|int $threshold + * @param callable $handler + * @return void + * @static + */ + public static function whenJobRunsLongerThan($threshold, $handler) + { + /** @var \Illuminate\Queue\QueueManager $instance */ + $instance->whenJobRunsLongerThan($threshold, $handler); + } + /** * Set the queue route for the given class. * @@ -15625,7 +15722,7 @@ namespace Illuminate\Support\Facades { * * @param string|null $param * @param mixed $default - * @return ($param is null ? \Illuminate\Routing\Route : object|string|null) + * @return ($param is null ? \Illuminate\Routing\Route|null : object|string|null) * @static */ public static function route($param = null, $default = null) @@ -16427,71 +16524,83 @@ namespace Illuminate\Support\Facades { * * @param string $key * @param mixed $default + * @param bool $strict * @return \Illuminate\Support\Stringable * @static */ - public static function str($key, $default = null) + public static function str($key, $default = null, $strict = false) { /** @var \Illuminate\Http\Request $instance */ - return $instance->str($key, $default); + return $instance->str($key, $default, $strict); } /** * Retrieve data from the instance as a Stringable instance. * + * When strict, values that are not strings, numbers, or Stringable objects return the default. + * * @param string $key * @param mixed $default + * @param bool $strict * @return \Illuminate\Support\Stringable * @static */ - public static function string($key, $default = null) + public static function string($key, $default = null, $strict = false) { /** @var \Illuminate\Http\Request $instance */ - return $instance->string($key, $default); + return $instance->string($key, $default, $strict); } /** * Retrieve data as a boolean value. * * Returns true when value is "1", "true", "on", and "yes". Otherwise, returns false. + * When strict, values other than "1", "true", "on", "yes", "0", "false", "off", and "no" return the default. * * @param string|null $key * @param bool $default + * @param bool $strict * @return bool * @static */ - public static function boolean($key = null, $default = false) + public static function boolean($key = null, $default = false, $strict = false) { /** @var \Illuminate\Http\Request $instance */ - return $instance->boolean($key, $default); + return $instance->boolean($key, $default, $strict); } /** * Retrieve data as an integer value. * + * When strict, values that are not valid integers return the default. + * * @param string $key * @param int $default + * @param bool $strict * @return int * @static */ - public static function integer($key, $default = 0) + public static function integer($key, $default = 0, $strict = false) { /** @var \Illuminate\Http\Request $instance */ - return $instance->integer($key, $default); + return $instance->integer($key, $default, $strict); } /** * Retrieve data as a float value. * + * When strict, values that are not valid numbers return the default. + * * @param string $key * @param float $default + * @param bool $strict * @return float * @static */ - public static function float($key, $default = 0.0) + public static function float($key, $default = 0.0, $strict = false) { /** @var \Illuminate\Http\Request $instance */ - return $instance->float($key, $default); + return $instance->float($key, $default, $strict); } /** @@ -19507,6 +19616,20 @@ namespace Illuminate\Support\Facades { \Illuminate\Console\Scheduling\Schedule::alwaysOnOneServer($value); } + /** + * Register a callback to be invoked when a scheduled task runs for longer than a given amount of time. + * + * @param \DateTimeInterface|\Carbon\CarbonInterval|float|int $threshold + * @param (callable(\Illuminate\Console\Scheduling\Event, float): mixed) $handler + * @return void + * @static + */ + public static function whenTaskRunsLongerThan($threshold, $handler) + { + /** @var \Illuminate\Console\Scheduling\Schedule $instance */ + $instance->whenTaskRunsLongerThan($threshold, $handler); + } + /** * Register a custom macro. * @@ -25608,6 +25731,126 @@ namespace Sentry\Laravel { } } +namespace Uwil\Storage\Facades { + /** + * phpcs:disable Generic.Files.LineLength.TooLong + * + * @throws \Uwil\Storage\Exceptions\BadUploadedFile + * @see \Uwil\Storage\Contracts\StorageService + * @see \Uwil\Storage\Lib\StorageServiceImpl + */ + class StorageService { + /** + * @static + */ + public static function fileIsValid($file) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->fileIsValid($file); + } + + /** + * @static + */ + public static function fileExists($filePath) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->fileExists($filePath); + } + + /** + * @static + */ + public static function fileExistsOnDisk($filePath, $disk) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->fileExistsOnDisk($filePath, $disk); + } + + /** + * @static + */ + public static function getFile($filePath) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->getFile($filePath); + } + + /** + * @static + */ + public static function storeSanitized($file) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->storeSanitized($file); + } + + /** + * @static + */ + public static function storeSanitizedOntoDisk($file, $disk) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->storeSanitizedOntoDisk($file, $disk); + } + + /** + * @static + */ + public static function storeUploaded($file) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->storeUploaded($file); + } + + /** + * @static + */ + public static function storeUploadedOntoDisk($file, $disk) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->storeUploadedOntoDisk($file, $disk); + } + + /** + * @static + */ + public static function storeFile($file) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->storeFile($file); + } + + /** + * @static + */ + public static function storeFileOntoDisk($file, $disk) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->storeFileOntoDisk($file, $disk); + } + + /** + * @static + */ + public static function remove($filePath) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->remove($filePath); + } + + /** + * @static + */ + public static function removeFromDisk($filePath, $disk) + { + /** @var \Uwil\Storage\Lib\StorageServiceImpl $instance */ + return $instance->removeFromDisk($filePath, $disk); + } + + } + } + namespace Illuminate\Http { /** */ @@ -26006,7 +26249,6 @@ namespace { * @param (\Closure(static): mixed)|string|array|\Illuminate\Contracts\Database\Query\Expression $column * @param mixed $operator * @param mixed $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -26022,7 +26264,6 @@ namespace { * @param (\Closure(static): mixed)|string|array|\Illuminate\Contracts\Database\Query\Expression $column * @param mixed $operator * @param mixed $value - * @param string $boolean * @return TModel|null * @static */ @@ -26053,7 +26294,6 @@ namespace { * @param (\Closure(static): mixed)|string|array|\Illuminate\Contracts\Database\Query\Expression $column * @param mixed $operator * @param mixed $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -26081,7 +26321,7 @@ namespace { /** * Add an "order by" clause for a timestamp to the query. * - * @param string|\Illuminate\Contracts\Database\Query\Expression $column + * @param string|\Illuminate\Contracts\Database\Query\Expression|null $column * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -26094,7 +26334,7 @@ namespace { /** * Add an "order by" clause for a timestamp to the query. * - * @param string|\Illuminate\Contracts\Database\Query\Expression $column + * @param string|\Illuminate\Contracts\Database\Query\Expression|null $column * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -26336,9 +26576,6 @@ namespace { * Create a record matching the attributes, or increment the existing record. * * @param array $attributes - * @param string $column - * @param int|float $default - * @param int|float $step * @param array $extra * @return TModel * @static @@ -26543,7 +26780,6 @@ namespace { * * @param int|null|\Closure $perPage * @param array|string $columns - * @param string $pageName * @param int|null $page * @param \Closure|int|null $total * @return \Illuminate\Pagination\LengthAwarePaginator @@ -26561,7 +26797,6 @@ namespace { * * @param int|null $perPage * @param array|string $columns - * @param string $pageName * @param int|null $page * @return \Illuminate\Pagination\Paginator * @static @@ -26577,7 +26812,6 @@ namespace { * * @param int|null $perPage * @param array|string $columns - * @param string $cursorName * @param \Illuminate\Pagination\Cursor|string|null $cursor * @return \Illuminate\Pagination\CursorPaginator * @static @@ -26655,34 +26889,6 @@ namespace { return $instance->upsert($values, $uniqueBy, $update); } - /** - * Increment the given column's values by the given amounts. - * - * @param array $columns - * @param array $extra - * @return int - * @static - */ - public static function incrementEach($columns, $extra = []) - { - /** @var \Illuminate\Database\Eloquent\Builder $instance */ - return $instance->incrementEach($columns, $extra); - } - - /** - * Decrement the given column's values by the given amounts. - * - * @param array $columns - * @param array $extra - * @return int - * @static - */ - public static function decrementEach($columns, $extra = []) - { - /** @var \Illuminate\Database\Eloquent\Builder $instance */ - return $instance->decrementEach($columns, $extra); - } - /** * Register a replacement for the default delete function. * @@ -26767,7 +26973,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|array|string $attributes * @param mixed $value - * @param bool $asConditions * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -27035,7 +27240,6 @@ namespace { * * @template TReturn * @param callable(TValue): TReturn $callback - * @param int $count * @return \Illuminate\Support\Collection * @static */ @@ -27049,7 +27253,6 @@ namespace { * Execute a callback over each item while chunking. * * @param callable(TValue, int): mixed $callback - * @param int $count * @return bool * @throws \RuntimeException * @static @@ -27099,7 +27302,6 @@ namespace { * @param callable(\Illuminate\Support\Collection, int): mixed $callback * @param string|null $column * @param string|null $alias - * @param \SortDirection|bool $descending * @return bool * @throws \RuntimeException * @static @@ -27114,7 +27316,6 @@ namespace { * Execute a callback over each item while chunking by ID. * * @param callable(TValue, int): mixed $callback - * @param int $count * @param string|null $column * @param string|null $alias * @return bool @@ -27129,7 +27330,6 @@ namespace { /** * Query lazily, by chunks of the given size. * - * @param int $chunkSize * @return \Illuminate\Support\LazyCollection * @throws \InvalidArgumentException * @static @@ -27143,7 +27343,6 @@ namespace { /** * Query lazily, by chunking the results of a query by comparing IDs. * - * @param int $chunkSize * @param string|null $column * @param string|null $alias * @return \Illuminate\Support\LazyCollection @@ -27159,7 +27358,6 @@ namespace { /** * Query lazily, by chunking the results of a query by comparing IDs in descending order. * - * @param int $chunkSize * @param string|null $column * @param string|null $alias * @return \Illuminate\Support\LazyCollection @@ -27266,9 +27464,6 @@ namespace { * * @template TRelatedModel of \Illuminate\Database\Eloquent\Model * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation - * @param string $operator - * @param \Illuminate\Contracts\Database\Query\Expression|int $count - * @param string $boolean * @param (\Closure(\Illuminate\Database\Eloquent\Builder): mixed)|null $callback * @return \Illuminate\Database\Eloquent\Builder * @throws \RuntimeException @@ -27284,8 +27479,6 @@ namespace { * Add a relationship count / exists condition to the query with an "or". * * @param \Illuminate\Database\Eloquent\Relations\Relation<*, *, *>|string $relation - * @param string $operator - * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -27300,7 +27493,6 @@ namespace { * * @template TRelatedModel of \Illuminate\Database\Eloquent\Model * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation - * @param string $boolean * @param (\Closure(\Illuminate\Database\Eloquent\Builder): mixed)|null $callback * @return \Illuminate\Database\Eloquent\Builder * @static @@ -27330,8 +27522,6 @@ namespace { * @template TRelatedModel of \Illuminate\Database\Eloquent\Model * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation * @param (\Closure(\Illuminate\Database\Eloquent\Builder): mixed)|null $callback - * @param string $operator - * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -27348,8 +27538,6 @@ namespace { * * @param string $relation * @param (\Closure(\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Eloquent\Relations\Relation<*, *, *>): mixed)|null $callback - * @param string $operator - * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -27365,8 +27553,6 @@ namespace { * @template TRelatedModel of \Illuminate\Database\Eloquent\Model * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation * @param (\Closure(\Illuminate\Database\Eloquent\Builder): mixed)|null $callback - * @param string $operator - * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -27412,9 +27598,6 @@ namespace { * @template TRelatedModel of \Illuminate\Database\Eloquent\Model * @param \Illuminate\Database\Eloquent\Relations\MorphTo|string $relation * @param string|array $types - * @param string $operator - * @param \Illuminate\Contracts\Database\Query\Expression|int $count - * @param string $boolean * @param (\Closure(\Illuminate\Database\Eloquent\Builder, string): mixed)|null $callback * @return \Illuminate\Database\Eloquent\Builder * @static @@ -27430,8 +27613,6 @@ namespace { * * @param \Illuminate\Database\Eloquent\Relations\MorphTo<*, *>|string $relation * @param string|array $types - * @param string $operator - * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -27447,7 +27628,6 @@ namespace { * @template TRelatedModel of \Illuminate\Database\Eloquent\Model * @param \Illuminate\Database\Eloquent\Relations\MorphTo|string $relation * @param string|array $types - * @param string $boolean * @param (\Closure(\Illuminate\Database\Eloquent\Builder, string): mixed)|null $callback * @return \Illuminate\Database\Eloquent\Builder * @static @@ -27479,8 +27659,6 @@ namespace { * @param \Illuminate\Database\Eloquent\Relations\MorphTo|string $relation * @param string|array $types * @param (\Closure(\Illuminate\Database\Eloquent\Builder, string): mixed)|null $callback - * @param string $operator - * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -27497,8 +27675,6 @@ namespace { * @param \Illuminate\Database\Eloquent\Relations\MorphTo|string $relation * @param string|array $types * @param (\Closure(\Illuminate\Database\Eloquent\Builder, string): mixed)|null $callback - * @param string $operator - * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -27759,7 +27935,6 @@ namespace { * * @param \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection $related * @param string|null $relationshipName - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @throws \InvalidArgumentException * @throws \Illuminate\Database\Eloquent\RelationNotFoundException @@ -27790,7 +27965,6 @@ namespace { * * @param \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection $related * @param string|null $relationshipName - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @throws \InvalidArgumentException * @throws \Illuminate\Database\Eloquent\RelationNotFoundException @@ -28112,8 +28286,6 @@ namespace { * @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first * @param string|null $operator * @param \Illuminate\Contracts\Database\Query\Expression|string|null $second - * @param string $type - * @param bool $where * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28130,7 +28302,6 @@ namespace { * @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first * @param string $operator * @param \Illuminate\Contracts\Database\Query\Expression|string $second - * @param string $type * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28148,8 +28319,6 @@ namespace { * @param \Closure|\Illuminate\Contracts\Database\Query\Expression|string $first * @param string|null $operator * @param \Illuminate\Contracts\Database\Query\Expression|string|null $second - * @param string $type - * @param bool $where * @return \Illuminate\Database\Eloquent\Builder * @throws \InvalidArgumentException * @static @@ -28382,7 +28551,6 @@ namespace { * * @param string $value * @param string $operator - * @param bool $useDefault * @return array * @throws \InvalidArgumentException * @static @@ -28399,7 +28567,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression|string|array $first * @param string|null $operator * @param string|null $second - * @param string|null $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28429,8 +28596,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param \Illuminate\Support\Collection|\Illuminate\Contracts\Support\Arrayable|array|string $vector - * @param float $minSimilarity A value between 0.0 and 1.0, where 1.0 is identical. - * @param bool $order * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28446,7 +28611,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param \Illuminate\Support\Collection|\Illuminate\Contracts\Support\Arrayable|array|string $vector * @param float $maxDistance - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @throws \JsonException * @static @@ -28477,7 +28641,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|literal-string $sql * @param mixed $bindings - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28506,8 +28669,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param string $value - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28536,7 +28697,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param string $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28565,9 +28725,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param string $value - * @param bool $caseSensitive - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28582,7 +28739,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param string $value - * @param bool $caseSensitive * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28597,8 +28753,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param string $value - * @param bool $caseSensitive - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28613,7 +28767,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param string $value - * @param bool $caseSensitive * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28628,7 +28781,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param mixed $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28657,8 +28809,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param mixed $values - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @throws \InvalidArgumentException * @static @@ -28688,7 +28838,6 @@ namespace { * * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param mixed $values - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28717,8 +28866,6 @@ namespace { * * @param string $column * @param \Illuminate\Contracts\Support\Arrayable|array $values - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28747,7 +28894,6 @@ namespace { * * @param string $column * @param \Illuminate\Contracts\Support\Arrayable|array $values - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28775,8 +28921,6 @@ namespace { * Add a "where null" clause to the query. * * @param string|array|\Illuminate\Contracts\Database\Query\Expression $columns - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28803,7 +28947,6 @@ namespace { * Add a "where not null" clause to the query. * * @param string|array|\Illuminate\Contracts\Database\Query\Expression $columns - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28817,8 +28960,6 @@ namespace { * Add a "where between" statement to the query. * * @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Contracts\Database\Query\Expression|string $column - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28832,8 +28973,6 @@ namespace { * Add a "where between" statement using columns to the query. * * @param \Illuminate\Contracts\Database\Query\Expression|string $column - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28873,7 +29012,6 @@ namespace { * Add a "where not between" statement to the query. * * @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Contracts\Database\Query\Expression|string $column - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28887,7 +29025,6 @@ namespace { * Add a "where not between" statement using columns to the query. * * @param \Illuminate\Contracts\Database\Query\Expression|string $column - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28928,8 +29065,6 @@ namespace { * * @param mixed $value * @param array{\Illuminate\Contracts\Database\Query\Expression|string, \Illuminate\Contracts\Database\Query\Expression|string} $columns - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -28958,7 +29093,6 @@ namespace { * * @param mixed $value * @param array{\Illuminate\Contracts\Database\Query\Expression|string, \Illuminate\Contracts\Database\Query\Expression|string} $columns - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29001,7 +29135,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param \DateTimeInterface|string|null $operator * @param \DateTimeInterface|string|null $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29032,7 +29165,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param \DateTimeInterface|string|null $operator * @param \DateTimeInterface|string|null $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29063,7 +29195,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param \DateTimeInterface|string|int|null $operator * @param \DateTimeInterface|string|int|null $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29094,7 +29225,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param \DateTimeInterface|string|int|null $operator * @param \DateTimeInterface|string|int|null $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29125,7 +29255,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression|string $column * @param \DateTimeInterface|string|int|null $operator * @param \DateTimeInterface|string|int|null $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29153,7 +29282,6 @@ namespace { /** * Add a nested "where" statement to the query. * - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29179,7 +29307,6 @@ namespace { * Add another query builder as a nested where to the query builder. * * @param \Illuminate\Database\Query\Builder $query - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29193,8 +29320,6 @@ namespace { * Add an "exists" clause to the query. * * @param \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder<*> $callback - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29208,7 +29333,6 @@ namespace { * Add an "or where exists" clause to the query. * * @param \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder<*> $callback - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29222,7 +29346,6 @@ namespace { * Add a "where not exists" clause to the query. * * @param \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder<*> $callback - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29248,8 +29371,6 @@ namespace { /** * Add an "exists" clause to the query. * - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29265,7 +29386,6 @@ namespace { * @param array $columns * @param string $operator * @param array $values - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @throws \InvalidArgumentException * @static @@ -29296,8 +29416,6 @@ namespace { * * @param string $column * @param mixed $value - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29326,7 +29444,6 @@ namespace { * * @param string $column * @param mixed $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29355,8 +29472,6 @@ namespace { * * @param string $column * @param mixed $value - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29385,7 +29500,6 @@ namespace { * * @param string $column * @param mixed $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29413,8 +29527,6 @@ namespace { * Add a clause that determines if a JSON path exists to the query. * * @param string $column - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29441,7 +29553,6 @@ namespace { * Add a clause that determines if a JSON path does not exist to the query. * * @param string $column - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29470,7 +29581,6 @@ namespace { * @param string $column * @param mixed $operator * @param mixed $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29514,7 +29624,6 @@ namespace { * * @param string|string[] $columns * @param string $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29544,7 +29653,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression[]|\Closure[]|string[] $columns * @param mixed $operator * @param mixed $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29575,7 +29683,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression[]|\Closure[]|string[] $columns * @param mixed $operator * @param mixed $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29606,7 +29713,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression[]|\Closure[]|string[] $columns * @param mixed $operator * @param mixed $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29663,7 +29769,6 @@ namespace { * @param \Illuminate\Contracts\Database\Query\Expression|\Closure|string $column * @param \DateTimeInterface|string|int|float|null $operator * @param \Illuminate\Contracts\Database\Query\Expression|\DateTimeInterface|string|int|float|null $value - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29691,7 +29796,6 @@ namespace { /** * Add a nested "having" statement to the query. * - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29705,7 +29809,6 @@ namespace { * Add another query builder as a nested having to the query builder. * * @param \Illuminate\Database\Query\Builder $query - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29719,8 +29822,6 @@ namespace { * Add a "having null" clause to the query. * * @param array|string $columns - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29747,7 +29848,6 @@ namespace { * Add a "having not null" clause to the query. * * @param array|string $columns - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29774,8 +29874,6 @@ namespace { * Add a "having between" clause to the query. * * @param string $column - * @param string $boolean - * @param bool $not * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29790,7 +29888,6 @@ namespace { * * @param string $column * @param iterable $values - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29832,7 +29929,6 @@ namespace { * Add a raw "having" clause to the query. * * @param literal-string $sql - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29887,7 +29983,7 @@ namespace { * Add a vector-distance "order by" clause to the query. * * @param \Illuminate\Contracts\Database\Query\Expression|string $column - * @param \Illuminate\Support\Collection|\Illuminate\Contracts\Support\Arrayable|array $vector + * @param \Illuminate\Support\Collection|\Illuminate\Contracts\Support\Arrayable|array|string $vector * @return \Illuminate\Database\Eloquent\Builder * @throws \JsonException * @static @@ -29901,7 +29997,6 @@ namespace { /** * Put the query's results in random order. * - * @param string|int $seed * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29968,7 +30063,7 @@ namespace { /** * Alias to set the "limit" value of the query. * - * @param int $value + * @param int|null $value * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -29981,7 +30076,7 @@ namespace { /** * Set the "limit" value of the query. * - * @param int $value + * @param int|null $value * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -30009,7 +30104,6 @@ namespace { * Set the limit and offset for a given page. * * @param int $page - * @param int $perPage * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -30022,9 +30116,6 @@ namespace { /** * Constrain the query to the previous "page" of results before a given ID. * - * @param int $perPage - * @param int|null $lastId - * @param string $column * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -30037,9 +30128,6 @@ namespace { /** * Constrain the query to the next "page" of results after a given ID. * - * @param int $perPage - * @param int|null $lastId - * @param string $column * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -30080,7 +30168,6 @@ namespace { * Add a "union" statement to the query. * * @param \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder<*> $query - * @param bool $all * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -30106,7 +30193,6 @@ namespace { /** * Lock the selected rows in the table. * - * @param string|bool $value * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -30232,7 +30318,6 @@ namespace { * Concatenate values of a given column as a string. * * @param string $column - * @param string $glue * @return string * @static */ @@ -30293,7 +30378,6 @@ namespace { /** * Retrieve the "count" result of the query. * - * @param \Illuminate\Contracts\Database\Query\Expression|string $columns * @return int<0, max> * @static */ @@ -30572,7 +30656,6 @@ namespace { * Set the bindings on the query builder. * * @param list $bindings - * @param "select"|"from"|"join"|"where"|"groupBy"|"having"|"order"|"union"|"unionOrder" $type * @return \Illuminate\Database\Eloquent\Builder * @throws \InvalidArgumentException * @static @@ -30587,7 +30670,6 @@ namespace { * Add a binding to the query. * * @param mixed $value - * @param "select"|"from"|"join"|"where"|"groupBy"|"having"|"order"|"union"|"unionOrder" $type * @return \Illuminate\Database\Eloquent\Builder * @throws \InvalidArgumentException * @static @@ -30867,7 +30949,6 @@ namespace { * Add a "where date" clause to determine if a "date" column is today to the query. * * @param array|string $columns - * @param string $boolean * @return \Illuminate\Database\Eloquent\Builder * @static */ @@ -31024,7 +31105,6 @@ namespace { * Mix another object into the class. * * @param object $mixin - * @param bool $replace * @return void * @throws \ReflectionException * @static @@ -31095,6 +31175,7 @@ namespace { class LaravelLocalization extends \Mcamara\LaravelLocalization\Facades\LaravelLocalization {} class Purifier extends \Mews\Purifier\Facades\Purifier {} class Sentry extends \Sentry\Laravel\Facade {} + class StorageService extends \Uwil\Storage\Facades\StorageService {} } diff --git a/app/Casts/FilePathCast.php b/app/Casts/FilePathCast.php new file mode 100644 index 00000000..a59274f8 --- /dev/null +++ b/app/Casts/FilePathCast.php @@ -0,0 +1,45 @@ + */ +class FilePathCast implements CastsAttributes +{ + /** @param array $attributes */ + public function get(Model $model, string $key, mixed $value, array $attributes): ?StorageFilePath + { + if ($value === null) { + return null; + } + + if (! is_string($value)) { + throw new \InvalidArgumentException('The given value is not a valid file path string.'); + } + + return new StorageFilePath($value); + } + + /** @param array $attributes */ + public function set(Model $model, string $key, mixed $value, array $attributes): ?string + { + if ($value === null) { + return null; + } + + if ($value instanceof StorageFilePath) { + return $value->value; + } + + if (is_string($value)) { + return (new StorageFilePath($value))->value; + } + + throw new \InvalidArgumentException('The given value is not a valid StorageFilePath instance or path string.'); + } +} diff --git a/app/Directories/EloquentProductDirectory.php b/app/Directories/EloquentProductDirectory.php index 5dc53a83..b13b647c 100644 --- a/app/Directories/EloquentProductDirectory.php +++ b/app/Directories/EloquentProductDirectory.php @@ -169,7 +169,7 @@ class EloquentProductDirectory implements ProductDirectory return new ProductSummary( id: (string) $product->id, name: $product->name, - picture: $product->picture, + picture: $product->picture?->value, ); } @@ -194,10 +194,10 @@ class EloquentProductDirectory implements ProductDirectory seoDescription: $product->seo_description, conservationAfterOpening: $product->conservation_after_opening, nutritionalValues: $product->nutritional_values, - picture: $product->picture, + picture: $product->picture->value, pictureAlt: $product->picture_alt, pictureTitle: $product->picture_title, - pdfFilePath: $product->pdf, + pdfFilePath: $product->pdf?->value, associatedRecipes: $product->recipes->map( fn (Recipe $recipe): UuidInterface => $recipe->getId()->value )->all() diff --git a/app/Directories/EloquentRecipeDirectory.php b/app/Directories/EloquentRecipeDirectory.php index 0b70e7cf..30ba4190 100644 --- a/app/Directories/EloquentRecipeDirectory.php +++ b/app/Directories/EloquentRecipeDirectory.php @@ -103,7 +103,7 @@ class EloquentRecipeDirectory implements RecipeDirectory id: new RecipeId(Uuid::fromString($recipe->id)), name: $recipe->name, slug: $recipe->slug, - picture: $recipe->picture, + picture: $recipe->picture->value, seoTitle: $recipe->seo_title, seoDescription: $recipe->seo_description, productRange: $recipe->product_category, diff --git a/app/Http/Controllers/Back/ProductController.php b/app/Http/Controllers/Back/ProductController.php index c9048a99..a0296f32 100644 --- a/app/Http/Controllers/Back/ProductController.php +++ b/app/Http/Controllers/Back/ProductController.php @@ -18,9 +18,11 @@ use Domain\Models\ValueObjects\Products\Technology; use Illuminate\Contracts\Session\Session; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; +use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; use Inertia\Response; +use Uwil\Storage\Facades\StorageService; class ProductController extends BackendController { @@ -104,7 +106,15 @@ class ProductController extends BackendController $product = new Product(); /** @var array $data */ $data = $request->only($product->getFillable()); - $product->fill($data); + + /** @var array $dataToFill */ + $dataToFill = Arr::except($data, ['picture', 'pdf']); + $product->fill($dataToFill); + + $product->picture = StorageService::storeUploaded($request->file('picture')); + if ($request->file('pdf')) { + $product->pdf = StorageService::storeUploaded($request->file('pdf')); + } if ($product->saveOrFail()) { return redirect()->route('back.products.edit', $product) @@ -144,7 +154,18 @@ class ProductController extends BackendController return DB::transaction(function () use ($request, $product) { /** @var array $data */ $data = $request->only($product->getFillable()); - $product->fill($data); + + /** @var array $dataToFill */ + $dataToFill = Arr::except($data, ['picture', 'pdf']); + $product->fill($dataToFill); + + if ($request->file('picture')) { + $product->picture = StorageService::storeUploaded($request->file('picture')); + } + + if ($request->file('pdf')) { + $product->pdf = StorageService::storeUploaded($request->file('pdf')); + } if ($product->saveOrFail()) { return redirect()->route('back.products.edit', $product) diff --git a/app/Http/Controllers/Back/RecipeController.php b/app/Http/Controllers/Back/RecipeController.php index 69791c8c..c778245f 100644 --- a/app/Http/Controllers/Back/RecipeController.php +++ b/app/Http/Controllers/Back/RecipeController.php @@ -17,9 +17,11 @@ use Domain\Models\ValueObjects\Recipes\Season; use Illuminate\Contracts\Session\Session; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; +use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; use Inertia\Response; +use Uwil\Storage\Facades\StorageService; class RecipeController extends BackendController { @@ -105,7 +107,12 @@ class RecipeController extends BackendController $recipe = new Recipe(); /** @var array $data */ $data = $request->only($recipe->getFillable()); - $recipe->fill($data); + + /** @var array $dataToFill */ + $dataToFill = Arr::except($data, ['picture']); + $recipe->fill($dataToFill); + + $recipe->picture = StorageService::storeUploaded($request->file('picture')); if ($recipe->saveOrFail()) { $recipe->products() @@ -149,7 +156,14 @@ class RecipeController extends BackendController return DB::transaction(function () use ($request, $recipe) { /** @var array $data */ $data = $request->only($recipe->getFillable()); - $recipe->fill($data); + + /** @var array $dataToFill */ + $dataToFill = Arr::except($data, ['picture']); + $recipe->fill($dataToFill); + + if ($request->file('picture')) { + $recipe->picture = StorageService::storeUploaded($request->file('picture')); + } if ($recipe->saveOrFail()) { $recipe->products() diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php new file mode 100644 index 00000000..86619f26 --- /dev/null +++ b/app/Http/Controllers/MediaController.php @@ -0,0 +1,77 @@ +getFile($filePath); + if ($fileStream === null) { + abort(404, 'Fichier introuvable.'); + } + + $extension = strtolower(pathinfo($path, PATHINFO_EXTENSION)); + $mimeType = $this->getMimeType($extension); + + $headers = [ + 'Content-Type' => $mimeType, + 'Content-Disposition' => 'inline; filename="' . basename($path) . '"', + 'Cache-Control' => 'public, max-age=31536000, immutable', + ]; + $size = $fileStream->getSize(); + if ($size !== null) { + $headers['Content-Length'] = (string) $size; + } + + return response()->stream( + function () use ($fileStream): void { + $resource = $fileStream->stream(); + if (is_resource($resource)) { + fpassthru($resource); + } + }, + 200, + $headers + ); + } + + /** + * @phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh + */ + private function getMimeType(string $extension): string + { + return match ($extension) { + 'png' => 'image/png', + 'jpg', 'jpeg' => 'image/jpeg', + 'gif' => 'image/gif', + 'webp' => 'image/webp', + 'pdf' => 'application/pdf', + 'svg' => 'image/svg+xml', + 'mp4' => 'video/mp4', + 'webm' => 'video/webm', + 'txt' => 'text/plain', + 'csv' => 'text/csv', + default => 'application/octet-stream', + }; + } +} diff --git a/app/Http/Requests/Back/Products/UpdateProductRequest.php b/app/Http/Requests/Back/Products/UpdateProductRequest.php index de09bb4c..117468d9 100644 --- a/app/Http/Requests/Back/Products/UpdateProductRequest.php +++ b/app/Http/Requests/Back/Products/UpdateProductRequest.php @@ -4,88 +4,33 @@ declare(strict_types=1); namespace App\Http\Requests\Back\Products; -use App\Lib\Helpers\ToolboxHelper; -use Illuminate\Http\UploadedFile; -use Illuminate\Support\Facades\File; -use Illuminate\Support\Facades\Storage; +use Illuminate\Validation\Rule; class UpdateProductRequest extends StoreProductRequest { public function rules(): array { return array_merge(parent::rules(), [ - 'pdf' => [ - 'nullable', - $this->validatePdf(...), - ], 'picture' => [ 'required', - $this->validatePicture(...), + $this->hasFile('picture') + ? Rule::imageFile() + ->max(self::MAX_FILE_SIZE_KB) + ->dimensions( + Rule::dimensions() + ->width(self::PICTURE_WIDTH) + ->height(self::PICTURE_HEIGHT) + ) + : 'string', + ], + 'pdf' => [ + 'nullable', + $this->hasFile('pdf') + ? Rule::file() + ->max(self::MAX_FILE_SIZE_KB) + ->types('pdf') + : 'string', ], ]); } - - private function validatePdf(string $attribute, mixed $value, \Closure $fail): void - { - $valuePath = match (true) { - is_string($value) => $value, - $value instanceof UploadedFile => $value->getPathname(), - default => null - }; - - if (is_string($valuePath)) { - $this->validateMaxFileSize($attribute, $valuePath, $fail); - - ToolboxHelper::validatePdf( - $attribute, - $valuePath, - $fail - ); - } elseif ($value !== null) { - $fail('Unexpected value for pdf'); - } - } - - private function validatePicture(string $attribute, mixed $value, \Closure $fail): void - { - $valuePath = match (true) { - is_string($value) => $value, - $value instanceof UploadedFile => $value->getPathname(), - default => null - }; - - if (is_string($valuePath)) { - $this->validateMaxFileSize($attribute, $valuePath, $fail); - - ToolboxHelper::validatePicture( - $attribute, - $valuePath, - $fail, - (object) [ - 'minWidth' => self::PICTURE_WIDTH, - 'maxWidth' => self::PICTURE_WIDTH, - 'minHeight' => self::PICTURE_HEIGHT, - 'maxHeight' => self::PICTURE_HEIGHT, - ] - ); - } elseif ($value !== null) { - $fail('Unexpected value for picture'); - } - } - - private function validateMaxFileSize(string $attribute, string $valuePath, \Closure $fail): void - { - $sizeInBytes = match (true) { - Storage::exists($valuePath) => Storage::size($valuePath), - File::exists($valuePath) => File::size($valuePath), - default => 0, - }; - - if (($sizeInBytes / 1024) > self::MAX_FILE_SIZE_KB) { - $fail(trans('validation.max.file', [ - 'attribute' => $this->attributes()[$attribute] ?? $attribute, - 'max' => self::MAX_FILE_SIZE_KB, - ])); - } - } } diff --git a/app/Http/Requests/Back/Recipes/UpdateRecipeRequest.php b/app/Http/Requests/Back/Recipes/UpdateRecipeRequest.php index 77cef33e..c2c0b11d 100644 --- a/app/Http/Requests/Back/Recipes/UpdateRecipeRequest.php +++ b/app/Http/Requests/Back/Recipes/UpdateRecipeRequest.php @@ -4,68 +4,25 @@ declare(strict_types=1); namespace App\Http\Requests\Back\Recipes; -use App\Lib\Helpers\ToolboxHelper; -use Illuminate\Http\UploadedFile; -use Illuminate\Support\Facades\File; -use Illuminate\Support\Facades\Storage; +use Illuminate\Validation\Rule; class UpdateRecipeRequest extends StoreRecipeRequest { - /** - * Get the validation rules that apply to the request. - * - * @return array|string> - */ public function rules(): array { return array_merge(parent::rules(), [ 'picture' => [ 'required', - $this->validatePicture(...), + $this->hasFile('picture') + ? Rule::imageFile() + ->max(self::MAX_FILE_SIZE_KB) + ->dimensions( + Rule::dimensions() + ->width(static::PICTURE_WIDTH) + ->height(static::PICTURE_HEIGHT) + ) + : 'string', ], ]); } - - private function validatePicture(string $attribute, mixed $value, \Closure $fail): void - { - $valuePath = match (true) { - is_string($value) => $value, - $value instanceof UploadedFile => $value->getPathname(), - default => null - }; - - if (is_string($valuePath)) { - $this->validateMaxFileSize($attribute, $valuePath, $fail); - - ToolboxHelper::validatePicture( - $attribute, - $valuePath, - $fail, - (object) [ - 'minWidth' => self::PICTURE_WIDTH, - 'maxWidth' => self::PICTURE_WIDTH, - 'minHeight' => self::PICTURE_HEIGHT, - 'maxHeight' => self::PICTURE_HEIGHT, - ] - ); - } elseif ($value !== null) { - $fail('Unexpected value for picture'); - } - } - - private function validateMaxFileSize(string $attribute, string $valuePath, \Closure $fail): void - { - $sizeInBytes = match (true) { - Storage::exists($valuePath) => Storage::size($valuePath), - File::exists($valuePath) => File::size($valuePath), - default => 0, - }; - - if (($sizeInBytes / 1024) > self::MAX_FILE_SIZE_KB) { - $fail(trans('validation.max.file', [ - 'attribute' => $this->attributes()[$attribute] ?? $attribute, - 'max' => self::MAX_FILE_SIZE_KB, - ])); - } - } } diff --git a/app/Lib/Helpers/FileStorageHelper.php b/app/Lib/Helpers/FileStorageHelper.php deleted file mode 100644 index 004f8c9b..00000000 --- a/app/Lib/Helpers/FileStorageHelper.php +++ /dev/null @@ -1,529 +0,0 @@ -path($path); - } - - /** - * Destroy the file associate with the attribute. - */ - public static function removeFile(Model $model, string $attribute): void - { - $attributeValue = $model->getAttribute($attribute); - if (! is_scalar($attributeValue)) { - return; - } - $path = \ltrim(\urldecode(strval($attributeValue)), '/'); - if (! str_starts_with($path, 'storage')) { - return; - } - $path = Str::replace(self::STORAGE_PREFIX, '', $path); - if (Storage::disk('public')->exists($path)) { - Storage::disk('public')->delete($path); - } - } - - /** - * Destroy the file associate with the attribute old value (before updated to DB). - */ - public static function removeOldFile(Model $model, string $attribute, bool $onlyIfUpdated = true): void - { - $originalValue = ToolboxHelper::getOriginal($model, $attribute); - // * Ignore If removal has to be done only if the field has changed and it actually hasnt. - if ($onlyIfUpdated && $model->{$attribute} === $originalValue) { - return; - } - - if (! is_string($originalValue)) { - return; - } - - $originalPath = \ltrim(\urldecode($originalValue), '/'); - if (! str_starts_with($originalPath, 'storage')) { - return; - } - $originalPath = Str::replace(self::STORAGE_PREFIX, '', $originalPath); - if (Storage::disk('public')->exists($originalPath)) { - Storage::disk('public')->delete($originalPath); - } - } - - /** - * Store a file using optimized storage strategy - * - * You can use filename param to overload file name. - * - * @param Model $model The model that will hold the picture. - * @param UploadedFile|\SplFileInfo|string $file The file, will just return itself is string. - * @param bool $slugify Force filename slugification. - * @param string|null $filename This string may be used to store the file. - * @param bool $private To store the file in a private space. - * - * @throws FileStorageOperationException If file copy fails. - * - * @phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh - */ - public static function storeFile( - Model $model, - UploadedFile | \SplFileInfo | string | null $file, - bool $slugify = false, - ?string $filename = null, - bool $private = false - ): string { - // phpcs:enable - $tableName = $model->getTable(); - if ($file instanceof UploadedFile) { - return self::storeUploadedFile($file, $tableName, $slugify, $filename, $private); - } - - if ($file instanceof \SplFileInfo) { - return self::storeSplFileInfo($file, $tableName, $slugify, $filename, $private); - } - - return (string) $file; - } - - private static function storeUploadedFile( - UploadedFile $file, - string $tableName, - bool $slugify, - ?string $filename, - bool $private - ): string { - $filename = $filename ?: $file->getClientOriginalName(); - $filename = $slugify ? self::slugifyFileName($filename) : $filename; - $disk = $private ? 'private' : 'public'; - $newPath = str_replace( - storage_path("app/{$disk}"), - '', - self::prepareMoveFile($tableName, $filename, $private) - ); - - $directory = pathinfo($newPath, \PATHINFO_DIRNAME); - $basename = pathinfo($newPath, \PATHINFO_BASENAME); - - if (! $private) { - $file->storePubliclyAs( - $directory, - $basename, - ['disk' => $disk] - ); - } else { - $file->storeAs( - $directory, - $basename, - ['disk' => $disk] - ); - } - - return "storage{$newPath}"; - } - - private static function storeSplFileInfo( - \SplFileInfo $file, - string $tableName, - bool $slugify, - ?string $filename, - bool $private - ): string { - $filename = $filename ?: $file->getBaseName(); - $filename = $slugify ? self::slugifyFileName($filename) : $filename; - $newPath = self::prepareMoveFile($tableName, $filename, $private); - - if (! File::copy($file->getRealPath(), $newPath)) { - throw FileStorageOperationException::copyFailed($file->getRealPath(), $newPath); - } - - if ($private) { - return \ltrim(str_replace(\storage_path('app/private'), '/storage/app/private', $newPath), '/'); - } - - return \ltrim(str_replace(\storage_path('app/public'), '/storage', $newPath), '/'); - } - - /** - * Store all files from string attribute html - * If oldHtmlString is passed, a diff is done with new and old files - * to keep only files that are present in the new html string. - * - * @param Model $model The model that will hold the picture. - * @param string|null $htmlString The html string to parse and modify files. - * @param string|null $oldHtmlString The old html string with alreadyParsed - * files using storeModelFilesFromHtml. - * @return string|null Html with files pathes replaced using storage strategy. - */ - public static function storeModelFilesFromHtml( - Model $model, - ?string $htmlString, - ?string $oldHtmlString = null - ): ?string { - if (is_null($htmlString)) { - return null; - } - - Collection::make(self::onlyUploadedFilesWithFileManager(self::findFilesInHtml($htmlString))) - ->each(function (string $path) use ($model, &$htmlString): void { - /** @var \Illuminate\Filesystem\FilesystemAdapter */ - $disk = Storage::disk('private'); - $fileInfo = new \SplFileInfo($disk->path( - ToolboxHelper::mbReplaceSingle('/uploads/', '', \urldecode($path)) - )); - $htmlString = ToolboxHelper::mbReplaceSingle( - $path, - '/' . self::storeFile($model, $fileInfo, true), - $htmlString - ); - }); - - if ($oldHtmlString) { - self::removeOldModelFilesFromHtml($htmlString, $oldHtmlString); - } - - return $htmlString; - } - - /** - * Remove all old files from string attribute html that are stored in public that - * are nove present anymore on new html string - * - * @param string $newHtmlString The html string with alreadyParsed files using storeModelFilesFromHtml. - * @param string $oldHtmlString The old html string with alreadyParsed files using storeModelFilesFromHtml. - */ - public static function removeOldModelFilesFromHtml(string $newHtmlString, string $oldHtmlString): void - { - self::removeOldFiles(self::findFilesInHtml($oldHtmlString), self::findFilesInHtml($newHtmlString)); - } - - /** - * Remove all old files that are stored in public that - * are not present anymore on new array files - * - * @param string[] $oldFiles The old array files. - * @param string[] $newFiles The new array files. - */ - public static function removeOldFiles(array $oldFiles, array $newFiles): void - { - $oldFiles = Collection::make(self::onlyUploadedFilesWithFileStorageHelper($oldFiles)); - $filesToKeep = Collection::make(self::onlyUploadedFilesWithFileStorageHelper($newFiles)); - $filesToRemove = $oldFiles->diff($filesToKeep); - $filesToRemove->each(function (string $publicStorageFilePath): void { - $path = Str::replace(self::STORAGE_PREFIX, '', \ltrim(\urldecode($publicStorageFilePath), '/')); - if (Storage::disk('public')->exists($path)) { - Storage::disk('public')->delete($path); - } - }); - } - - /** - * Remove all files from string attribute html that are stored in public - * - * @param string $htmlString The html string with alreadyParsed files using storeModelFilesFromHtml. - */ - public static function removeModelFilesOfHtml(string $htmlString): void - { - $filesToRemove = Collection::make(self::onlyUploadedFilesWithFileStorageHelper(self::findFilesInHtml($htmlString))); - $filesToRemove->each(function (string $publicStorageFilePath): void { - $path = Str::replace(self::STORAGE_PREFIX, '', \ltrim(\urldecode($publicStorageFilePath), '/')); - if (Storage::disk('public')->exists($path)) { - Storage::disk('public')->delete($path); - } - }); - } - - /** - * Find all occurence of files in html - * - * @param string $html The html string to parse and find files. - * @return string[] The array of files found in html. - */ - public static function findFilesInHtml(string $html): array - { - preg_match_all( - '/(?:href|src|url)="([^"]*)"/Ui', - $html, - $matches - ); - - return Collection::make($matches[1])->unique()->filter()->values()->all(); - } - - /** - * Filter array to get only uploaded files that exists - * on disk 'public' (using helper storage strategy) - * - * @param string[] $urls The array of urls to filter - * @return string[] The filtered array with only uploaded files that exists on disk 'public - */ - public static function onlyUploadedFilesWithFileStorageHelper(array $urls): array - { - return Collection::make($urls)->unique() - // * Filter to get only /uploads and using app url or empty - ->filter(function (string $url) { - $path = (string) (\parse_url($url, \PHP_URL_PATH) ?? ''); - - return str_starts_with(\ltrim($path, '/'), 'storage/modelfiles'); - })->filter(function (string $url) { - $path = (string) (\parse_url($url, \PHP_URL_PATH) ?? ''); - - return Storage::disk('public') - ->exists(Str::replace(self::STORAGE_PREFIX, '', \ltrim(\urldecode($path), '/'))); - })->all(); - } - - /** - * Filter array to get only uploaded files that exist on disk 'private' - * - * @param string[] $urls The array of urls to filter - * @return string[] The filtered array - */ - private static function onlyUploadedFilesWithFileManager(array $urls): array - { - $appUrl = Config::string('app.url'); - - if (empty($appUrl)) { - throw new \UnexpectedValueException('App URL must be set in config to filter uploaded files with file manager'); - } - $appHost = parse_url((string) $appUrl, PHP_URL_HOST); - - return Collection::make($urls)->unique()->filter(function (string $url) use ($appHost) { - $host = parse_url($url, PHP_URL_HOST); - - // 1. Validation du domaine (Doit être identique à l'app ou être un chemin relatif) - if ($host !== null && $host !== $appHost) { - return false; - } - - // 2. Extraction et nettoyage du chemin - $path = ltrim(urldecode((string) parse_url($url, PHP_URL_PATH)), '/'); - - // 3. Vérification du préfixe 'uploads/' et existence sur le disque - if (! str_starts_with($path, 'uploads/')) { - return false; - } - - // On retire 'uploads/' pour tester l'existence sur le disque 'private' - $diskPath = substr($path, strlen('uploads/')); - - return Storage::disk('private')->exists($diskPath); - })->values()->all(); - } - - /** - * Prepare storage path and return - * the file full path - * - * @param string $tableName Model table name. - * @param string $filename The basename for the file. - * @param bool $private May the file be stored in a private dir. - */ - private static function prepareMoveFile(string $tableName, string $filename, bool $private = false): string - { - // * Security filter - $filename = \htmlspecialchars($filename); - // * Security filter + beautifier - $filename = self::sanitizeFileName($filename); - // * Slugify filename - $ext = \pathinfo($filename, \PATHINFO_EXTENSION); - $filename = Str::slug(\pathinfo($filename, \PATHINFO_FILENAME)) . - (\strlen($ext) ? ".{$ext}" : ''); - - $folderPath = self::getStoragePath( - $private ? 'app/private/modelfiles' : 'app/public/modelfiles', - $tableName, - $filename - ); - $filename = self::getFileUniqueName($folderPath, $filename); - - return "{$folderPath}/{$filename}"; - } - - /** - * Create sub folders to store files using pattern - * storage/modelfiles/posts/10/04/19/5f - * year/month/day/sha256 first 2 letters - */ - private static function getStoragePath(string $storage_dir, string $table, string $filename): string - { - $filenameHash = \hash('sha256', $filename); - $pathFolder = \storage_path(sprintf( - '%s/%s/%s/%s/%s/%s', - $storage_dir, - $table, - gmdate('y'), - gmdate('m'), - gmdate('d'), - substr($filenameHash, 0, 2) - )); - if (! File::exists($pathFolder)) { - File::makeDirectory($pathFolder, 0755, true); - } - - return $pathFolder; - } - - /** - * Get unique filename if the path is already occupied - * - * @throws FileStorageOperationException If a unique filename cannot be obtained. - */ - private static function getFileUniqueName(string $folderPath, string $filename): string - { - $attempts = 0; - $maxAttempts = 20; - while (File::exists("{$folderPath}/{$filename}")) { - if ($attempts++ >= $maxAttempts) { - throw FileStorageOperationException::cannotGenerateUniqueFilename($folderPath, $filename); - } - $filename = Str::of(pathinfo($filename, \PATHINFO_FILENAME)) - ->append(Str::random(8) . '-') - ->append('.') - ->append(pathinfo($filename, \PATHINFO_EXTENSION)) - ->toString(); - } - - return $filename; - } - - /** - * Slugify the filename - */ - public static function slugifyFileName(string $filename): string - { - return Str::slug(pathinfo($filename, \PATHINFO_FILENAME)) . '.' . pathinfo($filename, \PATHINFO_EXTENSION); - } - - /** - * Sanitize File name for uploaded files - * - * @param string $filename The original uploaded client file name. - * @param bool $beautify Beautify the filename. - * @return string The sanitized file name. - */ - public static function sanitizeFileName(string $filename, bool $beautify = true): string - { - $filename = preg_replace('/[<>:"\/\\|?*\x00-\x1F\x7F\xA0\xAD#\[\]@!$&\'()+,;={}^~`]/u', '-', $filename) ?? $filename; - // * Avoids '.' '..' or '.hiddenFiles' . - $filename = (string) Str::of($filename)->ltrim('.-'); - // * Optional beautification - if ($beautify) { - $filename = self::beautifyFilename($filename); - } - // * Maximize filename length to 255 bytes http://serverfault.com/a/9548/44086 - /** @var string */ - $extension = pathinfo($filename, \PATHINFO_EXTENSION); - /** @var string */ - $filename = pathinfo($filename, \PATHINFO_FILENAME); - - $encoding = mb_detect_encoding($filename); - $encoding = $encoding ?: null; - - return \mb_strcut( - $filename, - 0, - 255 - (! empty($extension) ? strlen($extension) + 1 : 0), - $encoding - ) . (! empty($extension) ? ".$extension" : ''); - } - - /** - * Beautify a filename - */ - private static function beautifyFilename(string $filename): string - { - // Reduce consecutive characters. - $filename = preg_replace([ - // * "file name.zip" becomes 'file-name.zip' - '/ +/', - // * "file___name.zip" becomes 'file-name.zip' - '/_+/', - // * "file---name.zip" becomes 'file-name.zip' - '/-+/', - ], '-', $filename) ?? $filename; - $filename = preg_replace([ - // * "file--.--.-.--name.zip" becomes "file.name.zip" - '/-*\.-*/', - // * "file...name..zip" becomes "file.name.zip" - '/\.{2,}/', - ], '.', $filename) ?? $filename; - // Lowercase for windows/unix interoperability http://support.microsoft.com/kb/100625 . - $encoding = mb_detect_encoding($filename); - $filename = mb_strtolower($filename, $encoding ?: 'UTF-8'); - // * ".file-name.-" becomes "file-name" - $filename = trim($filename, '.-'); - - return $filename; - } - - /** - * Remove all model files for the given Model. - */ - public static function removeModelFiles(Model $model): void - { - $tableName = $model::query()->getModel()->getTable(); - - if (! empty(Storage::disk('public')->allFiles("modelfiles/{$tableName}"))) { - Storage::disk('public')->deleteDirectory("modelfiles/{$tableName}"); - } - if (! empty(Storage::disk('private')->allFiles("modelfiles/{$tableName}"))) { - Storage::disk('private')->deleteDirectory("modelfiles/{$tableName}"); - } - } - - public static function isMimeType(string $mimeType, \SplFileInfo $file): bool - { - if (! $file->getRealPath()) { - return false; - } - - $actualMime = File::mimeType($file->getRealPath()); - - return $actualMime ? Str::is($mimeType, $actualMime) : false; - } -} diff --git a/app/Lib/Helpers/ToolboxHelper.php b/app/Lib/Helpers/ToolboxHelper.php index 028153c1..6b38e15b 100644 --- a/app/Lib/Helpers/ToolboxHelper.php +++ b/app/Lib/Helpers/ToolboxHelper.php @@ -4,41 +4,12 @@ declare(strict_types=1); namespace App\Lib\Helpers; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Http\Request; -use Illuminate\Support\Arr; -use Illuminate\Support\Facades\Config; -use Illuminate\Support\Facades\File; -use Illuminate\Support\Facades\Route; -use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; use Illuminate\Validation\Rule; -use Illuminate\Validation\ValidationException; -use Symfony\Component\Finder\SplFileInfo; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class ToolboxHelper extends ToolboxHelperCore { - /** - * @param array $array1 - * @param array $array2 - * @return array - */ - public static function arrayMergeRecursiveDistinct(array &$array1, array &$array2): array - { - $merged = $array1; - foreach ($array2 as $key => &$value) { - if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) { - $merged[$key] = self::arrayMergeRecursiveDistinct($merged[$key], $value); - } else { - $merged[$key] = $value; - } - } - - return $merged; - } - /** * Strip scheme (https) on oembed urls * Only embed allowed are for MP4 self hosted videos right now @@ -72,8 +43,8 @@ class ToolboxHelper extends ToolboxHelperCore (string) str_replace('.', '\.', $field) => Rule::unique($table, $field)->ignore($id), ], [ (string) str_replace('.', '\.', "{$field}.unique") => trans( - 'crud.libs.toolbox.assertFieldIsUnique', - ['attribute' => $field, 'value' => is_array($value) ? json_encode($value) : $value] + 'validation.unique', + ['attribute' => $field] ), ])->validate(); @@ -83,326 +54,9 @@ class ToolboxHelper extends ToolboxHelperCore $field => Rule::unique($table)->where($query)->ignore($id), ], [ $field . '.unique' => trans( - 'crud.libs.toolbox.assertFieldIsUnique', - ['attribute' => $field, 'value' => is_array($value) ? json_encode($value) : $value] + 'validation.unique', + ['attribute' => $field] ), ])->validate(); } - - /** - * Assert That no Back Office url is present on txt - * - * @throws \Illuminate\Validation\ValidationException If url is a bo url. - */ - public static function assertNoInternalBoUrls(string $field, string $text): string - { - $routes = Route::getRoutes(); - - return self::replaceUrlsInText($text, function (string $url) use ($routes, $field): void { - $request = Request::create($url); - if (! self::isInternalHost($url)) { - return; - } - - if (trim($routes->match($request)->getPrefix() ?? '', '/') === 'bo') { - throw ValidationException::withMessages([ - $field => trans( - 'crud.libs.toolbox.assertNoInternalBoUrls', - ['attribute' => $field] - ), - ]); - } - }); - } - - /** - * Assert That only external url is present on txt - * - * @throws \Illuminate\Validation\ValidationException If url is a bo url. - */ - public static function assertNoInternalUrls(string $field, string $text): string - { - self::assertNoInternalBoUrls($field, $text); - $routes = Route::getRoutes(); - - return self::replaceUrlsInText($text, function (string $url) use ($routes, $field): void { - $request = Request::create($url); - $routes->match($request); - - if (! self::isInternalHost($url)) { - return; - } - - throw ValidationException::withMessages([ - $field => trans( - 'crud.libs.toolbox.assertNoInternalUrls', - ['attribute' => $field, 'appname' => Config::string('app.name')] - ), - ]); - }); - } - - private static function isInternalHost(string $url): bool - { - return \parse_url((string) Config::string('app.url'), \PHP_URL_HOST) === \parse_url($url, \PHP_URL_HOST); - } - - private static function replaceUrlsInText(string $text, callable $onMatchedUrl): string - { - $result = preg_replace_callback( - // phpcs:ignore Generic.Files.LineLength.TooLong - '/(?P(?:https?:\/\/)?(?:www\.)?[-a-zA-Z0-9@%._+~#=]{2,256}\.[a-z]{2,6}\b[-a-zA-Z0-9@:%_.+~#?&\/=]*)/', - function (array $matches) use ($onMatchedUrl): string { - $match = collect($matches)->first() ?? ''; - $url = (string) $match; - - try { - $onMatchedUrl($url); - } catch (NotFoundHttpException) { - return (string) $match; - } - - return (string) $match; - }, - $text - ); - - return is_string($result) ? $result : $text; - } - - /** - * Get original polyfill with autotranslate behavior - */ - public static function getOriginal(Model $model, string $attribute): mixed - { - if ( - \in_array('Spatie\Translatable\HasTranslations', \class_uses_recursive($model)) && // @phpstan-ignore-next-line - $model->isTranslatableAttribute($attribute) - ) { - // @phpstan-ignore-next-line - return $model->getTranslation( - $attribute, - // @phpstan-ignore-next-line - $model->getLocale(), - // @phpstan-ignore-next-line - $model->useFallbackLocale() - ); - } - - return $model->getOriginal($attribute); - } - - /** - * Generates an array from a dot separated string - * - * @param string $path The dot separated string to convert to an array. - * @param mixed $value The value to set at the end of the array. - * @param string $separator The separator used in the path (default is '.'). - * @return array The generated array. - */ - public static function dotStringToNestedArray(string $path, mixed $value, string $separator = '.'): array - { - throw_if($separator === '', \InvalidArgumentException::class, 'Separator cannot be an empty string.'); - - $arr = $value; - $keys = explode($separator, $path); - $keys = array_reverse($keys); - - foreach ($keys as $key) { - $arr = [$key => $arr]; - } - - return $arr; - } - - /** - * Validate pdf - * - * @param callable(string):void $fail A callback that should be called if the validation fails. - * - * @throws \Illuminate\Validation\ValidationException If the pdf is invalid. - */ - public static function validatePdf(string $attribute, ?string $value, callable $fail): void - { - if ($value === null) { - return; - } - - if (! ($useStorage = Storage::exists($value)) && ! File::exists($value)) { - $fail(trans('validation.custom.has_picture.file_does_not_exist', [ - 'attribute' => $attribute, - ])); - - return; - } - - if (self::getUploadedFileMimeType($value, $useStorage) !== 'application/pdf') { - $fail(trans('validation.mimetypes', [ - 'attribute' => $attribute, - 'values' => 'application/pdf', - ])); - } - } - - /** - * Validate picture - * - * @param callable(string):void $fail A callback that should be called if the validation fails. - * @param object{ - * minWidth: int, - * maxWidth: int, - * minHeight: int, - * maxHeight: int - * }&\stdClass $sizes An object containing the minimum and maximum width and height for the picture. - * - * @throws \Illuminate\Validation\ValidationException If the picture is invalid. - */ - public static function validatePicture(string $attribute, ?string $value, callable $fail, object $sizes): void - { - if ($value === null) { - return; - } - - if (! ($useStorage = Storage::exists($value)) && ! File::exists($value)) { - $fail(trans('validation.custom.has_picture.file_does_not_exist', [ - 'attribute' => $attribute, - ])); - - return; - } - $fileFullPath = self::getUploadedFileFullPath($value, $useStorage); - if ( - ! \in_array(self::getUploadedFileMimeType($value, $useStorage), [ - 'image/jpeg', - 'image/jpg', - 'image/png', - 'image/gif', - ]) - ) { - $fail(trans('validation.mimetypes', [ - 'attribute' => $attribute, - 'values' => 'image/jpeg, image/jpg, image/png, image/gif', - ])); - } - if (! ($dimensions = \getimagesize($fileFullPath))) { - $fail(trans('validation.dimensions', [ - 'attribute' => $attribute, - ])); - - return; - } - - $width = intval($dimensions[0]); - $height = intval($dimensions[1]); - - $xMessage = trans('validation.custom.has_picture.width_between', [ - 'attribute' => $attribute, - 'min' => "{$sizes->minWidth}px", - 'max' => "{$sizes->maxWidth}px", - ]); - if ($sizes->minWidth === $sizes->maxWidth) { - $xMessage = trans('validation.custom.has_picture.width_equal', [ - 'attribute' => $attribute, - 'value' => "{$sizes->minWidth}px", - ]); - } - $yMessage = trans('validation.custom.has_picture.height_between', [ - 'attribute' => $attribute, - 'min' => "{$sizes->minHeight}px", - 'max' => "{$sizes->maxHeight}px", - ]); - if ($sizes->minHeight === $sizes->maxHeight) { - $yMessage = trans('validation.custom.has_picture.height_equal', [ - 'attribute' => $attribute, - 'value' => "{$sizes->minHeight}px", - ]); - } - - if (($width < $sizes->minWidth) || ($width > $sizes->maxWidth)) { - $fail($xMessage); - } - if (($height < $sizes->minHeight) || ($height > $sizes->maxHeight)) { - $fail($yMessage); - } - } - - /** - * Fetch class list from a specific namespace - * - * @return array An array of classe namespaces - */ - public static function getClassesUsingNamespace(string $namespace): array - { - return collect(File::files(\app_path((string) Str::of($namespace)->replaceFirst('\App', '')))) - ->filter(fn (SplFileInfo $splFileInfo) => $splFileInfo->getExtension() === 'php') - ->map(fn (SplFileInfo $splFileInfo) => (string) Str::of($splFileInfo->getBasename()) - ->replace('.' . $splFileInfo->getExtension(), '')->prepend("{$namespace}\\"))->all(); - } - - /** - * Get all classes from a specific namespace that implement a specific interface - * - * @return array An array of classe namespaces - */ - public static function getClassesUsingInterface(string $namespace, string $interface): array - { - return Arr::where( - static::getClassesUsingNamespace($namespace), - fn (string $class_namespace) => \collect(class_implements($class_namespace, true) ?: [])->filter() - ->contains(fn (string $class_interface) => $class_interface === $interface) - ); - } - - /** - * Convert Hex color to RGB - * - * @return int[] - */ - public static function hexToRgb(string $hexcolor): array - { - $hexcolor = (string) str($hexcolor)->replaceStart('#', ''); - $r = (int) hexdec(substr($hexcolor, 0, 2)); - $g = (int) hexdec(substr($hexcolor, 2, 2)); - $b = (int) hexdec(substr($hexcolor, 4, 2)); - - return [$r, $g, $b]; - } - - /** - * Get text color contrast for a hex background color - * - * @return string "black" or "white" - */ - public static function getContrastYiq(string $hexcolor): string - { - [$r, $g, $b] = self::hexToRgb($hexcolor); - $yiq = (($r * 299) + ($g * 587) + ($b * 114)) / 1000; - - return ($yiq >= 128) ? 'black' : 'white'; - } - - /** - * Convert an HTML string to plain text with proper word spacing. - * - * Replaces HTML tags with spaces, strips remaining tags, - * normalises whitespace and trims the result. - * - * @param string|null $html The HTML content to convert. - * @param int|null $limit Optional character limit (uses Str::limit). - */ - public static function htmlToText(?string $html, ?int $limit = null): string - { - if ($html === null || $html === '') { - return ''; - } - - $text = strip_tags((string) preg_replace('/<[^>]*>/', ' ', $html)); - $text = trim((string) preg_replace('/\s+/', ' ', $text)); - - if ($limit !== null) { - return Str::limit($text, $limit); - } - - return $text; - } } diff --git a/app/Models/Product.php b/app/Models/Product.php index 5509ab6d..92b97a4a 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace App\Models; +use App\Casts\FilePathCast; use App\Casts\NutritionalValuesCast; -use App\Lib\Helpers\FileStorageHelper; use App\Lib\Helpers\ToolboxHelper; use Domain\Models\ValueObjects\Entities\ProductId; use Domain\Models\ValueObjects\Products\BreedingMethod; @@ -28,6 +28,7 @@ use Uwil\LaravelBackend\Traits\Models\HasActivityLog; use Uwil\LaravelBackend\Traits\Models\HasCache; use Uwil\LaravelBackend\Traits\Models\HasModelNaming; use Uwil\LaravelBackend\Traits\Models\HasUwilImages; +use Uwil\Storage\Facades\StorageService; // phpcs:disable Generic.Files.LineLength.TooLong @@ -35,7 +36,7 @@ use Uwil\LaravelBackend\Traits\Models\HasUwilImages; * @property string $id * @property string $seo_title * @property string $seo_description - * @property string $picture + * @property \Uwil\Storage\Lib\ValueObjects\StorageFilePath $picture * @property string $picture_alt * @property string $picture_title * @property string $name @@ -53,7 +54,7 @@ use Uwil\LaravelBackend\Traits\Models\HasUwilImages; * @property string $conservation_before_opening * @property string|null $conservation_after_opening * @property \Domain\Models\ValueObjects\Products\NutritionalValues|null $nutritional_values Domain\Models\ValueObjects\NutritionalValues - * @property string|null $pdf + * @property \Uwil\Storage\Lib\ValueObjects\StorageFilePath|null $pdf * @property \Illuminate\Support\Carbon|null $deleted_at * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at @@ -68,6 +69,7 @@ use Uwil\LaravelBackend\Traits\Models\HasUwilImages; * @method static \Illuminate\Database\Eloquent\Builder|Product whereJsonContainsLocales(string $column, array $locales, ?mixed $value, string $operand = '=') * @method static \Illuminate\Database\Eloquent\Builder|Product whereLocale(string $column, string $locale) * @method static \Illuminate\Database\Eloquent\Builder|Product whereLocales(string $column, array $locales) + * @method static \Illuminate\Database\Eloquent\Builder|Product whereTranslationLike(array|string $columns, string $search, ?array $locales = null) * @method static \Illuminate\Database\Eloquent\Builder|Product withTrashed(bool $withTrashed = true) * @method static \Illuminate\Database\Eloquent\Builder|Product withoutTrashed() * @@ -120,6 +122,8 @@ class Product extends Model implements TranslatableModel 'businesses' => AsEnumCollection::class . ':' . Business::class, 'formats' => AsEnumCollection::class . ':' . ProductFormat::class, 'nutritional_values' => NutritionalValuesCast::class, + 'picture' => FilePathCast::class, + 'pdf' => FilePathCast::class, ]; public function newUniqueId(): string @@ -140,8 +144,10 @@ class Product extends Model implements TranslatableModel }); static::deleting(function (self $model): void { - FileStorageHelper::removeFile($model, 'picture'); - FileStorageHelper::removeFile($model, 'pdf'); + StorageService::remove($model->picture); + if ($model->pdf) { + StorageService::remove($model->pdf); + } }); } @@ -165,11 +171,7 @@ class Product extends Model implements TranslatableModel { self::assertNameIsUnique($model->name, $model->id); - $model->slug = Str::slug($model->name); - $model->picture = FileStorageHelper::storeFile($model, $model->picture, true); - if ($model->pdf) { - $model->pdf = FileStorageHelper::storeFile($model, $model->pdf, true); - } + $model->slug = Str::slug($model->name); } private static function assertNameIsUnique(?string $name, string | int | null $id = null): void diff --git a/app/Models/Recipe.php b/app/Models/Recipe.php index 2f9bbccf..7ae01b81 100644 --- a/app/Models/Recipe.php +++ b/app/Models/Recipe.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace App\Models; -use App\Lib\Helpers\FileStorageHelper; +use App\Casts\FilePathCast; use App\Lib\Helpers\ToolboxHelper; use Domain\Models\ValueObjects\Entities\RecipeId; use Domain\Models\ValueObjects\Products\ProductCategory; @@ -25,6 +25,7 @@ use Uwil\LaravelBackend\Traits\Models\HasActivityLog; use Uwil\LaravelBackend\Traits\Models\HasCache; use Uwil\LaravelBackend\Traits\Models\HasModelNaming; use Uwil\LaravelBackend\Traits\Models\HasUwilImages; +use Uwil\Storage\Facades\StorageService; // phpcs:disable Generic.Files.LineLength.TooLong @@ -34,7 +35,7 @@ use Uwil\LaravelBackend\Traits\Models\HasUwilImages; * @property string $id * @property string $seo_title * @property string $seo_description - * @property string $picture + * @property \Uwil\Storage\Lib\ValueObjects\StorageFilePath $picture * @property string $picture_alt * @property string $picture_title * @property string $name @@ -62,6 +63,7 @@ use Uwil\LaravelBackend\Traits\Models\HasUwilImages; * @method static \Illuminate\Database\Eloquent\Builder|Recipe whereJsonContainsLocales(string $column, array $locales, ?mixed $value, string $operand = '=') * @method static \Illuminate\Database\Eloquent\Builder|Recipe whereLocale(string $column, string $locale) * @method static \Illuminate\Database\Eloquent\Builder|Recipe whereLocales(string $column, array $locales) + * @method static \Illuminate\Database\Eloquent\Builder|Recipe whereTranslationLike(array|string $columns, string $search, ?array $locales = null) * @method static \Illuminate\Database\Eloquent\Builder|Recipe withTrashed(bool $withTrashed = true) * @method static \Illuminate\Database\Eloquent\Builder|Recipe withoutTrashed() * @@ -106,6 +108,7 @@ class Recipe extends Model implements TranslatableModel 'consomption_time' => ConsumptionTime::class, 'inspiration' => Inspiration::class, 'season' => Season::class, + 'picture' => FilePathCast::class, ]; public function newUniqueId(): string @@ -126,7 +129,7 @@ class Recipe extends Model implements TranslatableModel }); static::deleting(function (self $model): void { - FileStorageHelper::removeFile($model, 'picture'); + StorageService::remove($model->picture); }); } @@ -150,8 +153,7 @@ class Recipe extends Model implements TranslatableModel { self::assertNameIsUnique($model->name, $model->id); - $model->slug = Str::slug($model->name); - $model->picture = FileStorageHelper::storeFile($model, $model->picture, true); + $model->slug = Str::slug($model->name); } private static function assertNameIsUnique(?string $name, string | int | null $id = null): void diff --git a/bootstrap/providers.php b/bootstrap/providers.php index 4f3b40e3..d8bf78e4 100644 --- a/bootstrap/providers.php +++ b/bootstrap/providers.php @@ -6,7 +6,7 @@ use App\Providers\AppServiceProvider; use App\Providers\AuthServiceProvider; use App\Providers\RouteServiceProvider; use App\Providers\ViewServiceProvider; -use Uwil\AdminSecure\Laravel\AdminSecureServiceProvider; +use Uwil\LaravelAdminSecure\AdminSecureServiceProvider; use Uwil\LaravelBackend\BackendServiceProvider; use Uwil\LaravelCommon\CommonServiceProvider; use Uwil\LaravelDynamicPages\DynamicPagesServiceProvider; diff --git a/composer.json b/composer.json index 4c48ed4b..68bbf9a2 100644 --- a/composer.json +++ b/composer.json @@ -10,21 +10,23 @@ "license": "MIT", "require": { "php": "^8.5", - "scaler-tech/laravel-saml2": "^2.5", "diglactic/laravel-breadcrumbs": "^10.0", "inertiajs/inertia-laravel": "^3.0", "laravel/framework": "^13.0", "laravel/scout": "^11.3", "laravel/telescope": "^5.7", "laravel/tinker": "^3.0", + "league/flysystem-aws-s3-v3": "*", "meilisearch/meilisearch-php": "^1.16", "monolog/monolog": "^3.0", "psr/log": "^3.0", + "scaler-tech/laravel-saml2": "^2.5", "sentry/sentry-laravel": "^4.25", "tightenco/ziggy": "^2.5", + "uwil/laravel-admin-secure": "^6.0.1", "uwil/k8s-laravel": "^3.0", - "uwil/admin-secure-laravel": "^6.0", - "uwil/laravel-dynamic-pages": "^5.0" + "uwil/laravel-dynamic-pages": "^5.0", + "uwil/storage-laravel": "^1.0" }, "require-dev": { "barryvdh/laravel-ide-helper": "^3.7", diff --git a/composer.lock b/composer.lock index ef035937..4929216a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,159 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "68468ff59d3ccb9eda372556bd4e7a03", + "content-hash": "1a6bc49776706da9ebc72b640aaf9c45", "packages": [ + { + "name": "aws/aws-crt-php", + "version": "v1.2.7", + "source": { + "type": "git", + "url": "https://github.com/awslabs/aws-crt-php.git", + "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/d71d9906c7bb63a28295447ba12e74723bd3730e", + "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35||^5.6.3||^9.5", + "yoast/phpunit-polyfills": "^1.0" + }, + "suggest": { + "ext-awscrt": "Make sure you install awscrt native extension to use any of the functionality." + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "AWS SDK Common Runtime Team", + "email": "aws-sdk-common-runtime@amazon.com" + } + ], + "description": "AWS Common Runtime for PHP", + "homepage": "https://github.com/awslabs/aws-crt-php", + "keywords": [ + "amazon", + "aws", + "crt", + "sdk" + ], + "support": { + "issues": "https://github.com/awslabs/aws-crt-php/issues", + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.7" + }, + "time": "2024-10-18T22:15:13+00:00" + }, + { + "name": "aws/aws-sdk-php", + "version": "3.402.5", + "source": { + "type": "git", + "url": "https://github.com/aws/aws-sdk-php.git", + "reference": "ffff4dbeda1c386f66e7e819afbd55406aa9799b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ffff4dbeda1c386f66e7e819afbd55406aa9799b", + "reference": "ffff4dbeda1c386f66e7e819afbd55406aa9799b", + "shasum": "" + }, + "require": { + "aws/aws-crt-php": "^1.2.3", + "ext-json": "*", + "ext-pcre": "*", + "ext-simplexml": "*", + "guzzlehttp/guzzle": "^7.8.2 || ^8.0", + "guzzlehttp/promises": "^2.0.3 || ^3.0", + "guzzlehttp/psr7": "^2.6.3 || ^3.0", + "mtdowling/jmespath.php": "^2.9.1", + "php": ">=8.2", + "psr/http-message": "^1.0 || ^2.0", + "symfony/filesystem": "^v5.4.45 || ^v6.4.3 || ^v7.1.0 || ^v8.0.0" + }, + "require-dev": { + "andrewsville/php-token-reflection": "^1.4", + "aws/aws-php-sns-message-validator": "~1.0", + "behat/behat": "~3.0", + "composer/composer": "^2.7.8", + "dms/phpunit-arraysubset-asserts": "^v0.5.0", + "doctrine/cache": "~1.4", + "ext-dom": "*", + "ext-openssl": "*", + "ext-sockets": "*", + "phpunit/phpunit": "^10.0", + "psr/cache": "^2.0 || ^3.0", + "psr/simple-cache": "^2.0 || ^3.0", + "sebastian/comparator": "^1.2.3 || ^4.0 || ^5.0", + "yoast/phpunit-polyfills": "^2.0" + }, + "suggest": { + "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", + "doctrine/cache": "To use the DoctrineCacheAdapter", + "ext-curl": "To send requests using cURL", + "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", + "ext-pcntl": "To use client-side monitoring", + "ext-sockets": "To use client-side monitoring" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Aws\\": "src/" + }, + "exclude-from-classmap": [ + "src/data/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Amazon Web Services", + "homepage": "https://aws.amazon.com" + } + ], + "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project", + "homepage": "https://aws.amazon.com/sdk-for-php", + "keywords": [ + "amazon", + "aws", + "cloud", + "dynamodb", + "ec2", + "glacier", + "s3", + "sdk" + ], + "support": { + "forum": "https://github.com/aws/aws-sdk-php/discussions", + "issues": "https://github.com/aws/aws-sdk-php/issues", + "source": "https://github.com/aws/aws-sdk-php/tree/3.402.5" + }, + "time": "2026-10-30T18:04:02+00:00" + }, { "name": "brick/math", "version": "1.0.0", @@ -287,23 +438,23 @@ }, { "name": "doctrine/inflector", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b" + "reference": "46351b6812b7b6d52b82c3efa5dfb786a198ec88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/6d6c96277ea252fc1304627204c3d5e6e15faa3b", - "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/46351b6812b7b6d52b82c3efa5dfb786a198ec88", + "reference": "46351b6812b7b6d52b82c3efa5dfb786a198ec88", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^12.0 || ^13.0", + "doctrine/coding-standard": "^12.0 || ^14.0", "phpstan/phpstan": "^1.12 || ^2.0", "phpstan/phpstan-phpunit": "^1.4 || ^2.0", "phpstan/phpstan-strict-rules": "^1.6 || ^2.0", @@ -357,7 +508,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.1.0" + "source": "https://github.com/doctrine/inflector/tree/2.1.1" }, "funding": [ { @@ -373,7 +524,7 @@ "type": "tidelift" } ], - "time": "2025-08-10T19:31:58+00:00" + "time": "2026-10-26T08:14:14+00:00" }, { "name": "doctrine/lexer", @@ -452,16 +603,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.6.0", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013" + "reference": "4189372ffeff09bf14f731f67a9de90c7b413ebe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/d61a8a9604ec1f8c3d150d09db6ce98b32675013", - "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/4189372ffeff09bf14f731f67a9de90c7b413ebe", + "reference": "4189372ffeff09bf14f731f67a9de90c7b413ebe", "shasum": "" }, "require": { @@ -472,8 +623,8 @@ }, "require-dev": { "phpstan/extension-installer": "^1.4.3", - "phpstan/phpstan": "^1.12.32|^2.1.31", - "phpunit/phpunit": "^8.5.48|^9.0" + "phpstan/phpstan": "^2.1.31", + "phpunit/phpunit": "^11.5.43 || ^12.4" }, "type": "library", "extra": { @@ -504,7 +655,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.6.0" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.6.1" }, "funding": [ { @@ -512,31 +663,31 @@ "type": "github" } ], - "time": "2025-10-31T18:51:33+00:00" + "time": "2026-10-19T17:53:57+00:00" }, { "name": "dxw/cidr", - "version": "v3.2.0", + "version": "v4.0.1", "source": { "type": "git", "url": "https://github.com/dxw/cidr.git", - "reference": "b07dd398f5a93441f57a687982bc7d0ffb96729a" + "reference": "58d1e9f8452f21d577283e5ae88589effba01257" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dxw/cidr/zipball/b07dd398f5a93441f57a687982bc7d0ffb96729a", - "reference": "b07dd398f5a93441f57a687982bc7d0ffb96729a", + "url": "https://api.github.com/repos/dxw/cidr/zipball/58d1e9f8452f21d577283e5ae88589effba01257", + "reference": "58d1e9f8452f21d577283e5ae88589effba01257", "shasum": "" }, "require": { "dxw/result": "^1.0", - "php": "^7.4||^8.1", - "phpseclib/phpseclib": "^2.0" + "php": "^8.3", + "phpseclib/phpseclib": "~3.0" }, "require-dev": { "dxw/php-cs-fixer-config": "^2.0", "kahlan/kahlan": "^5.2", - "vimeo/psalm": "^5.14" + "vimeo/psalm": "^6" }, "type": "library", "autoload": { @@ -559,31 +710,31 @@ "homepage": "https://github.com/dxw/cidr", "support": { "issues": "https://github.com/dxw/cidr/issues", - "source": "https://github.com/dxw/cidr/tree/v3.2.0" + "source": "https://github.com/dxw/cidr/tree/v4.0.1" }, - "time": "2023-08-14T10:14:13+00:00" + "time": "2026-10-26T10:29:12+00:00" }, { "name": "dxw/result", - "version": "v1.0.6", + "version": "v1.0.7", "source": { "type": "git", "url": "https://github.com/dxw/result.git", - "reference": "d554bb10f0cf74056ccd26526688e194652eef79" + "reference": "2e609e156d16627977a535a5b344946b52efb30c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dxw/result/zipball/d554bb10f0cf74056ccd26526688e194652eef79", - "reference": "d554bb10f0cf74056ccd26526688e194652eef79", + "url": "https://api.github.com/repos/dxw/result/zipball/2e609e156d16627977a535a5b344946b52efb30c", + "reference": "2e609e156d16627977a535a5b344946b52efb30c", "shasum": "" }, "require": { - "php": "^7.4||^8.1" + "php": "^8.3" }, "require-dev": { "dxw/php-cs-fixer-config": "^2.1", "kahlan/kahlan": "^5.2", - "vimeo/psalm": "^4" + "vimeo/psalm": "^6" }, "type": "library", "autoload": { @@ -606,9 +757,9 @@ "homepage": "https://github.com/dxw/result", "support": { "issues": "https://github.com/dxw/result/issues", - "source": "https://github.com/dxw/result/tree/v1.0.6" + "source": "https://github.com/dxw/result/tree/v1.0.7" }, - "time": "2023-07-19T11:14:28+00:00" + "time": "2026-10-26T10:17:13+00:00" }, { "name": "egulias/email-validator", @@ -926,22 +1077,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "8.2.0", + "version": "8.3.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "93939470950a9b11e2e84204166ef5e048c55fe4" + "reference": "7d9b1f430bb65ac664e120af227bf9a795ad6333" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/93939470950a9b11e2e84204166ef5e048c55fe4", - "reference": "93939470950a9b11e2e84204166ef5e048c55fe4", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7d9b1f430bb65ac664e120af227bf9a795ad6333", + "reference": "7d9b1f430bb65ac664e120af227bf9a795ad6333", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^3.0.2", - "guzzlehttp/psr7": "^3.1", + "guzzlehttp/promises": "^3.1", + "guzzlehttp/psr7": "^3.2", "php": "^7.4 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", @@ -955,7 +1106,7 @@ "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", "guzzle/client-integration-tests": "4.0.1", - "guzzlehttp/test-server": "^1.0.1", + "guzzlehttp/test-server": "^1.1", "php-http/message-factory": "^1.1", "phpunit/phpunit": "^9.6.34", "psr/log": "^1.1 || ^2.0 || ^3.0" @@ -1032,7 +1183,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/8.2.0" + "source": "https://github.com/guzzle/guzzle/tree/8.3.1" }, "funding": [ { @@ -1048,24 +1199,25 @@ "type": "tidelift" } ], - "time": "2026-09-06T13:55:09+00:00" + "time": "2026-10-25T21:35:34+00:00" }, { "name": "guzzlehttp/promises", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "42118e66a53c492effaf92bc357e931985d5c6f9" + "reference": "094d0ec418eb3b1411ea271a180ec95cae6ae933" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/42118e66a53c492effaf92bc357e931985d5c6f9", - "reference": "42118e66a53c492effaf92bc357e931985d5c6f9", + "url": "https://api.github.com/repos/guzzle/promises/zipball/094d0ec418eb3b1411ea271a180ec95cae6ae933", + "reference": "094d0ec418eb3b1411ea271a180ec95cae6ae933", "shasum": "" }, "require": { - "php": "^7.4 || ^8.0" + "php": "^7.4 || ^8.0", + "symfony/deprecation-contracts": "^2.5 || ^3.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", @@ -1115,7 +1267,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/3.0.2" + "source": "https://github.com/guzzle/promises/tree/3.1.0" }, "funding": [ { @@ -1131,20 +1283,20 @@ "type": "tidelift" } ], - "time": "2026-08-24T10:00:26+00:00" + "time": "2026-10-18T12:48:16+00:00" }, { "name": "guzzlehttp/psr7", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "a3059ba1a84c9139c4ae03cf0f45bea276c97c74" + "reference": "cdc139396207a5eba10c242d241fb014cb098390" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/a3059ba1a84c9139c4ae03cf0f45bea276c97c74", - "reference": "a3059ba1a84c9139c4ae03cf0f45bea276c97c74", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/cdc139396207a5eba10c242d241fb014cb098390", + "reference": "cdc139396207a5eba10c242d241fb014cb098390", "shasum": "" }, "require": { @@ -1234,7 +1386,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/3.1.0" + "source": "https://github.com/guzzle/psr7/tree/3.2.0" }, "funding": [ { @@ -1250,7 +1402,7 @@ "type": "tidelift" } ], - "time": "2026-08-24T11:02:13+00:00" + "time": "2026-10-17T23:57:19+00:00" }, { "name": "guzzlehttp/uri-template", @@ -1340,16 +1492,16 @@ }, { "name": "inertiajs/inertia-laravel", - "version": "v3.5.1", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/inertiajs/inertia-laravel.git", - "reference": "35a27ea62b8a53ec40269c4c675db5d9d0e02426" + "reference": "9d3f9060c1614565eb4d3a3208015ed01de347bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/35a27ea62b8a53ec40269c4c675db5d9d0e02426", - "reference": "35a27ea62b8a53ec40269c4c675db5d9d0e02426", + "url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/9d3f9060c1614565eb4d3a3208015ed01de347bb", + "reference": "9d3f9060c1614565eb4d3a3208015ed01de347bb", "shasum": "" }, "require": { @@ -1406,9 +1558,9 @@ ], "support": { "issues": "https://github.com/inertiajs/inertia-laravel/issues", - "source": "https://github.com/inertiajs/inertia-laravel/tree/v3.5.1" + "source": "https://github.com/inertiajs/inertia-laravel/tree/v3.7.0" }, - "time": "2026-10-01T10:38:10+00:00" + "time": "2026-11-02T10:29:10+00:00" }, { "name": "jean85/pretty-package-versions", @@ -1472,16 +1624,16 @@ }, { "name": "laravel/framework", - "version": "v13.37.0", + "version": "v13.40.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "685f8d6c2ab4547287500bc80ccdf2ca12635109" + "reference": "1449bf241017087fbd38c118ecaabef3f6797fdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/685f8d6c2ab4547287500bc80ccdf2ca12635109", - "reference": "685f8d6c2ab4547287500bc80ccdf2ca12635109", + "url": "https://api.github.com/repos/laravel/framework/zipball/1449bf241017087fbd38c118ecaabef3f6797fdc", + "reference": "1449bf241017087fbd38c118ecaabef3f6797fdc", "shasum": "" }, "require": { @@ -1699,7 +1851,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2026-10-16T04:59:27+00:00" + "time": "2026-11-03T15:07:18+00:00" }, { "name": "laravel/prompts", @@ -1959,16 +2111,16 @@ }, { "name": "laravel/telescope", - "version": "v5.26.0", + "version": "v5.27.0", "source": { "type": "git", "url": "https://github.com/laravel/telescope.git", - "reference": "bedfc50a3561c93cd89064643139a51c56bfd8a6" + "reference": "60ce9759dc9b0b8e5cb0c9280a78fb283bfaaf8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/bedfc50a3561c93cd89064643139a51c56bfd8a6", - "reference": "bedfc50a3561c93cd89064643139a51c56bfd8a6", + "url": "https://api.github.com/repos/laravel/telescope/zipball/60ce9759dc9b0b8e5cb0c9280a78fb283bfaaf8e", + "reference": "60ce9759dc9b0b8e5cb0c9280a78fb283bfaaf8e", "shasum": "" }, "require": { @@ -2021,9 +2173,9 @@ "monitoring" ], "support": { - "source": "https://github.com/laravel/telescope/tree/v5.26.0" + "source": "https://github.com/laravel/telescope/tree/v5.27.0" }, - "time": "2026-09-22T21:38:44+00:00" + "time": "2026-10-31T06:24:09+00:00" }, { "name": "laravel/tinker", @@ -2096,16 +2248,16 @@ }, { "name": "league/commonmark", - "version": "2.10.3", + "version": "2.10.7", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "6efbd9c472b91db0a3350fcd601c8332c2382e1f" + "reference": "8eb53e906fd60c67038d22f1f1cab420ed58b8be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6efbd9c472b91db0a3350fcd601c8332c2382e1f", - "reference": "6efbd9c472b91db0a3350fcd601c8332c2382e1f", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/8eb53e906fd60c67038d22f1f1cab420ed58b8be", + "reference": "8eb53e906fd60c67038d22f1f1cab420ed58b8be", "shasum": "" }, "require": { @@ -2199,7 +2351,7 @@ "type": "tidelift" } ], - "time": "2026-09-21T13:07:34+00:00" + "time": "2026-10-31T13:35:37+00:00" }, { "name": "league/config", @@ -2366,6 +2518,61 @@ }, "time": "2026-09-02T08:00:27+00:00" }, + { + "name": "league/flysystem-aws-s3-v3", + "version": "3.35.3", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", + "reference": "b03780cb97585ee7e48977f40ed599b33b751634" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/b03780cb97585ee7e48977f40ed599b33b751634", + "reference": "b03780cb97585ee7e48977f40ed599b33b751634", + "shasum": "" + }, + "require": { + "aws/aws-sdk-php": "^3.371.5", + "league/flysystem": "^3.10.0", + "league/mime-type-detection": "^1.0.0", + "php": "^8.0.2" + }, + "conflict": { + "guzzlehttp/guzzle": "<7.0", + "guzzlehttp/ringphp": "<1.1.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "League\\Flysystem\\AwsS3V3\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Frank de Jonge", + "email": "info@frankdejonge.nl" + } + ], + "description": "AWS S3 filesystem adapter for Flysystem.", + "keywords": [ + "Flysystem", + "aws", + "file", + "files", + "filesystem", + "s3", + "storage" + ], + "support": { + "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.35.3" + }, + "time": "2026-08-08T16:19:23+00:00" + }, { "name": "league/flysystem-local", "version": "3.35.3", @@ -2473,20 +2680,21 @@ }, { "name": "league/uri", - "version": "7.8.1", + "version": "7.9.1", "source": { "type": "git", "url": "https://github.com/thephpleague/uri.git", - "reference": "08cf38e3924d4f56238125547b5720496fac8fd4" + "reference": "40403f5c3141457a61f7f1aba6706e8fa4a0ece5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri/zipball/08cf38e3924d4f56238125547b5720496fac8fd4", - "reference": "08cf38e3924d4f56238125547b5720496fac8fd4", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/40403f5c3141457a61f7f1aba6706e8fa4a0ece5", + "reference": "40403f5c3141457a61f7f1aba6706e8fa4a0ece5", "shasum": "" }, "require": { - "league/uri-interfaces": "^7.8.1", + "ext-mbstring": "*", + "league/uri-interfaces": "^7.9.1", "php": "^8.1", "psr/http-factory": "^1" }, @@ -2559,7 +2767,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri/tree/7.8.1" + "source": "https://github.com/thephpleague/uri/tree/7.9.1" }, "funding": [ { @@ -2567,20 +2775,20 @@ "type": "github" } ], - "time": "2026-03-15T20:22:25+00:00" + "time": "2026-10-27T07:14:23+00:00" }, { "name": "league/uri-interfaces", - "version": "7.8.1", + "version": "7.9.1", "source": { "type": "git", "url": "https://github.com/thephpleague/uri-interfaces.git", - "reference": "85d5c77c5d6d3af6c54db4a78246364908f3c928" + "reference": "994300a79e17f179112dc259f8df0c4de982f736" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/85d5c77c5d6d3af6c54db4a78246364908f3c928", - "reference": "85d5c77c5d6d3af6c54db4a78246364908f3c928", + "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/994300a79e17f179112dc259f8df0c4de982f736", + "reference": "994300a79e17f179112dc259f8df0c4de982f736", "shasum": "" }, "require": { @@ -2643,7 +2851,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri-interfaces/tree/7.8.1" + "source": "https://github.com/thephpleague/uri-interfaces/tree/7.9.1" }, "funding": [ { @@ -2651,7 +2859,7 @@ "type": "github" } ], - "time": "2026-03-08T20:05:35+00:00" + "time": "2026-10-27T07:14:23+00:00" }, { "name": "mcamara/laravel-localization", @@ -2993,17 +3201,83 @@ "time": "2026-09-29T19:21:12+00:00" }, { - "name": "nesbot/carbon", - "version": "3.14.2", + "name": "mtdowling/jmespath.php", + "version": "2.9.2", "source": { "type": "git", - "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "94cfc34887f07ab5c0efa07914c8f527544e3224" + "url": "https://github.com/jmespath/jmespath.php.git", + "reference": "2157c5e50e813ec6a96c1eed3be7f64a20fb32a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/94cfc34887f07ab5c0efa07914c8f527544e3224", - "reference": "94cfc34887f07ab5c0efa07914c8f527544e3224", + "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/2157c5e50e813ec6a96c1eed3be7f64a20fb32a8", + "reference": "2157c5e50e813ec6a96c1eed3be7f64a20fb32a8", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0", + "symfony/polyfill-mbstring": "^1.17" + }, + "require-dev": { + "composer/xdebug-handler": "^3.0.3", + "phpunit/phpunit": "^8.5.52" + }, + "bin": [ + "bin/jp.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.9-dev" + } + }, + "autoload": { + "files": [ + "src/JmesPath.php" + ], + "psr-4": { + "JmesPath\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Declaratively specify how to extract elements from a JSON document", + "keywords": [ + "json", + "jsonpath" + ], + "support": { + "issues": "https://github.com/jmespath/jmespath.php/issues", + "source": "https://github.com/jmespath/jmespath.php/tree/2.9.2" + }, + "time": "2026-07-06T18:56:19+00:00" + }, + { + "name": "nesbot/carbon", + "version": "3.15.1", + "source": { + "type": "git", + "url": "https://github.com/CarbonPHP/carbon.git", + "reference": "ce0e5636fae7d1e99856eb70cae4c719a284aa08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ce0e5636fae7d1e99856eb70cae4c719a284aa08", + "reference": "ce0e5636fae7d1e99856eb70cae4c719a284aa08", "shasum": "" }, "require": { @@ -3013,6 +3287,7 @@ "psr/clock": "^1.0", "symfony/clock": "^6.3.12 || ^7.0 || ^8.0", "symfony/polyfill-mbstring": "^1.0", + "symfony/polyfill-time": "^1.0", "symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0 || ^8.0" }, "provide": { @@ -3095,37 +3370,37 @@ "type": "tidelift" } ], - "time": "2026-10-02T07:26:52+00:00" + "time": "2026-10-25T14:32:48+00:00" }, { "name": "nette/schema", - "version": "v1.3.6", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "c54350438cd6914616f790a49cb424605f421562" + "reference": "af9fa8a86bfca9b02b10346220db26e62ef942ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/c54350438cd6914616f790a49cb424605f421562", - "reference": "c54350438cd6914616f790a49cb424605f421562", + "url": "https://api.github.com/repos/nette/schema/zipball/af9fa8a86bfca9b02b10346220db26e62ef942ec", + "reference": "af9fa8a86bfca9b02b10346220db26e62ef942ec", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.5" + "php": "8.1 - 8.6" }, "require-dev": { - "nette/phpstan-rules": "^1.0", + "nette/phpstan-rules": "^1.0.7", "nette/tester": "^2.6", "phpstan/extension-installer": "^1.4@stable", - "phpstan/phpstan": "^2.1.39@stable", + "phpstan/phpstan": "^2.3@stable", "tracy/tracy": "^2.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -3146,40 +3421,40 @@ { "name": "David Grudl", "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" } ], - "description": "📐 Nette Schema: validating data structures against a given Schema.", - "homepage": "https://nette.org", + "description": "📐 Nette Schema: validates and normalizes data such as configuration or API input against a schema described in a few readable lines of PHP, with precise error messages.", + "homepage": "https://doc.nette.org/schema", "keywords": [ - "config", - "nette" + "configuration", + "data validation", + "nette", + "normalization", + "schema", + "validation" ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.3.6" + "source": "https://github.com/nette/schema/tree/v1.4.0" }, - "time": "2026-08-16T21:58:41+00:00" + "time": "2026-10-22T02:12:50+00:00" }, { "name": "nette/utils", - "version": "v4.1.5", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "b043439dbdf954e6c28b5ea7e34b0100f83165e0" + "reference": "6bf24518accf32cf845bca305e0b92078700fd01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/b043439dbdf954e6c28b5ea7e34b0100f83165e0", - "reference": "b043439dbdf954e6c28b5ea7e34b0100f83165e0", + "url": "https://api.github.com/repos/nette/utils/zipball/6bf24518accf32cf845bca305e0b92078700fd01", + "reference": "6bf24518accf32cf845bca305e0b92078700fd01", "shasum": "" }, "require": { - "php": "8.2 - 8.5" + "php": "8.2 - 8.6" }, "conflict": { "nette/finder": "<3", @@ -3251,9 +3526,9 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.1.5" + "source": "https://github.com/nette/utils/tree/v4.1.6" }, - "time": "2026-07-17T23:02:45+00:00" + "time": "2026-10-20T17:07:56+00:00" }, { "name": "nikic/php-parser", @@ -3541,6 +3816,125 @@ ], "time": "2026-05-07T22:38:04+00:00" }, + { + "name": "paragonie/constant_time_encoding", + "version": "v3.1.3", + "source": { + "type": "git", + "url": "https://github.com/paragonie/constant_time_encoding.git", + "reference": "d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77", + "reference": "d5b01a39b3415c2cd581d3bd3a3575c1ebbd8e77", + "shasum": "" + }, + "require": { + "php": "^8" + }, + "require-dev": { + "infection/infection": "^0", + "nikic/php-fuzzer": "^0", + "phpunit/phpunit": "^9|^10|^11", + "vimeo/psalm": "^4|^5|^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "ParagonIE\\ConstantTime\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com", + "role": "Maintainer" + }, + { + "name": "Steve 'Sc00bz' Thomas", + "email": "steve@tobtu.com", + "homepage": "https://www.tobtu.com", + "role": "Original Developer" + } + ], + "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)", + "keywords": [ + "base16", + "base32", + "base32_decode", + "base32_encode", + "base64", + "base64_decode", + "base64_encode", + "bin2hex", + "encoding", + "hex", + "hex2bin", + "rfc4648" + ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/constant_time_encoding/issues", + "source": "https://github.com/paragonie/constant_time_encoding" + }, + "time": "2025-09-24T15:06:41+00:00" + }, + { + "name": "paragonie/random_compat", + "version": "v9.99.100", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", + "shasum": "" + }, + "require": { + "php": ">= 7" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "polyfill", + "pseudorandom", + "random" + ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, + "time": "2020-10-15T08:29:30+00:00" + }, { "name": "php-http/discovery", "version": "1.20.0", @@ -3697,32 +4091,32 @@ }, { "name": "phpseclib/phpseclib", - "version": "2.0.55", + "version": "3.0.58", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "d73c9e019a895be83b18a2ccccfa7e2b0a648743" + "reference": "91f3a6436bb84040ac0cf49e761977f17d16a39b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d73c9e019a895be83b18a2ccccfa7e2b0a648743", - "reference": "d73c9e019a895be83b18a2ccccfa7e2b0a648743", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/91f3a6436bb84040ac0cf49e761977f17d16a39b", + "reference": "91f3a6436bb84040ac0cf49e761977f17d16a39b", "shasum": "" }, "require": { - "php": ">=5.3.3" + "paragonie/constant_time_encoding": "^1|^2|^3", + "paragonie/random_compat": "^1.4|^2.0|^9.99.99", + "php": ">=5.6.1" }, "require-dev": { - "phing/phing": "~2.7", - "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^8.5|^9.4", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "*" }, "suggest": { + "ext-dom": "Install the DOM extension to load XML formatted public keys.", "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", - "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.", - "ext-xml": "Install the XML extension to load XML formatted public keys." + "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." }, "type": "library", "autoload": { @@ -3730,7 +4124,7 @@ "phpseclib/bootstrap.php" ], "psr-4": { - "phpseclib\\": "phpseclib/" + "phpseclib3\\": "phpseclib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3787,7 +4181,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/2.0.55" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.58" }, "funding": [ { @@ -3803,7 +4197,7 @@ "type": "tidelift" } ], - "time": "2026-06-14T19:53:12+00:00" + "time": "2026-11-02T10:45:48+00:00" }, { "name": "psr/clock", @@ -4578,16 +4972,16 @@ }, { "name": "sentry/sentry", - "version": "4.34.0", + "version": "4.35.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "3d8f4e56becb10ede64e2ac6f8077f6434715461" + "reference": "8247f5411fd98d98183366f001278ce3591eda20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/3d8f4e56becb10ede64e2ac6f8077f6434715461", - "reference": "3d8f4e56becb10ede64e2ac6f8077f6434715461", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/8247f5411fd98d98183366f001278ce3591eda20", + "reference": "8247f5411fd98d98183366f001278ce3591eda20", "shasum": "" }, "require": { @@ -4659,7 +5053,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.34.0" + "source": "https://github.com/getsentry/sentry-php/tree/4.35.0" }, "funding": [ { @@ -4671,7 +5065,7 @@ "type": "custom" } ], - "time": "2026-10-08T11:25:58+00:00" + "time": "2026-10-29T16:02:44+00:00" }, { "name": "sentry/sentry-laravel", @@ -4828,29 +5222,30 @@ }, { "name": "spatie/laravel-translatable", - "version": "6.14.1", + "version": "6.15.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-translatable.git", - "reference": "d120a925cf413b2427f886264bb6eb102ac23d42" + "reference": "7d7c3c8f7c67eb13ea4e961261dd7bfdd0cfa68e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-translatable/zipball/d120a925cf413b2427f886264bb6eb102ac23d42", - "reference": "d120a925cf413b2427f886264bb6eb102ac23d42", + "url": "https://api.github.com/repos/spatie/laravel-translatable/zipball/7d7c3c8f7c67eb13ea4e961261dd7bfdd0cfa68e", + "reference": "7d7c3c8f7c67eb13ea4e961261dd7bfdd0cfa68e", "shasum": "" }, "require": { - "illuminate/database": "^11.0|^12.0|^13.0", - "illuminate/support": "^11.0|^12.0|^13.0", - "php": "^8.3", + "illuminate/database": "^12.0|^13.0", + "illuminate/support": "^12.0|^13.0", + "php": "^8.4", "spatie/laravel-package-tools": "^1.93.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.90", + "larastan/larastan": "^3.0", + "laravel/pint": "^1.32", "mockery/mockery": "^1.6.12", - "orchestra/testbench": "^9.0|^10.0|^11.0", - "pestphp/pest": "^4.0.0" + "orchestra/testbench": "^10.0|^11.0", + "pestphp/pest": "^4.7|^5.3" }, "type": "library", "extra": { @@ -4899,7 +5294,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-translatable/issues", - "source": "https://github.com/spatie/laravel-translatable/tree/6.14.1" + "source": "https://github.com/spatie/laravel-translatable/tree/6.15.0" }, "funding": [ { @@ -4907,7 +5302,7 @@ "type": "github" } ], - "time": "2026-04-23T08:26:29+00:00" + "time": "2026-10-19T00:09:37+00:00" }, { "name": "spatie/schema-org", @@ -5061,16 +5456,16 @@ }, { "name": "symfony/console", - "version": "v8.1.9", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "630e74196a2635ec0f06c12bd3fb47cfedf85157" + "reference": "5b6d9b127ec27bc6db59bf65e2e37b6fe5b00083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/630e74196a2635ec0f06c12bd3fb47cfedf85157", - "reference": "630e74196a2635ec0f06c12bd3fb47cfedf85157", + "url": "https://api.github.com/repos/symfony/console/zipball/5b6d9b127ec27bc6db59bf65e2e37b6fe5b00083", + "reference": "5b6d9b127ec27bc6db59bf65e2e37b6fe5b00083", "shasum": "" }, "require": { @@ -5137,7 +5532,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v8.1.9" + "source": "https://github.com/symfony/console/tree/v8.1.10" }, "funding": [ { @@ -5157,20 +5552,20 @@ "type": "tidelift" } ], - "time": "2026-10-12T19:11:16+00:00" + "time": "2026-10-28T11:16:19+00:00" }, { "name": "symfony/css-selector", - "version": "v8.1.6", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "08e2905152a39cf3fd1745d83f8c483e258887d9" + "reference": "9cfd588b8b07cf83e3426b030dbafd2291c132d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/08e2905152a39cf3fd1745d83f8c483e258887d9", - "reference": "08e2905152a39cf3fd1745d83f8c483e258887d9", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/9cfd588b8b07cf83e3426b030dbafd2291c132d9", + "reference": "9cfd588b8b07cf83e3426b030dbafd2291c132d9", "shasum": "" }, "require": { @@ -5206,7 +5601,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v8.1.6" + "source": "https://github.com/symfony/css-selector/tree/v8.1.10" }, "funding": [ { @@ -5226,7 +5621,7 @@ "type": "tidelift" } ], - "time": "2026-08-23T10:06:25+00:00" + "time": "2026-10-18T14:56:39+00:00" }, { "name": "symfony/deprecation-contracts", @@ -5301,16 +5696,16 @@ }, { "name": "symfony/error-handler", - "version": "v8.1.8", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "c146daceccd5d4f864c051b233c276641cec527b" + "reference": "84c6d73f990ae22dbd45625c056d7ff99ca6810d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/c146daceccd5d4f864c051b233c276641cec527b", - "reference": "c146daceccd5d4f864c051b233c276641cec527b", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/84c6d73f990ae22dbd45625c056d7ff99ca6810d", + "reference": "84c6d73f990ae22dbd45625c056d7ff99ca6810d", "shasum": "" }, "require": { @@ -5358,7 +5753,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v8.1.8" + "source": "https://github.com/symfony/error-handler/tree/v8.1.10" }, "funding": [ { @@ -5378,7 +5773,7 @@ "type": "tidelift" } ], - "time": "2026-09-22T18:58:53+00:00" + "time": "2026-10-25T14:40:25+00:00" }, { "name": "symfony/event-dispatcher", @@ -5547,17 +5942,88 @@ "time": "2026-06-05T06:23:12+00:00" }, { - "name": "symfony/finder", - "version": "v8.1.8", + "name": "symfony/filesystem", + "version": "v8.1.9", "source": { "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "bd4fed193a3132c91c5c93595cbfc78988915822" + "url": "https://github.com/symfony/filesystem.git", + "reference": "43d109c803d22c00bb820ed45df250b6a8792ca2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/bd4fed193a3132c91c5c93595cbfc78988915822", - "reference": "bd4fed193a3132c91c5c93595cbfc78988915822", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/43d109c803d22c00bb820ed45df250b6a8792ca2", + "reference": "43d109c803d22c00bb820ed45df250b6a8792ca2", + "shasum": "" + }, + "require": { + "php": ">=8.4.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "require-dev": { + "symfony/process": "^7.4|^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v8.1.9" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2026-10-06T20:05:50+00:00" + }, + { + "name": "symfony/finder", + "version": "v8.1.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "2f4c0f26106520d82e1b71759d2fb8d32d8b7a43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/2f4c0f26106520d82e1b71759d2fb8d32d8b7a43", + "reference": "2f4c0f26106520d82e1b71759d2fb8d32d8b7a43", "shasum": "" }, "require": { @@ -5592,7 +6058,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v8.1.8" + "source": "https://github.com/symfony/finder/tree/v8.1.10" }, "funding": [ { @@ -5612,20 +6078,20 @@ "type": "tidelift" } ], - "time": "2026-09-26T06:33:49+00:00" + "time": "2026-10-19T17:00:07+00:00" }, { "name": "symfony/http-foundation", - "version": "v8.1.9", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7850897fb8659f98491b03be79ac48600bdaf9ab" + "reference": "79325f87c3a2acc7564ddce9f457046e980e7255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7850897fb8659f98491b03be79ac48600bdaf9ab", - "reference": "7850897fb8659f98491b03be79ac48600bdaf9ab", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/79325f87c3a2acc7564ddce9f457046e980e7255", + "reference": "79325f87c3a2acc7564ddce9f457046e980e7255", "shasum": "" }, "require": { @@ -5673,7 +6139,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v8.1.9" + "source": "https://github.com/symfony/http-foundation/tree/v8.1.10" }, "funding": [ { @@ -5693,20 +6159,20 @@ "type": "tidelift" } ], - "time": "2026-10-08T16:57:43+00:00" + "time": "2026-10-27T12:24:10+00:00" }, { "name": "symfony/http-kernel", - "version": "v8.1.9", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "55c6935bb4c004a72b55f723e79d5404881dcad3" + "reference": "924974dbdcdf4cc40d7bb2c65ae83bb6dc67cff1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/55c6935bb4c004a72b55f723e79d5404881dcad3", - "reference": "55c6935bb4c004a72b55f723e79d5404881dcad3", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/924974dbdcdf4cc40d7bb2c65ae83bb6dc67cff1", + "reference": "924974dbdcdf4cc40d7bb2c65ae83bb6dc67cff1", "shasum": "" }, "require": { @@ -5783,7 +6249,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v8.1.9" + "source": "https://github.com/symfony/http-kernel/tree/v8.1.10" }, "funding": [ { @@ -5803,20 +6269,20 @@ "type": "tidelift" } ], - "time": "2026-10-14T06:47:03+00:00" + "time": "2026-10-28T18:22:19+00:00" }, { "name": "symfony/mailer", - "version": "v8.1.7", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "8783380ecdafa23d36fc90c5873fd44b635c6e10" + "reference": "4ba81a8f04fbf0bb1691f7bff760b301f1956fd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/8783380ecdafa23d36fc90c5873fd44b635c6e10", - "reference": "8783380ecdafa23d36fc90c5873fd44b635c6e10", + "url": "https://api.github.com/repos/symfony/mailer/zipball/4ba81a8f04fbf0bb1691f7bff760b301f1956fd7", + "reference": "4ba81a8f04fbf0bb1691f7bff760b301f1956fd7", "shasum": "" }, "require": { @@ -5863,7 +6329,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v8.1.7" + "source": "https://github.com/symfony/mailer/tree/v8.1.10" }, "funding": [ { @@ -5883,20 +6349,20 @@ "type": "tidelift" } ], - "time": "2026-09-15T06:01:24+00:00" + "time": "2026-10-23T17:06:53+00:00" }, { "name": "symfony/mime", - "version": "v8.1.7", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "773ac57f20e2795bdadb65b5b1b5f4850d498283" + "reference": "8d1232052c9cdef170ed9608b3147bca4f61ff69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/773ac57f20e2795bdadb65b5b1b5f4850d498283", - "reference": "773ac57f20e2795bdadb65b5b1b5f4850d498283", + "url": "https://api.github.com/repos/symfony/mime/zipball/8d1232052c9cdef170ed9608b3147bca4f61ff69", + "reference": "8d1232052c9cdef170ed9608b3147bca4f61ff69", "shasum": "" }, "require": { @@ -5949,7 +6415,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v8.1.7" + "source": "https://github.com/symfony/mime/tree/v8.1.10" }, "funding": [ { @@ -5969,20 +6435,20 @@ "type": "tidelift" } ], - "time": "2026-09-04T11:02:17+00:00" + "time": "2026-10-28T17:58:38+00:00" }, { "name": "symfony/options-resolver", - "version": "v8.1.0", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "88f9c561f678a02d54b897014049fa839e33ff82" + "reference": "68cc43038d234c69d510c62f37bd0058b40d548a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/88f9c561f678a02d54b897014049fa839e33ff82", - "reference": "88f9c561f678a02d54b897014049fa839e33ff82", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/68cc43038d234c69d510c62f37bd0058b40d548a", + "reference": "68cc43038d234c69d510c62f37bd0058b40d548a", "shasum": "" }, "require": { @@ -6020,7 +6486,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v8.1.0" + "source": "https://github.com/symfony/options-resolver/tree/v8.1.10" }, "funding": [ { @@ -6040,7 +6506,7 @@ "type": "tidelift" } ], - "time": "2026-05-29T05:06:50+00:00" + "time": "2026-10-18T14:56:39+00:00" }, { "name": "symfony/polyfill-ctype", @@ -6127,16 +6593,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.43.0", + "version": "v1.43.3", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "5cac8f4db97208823aa353f59a01faad2da52c75" + "reference": "5a8f33c87aeecffce24e721b5064fab05f4becf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5cac8f4db97208823aa353f59a01faad2da52c75", - "reference": "5cac8f4db97208823aa353f59a01faad2da52c75", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5a8f33c87aeecffce24e721b5064fab05f4becf8", + "reference": "5a8f33c87aeecffce24e721b5064fab05f4becf8", "shasum": "" }, "require": { @@ -6185,7 +6651,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.43.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.43.3" }, "funding": [ { @@ -6205,7 +6671,7 @@ "type": "tidelift" } ], - "time": "2026-09-25T15:46:47+00:00" + "time": "2026-10-15T09:18:53+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -6381,16 +6847,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.43.0", + "version": "v1.43.3", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "4d5d331bf731e0aedbc6b2f5e61135b7b7996a72" + "reference": "122889ed24dc000165bcbfd77ec412f15cbdfc6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/4d5d331bf731e0aedbc6b2f5e61135b7b7996a72", - "reference": "4d5d331bf731e0aedbc6b2f5e61135b7b7996a72", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/122889ed24dc000165bcbfd77ec412f15cbdfc6a", + "reference": "122889ed24dc000165bcbfd77ec412f15cbdfc6a", "shasum": "" }, "require": { @@ -6442,7 +6908,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.43.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.43.3" }, "funding": [ { @@ -6462,7 +6928,7 @@ "type": "tidelift" } ], - "time": "2026-09-24T15:19:04+00:00" + "time": "2026-10-28T09:35:49+00:00" }, { "name": "symfony/polyfill-php80", @@ -6948,6 +7414,89 @@ ], "time": "2026-09-25T15:46:47+00:00" }, + { + "name": "symfony/polyfill-time", + "version": "v1.42.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-time.git", + "reference": "ac9f1ed802dd58f37e720388130c088434aa09fc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-time/zipball/ac9f1ed802dd58f37e720388130c088434aa09fc", + "reference": "ac9f1ed802dd58f37e720388130c088434aa09fc", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Time\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ignace Philippe Nyamagana Butera", + "email": "nyamsprod@gmail.com" + }, + { + "name": "Tim Düsterhus", + "email": "tim@tideways-gmbh.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Time API added to PHP 8.6", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "duration", + "polyfill", + "portable", + "shim", + "time" + ], + "support": { + "source": "https://github.com/symfony/polyfill-time/tree/v1.42.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2026-08-07T13:08:13+00:00" + }, { "name": "symfony/polyfill-uuid", "version": "v1.43.0", @@ -7033,16 +7582,16 @@ }, { "name": "symfony/process", - "version": "v8.1.9", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "59a682fd049b2d4d37c444f5ac21b7d01b8c7189" + "reference": "08aa69fa0998bb65a089f9e148a2c0f8b391398e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/59a682fd049b2d4d37c444f5ac21b7d01b8c7189", - "reference": "59a682fd049b2d4d37c444f5ac21b7d01b8c7189", + "url": "https://api.github.com/repos/symfony/process/zipball/08aa69fa0998bb65a089f9e148a2c0f8b391398e", + "reference": "08aa69fa0998bb65a089f9e148a2c0f8b391398e", "shasum": "" }, "require": { @@ -7074,7 +7623,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v8.1.9" + "source": "https://github.com/symfony/process/tree/v8.1.10" }, "funding": [ { @@ -7094,7 +7643,7 @@ "type": "tidelift" } ], - "time": "2026-10-08T16:57:43+00:00" + "time": "2026-10-25T14:40:25+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -7185,16 +7734,16 @@ }, { "name": "symfony/routing", - "version": "v8.1.9", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "edb06fb6ced3c1faaaed74c1c6c0f176a614c330" + "reference": "41b32d2c5d907abe2c3ffaa7a112dd7492353822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/edb06fb6ced3c1faaaed74c1c6c0f176a614c330", - "reference": "edb06fb6ced3c1faaaed74c1c6c0f176a614c330", + "url": "https://api.github.com/repos/symfony/routing/zipball/41b32d2c5d907abe2c3ffaa7a112dd7492353822", + "reference": "41b32d2c5d907abe2c3ffaa7a112dd7492353822", "shasum": "" }, "require": { @@ -7241,7 +7790,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v8.1.9" + "source": "https://github.com/symfony/routing/tree/v8.1.10" }, "funding": [ { @@ -7261,7 +7810,7 @@ "type": "tidelift" } ], - "time": "2026-10-12T12:37:13+00:00" + "time": "2026-10-26T21:55:04+00:00" }, { "name": "symfony/service-contracts", @@ -7352,16 +7901,16 @@ }, { "name": "symfony/string", - "version": "v8.1.9", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "07fb208558f941eab50ec49c89c2a6a93fb11f01" + "reference": "6c6110979c0150393bbb336170e286d51ab4d76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/07fb208558f941eab50ec49c89c2a6a93fb11f01", - "reference": "07fb208558f941eab50ec49c89c2a6a93fb11f01", + "url": "https://api.github.com/repos/symfony/string/zipball/6c6110979c0150393bbb336170e286d51ab4d76c", + "reference": "6c6110979c0150393bbb336170e286d51ab4d76c", "shasum": "" }, "require": { @@ -7418,7 +7967,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v8.1.9" + "source": "https://github.com/symfony/string/tree/v8.1.10" }, "funding": [ { @@ -7438,20 +7987,20 @@ "type": "tidelift" } ], - "time": "2026-10-03T15:16:03+00:00" + "time": "2026-10-23T17:06:53+00:00" }, { "name": "symfony/translation", - "version": "v8.1.5", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "d9e1caba0d6b6f9a26710af8a2f88d37f001215a" + "reference": "8fbbb32f4bbbece5079acb01ab648fd20583fc93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/d9e1caba0d6b6f9a26710af8a2f88d37f001215a", - "reference": "d9e1caba0d6b6f9a26710af8a2f88d37f001215a", + "url": "https://api.github.com/repos/symfony/translation/zipball/8fbbb32f4bbbece5079acb01ab648fd20583fc93", + "reference": "8fbbb32f4bbbece5079acb01ab648fd20583fc93", "shasum": "" }, "require": { @@ -7511,7 +8060,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v8.1.5" + "source": "https://github.com/symfony/translation/tree/v8.1.10" }, "funding": [ { @@ -7531,7 +8080,7 @@ "type": "tidelift" } ], - "time": "2026-08-21T17:47:34+00:00" + "time": "2026-10-25T14:40:25+00:00" }, { "name": "symfony/translation-contracts", @@ -7695,16 +8244,16 @@ }, { "name": "symfony/var-dumper", - "version": "v8.1.9", + "version": "v8.1.10", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "b8c168c764c09f5d931f290c9dbdd13f1bf142f3" + "reference": "3412a5af7d34a19515a77890fc804fe8e50d1a4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b8c168c764c09f5d931f290c9dbdd13f1bf142f3", - "reference": "b8c168c764c09f5d931f290c9dbdd13f1bf142f3", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3412a5af7d34a19515a77890fc804fe8e50d1a4f", + "reference": "3412a5af7d34a19515a77890fc804fe8e50d1a4f", "shasum": "" }, "require": { @@ -7758,7 +8307,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v8.1.9" + "source": "https://github.com/symfony/var-dumper/tree/v8.1.10" }, "funding": [ { @@ -7778,7 +8327,7 @@ "type": "tidelift" } ], - "time": "2026-10-13T05:48:51+00:00" + "time": "2026-10-26T21:55:04+00:00" }, { "name": "tightenco/ziggy", @@ -7905,70 +8454,6 @@ }, "time": "2025-12-02T11:56:42+00:00" }, - { - "name": "uwil/admin-secure-laravel", - "version": "6.0.0", - "source": { - "type": "git", - "url": "git@lab.s-web.fr:ldc-web/projets/ldc-web-admin-secure-laravel.git", - "reference": "c54dad85ee051e103f50dc8f19d457703bc5ff03" - }, - "dist": { - "type": "zip", - "url": "https://lab.s-web.fr/api/v4/projects/20/packages/composer/archives/uwil/admin-secure-laravel.zip?sha=c54dad85ee051e103f50dc8f19d457703bc5ff03", - "reference": "c54dad85ee051e103f50dc8f19d457703bc5ff03", - "shasum": "" - }, - "require": { - "dxw/cidr": "^3.2", - "illuminate/support": "~11|~12|~13", - "laravel/framework": "~11|~12|~13", - "php": "^8.3", - "symfony/options-resolver": "^7.0|^8.0" - }, - "require-dev": { - "larastan/larastan": "^2.9", - "orchestra/testbench": "^9", - "phpunit/php-code-coverage": "^11", - "phpunit/phpunit": "^11", - "slevomat/coding-standard": "^8", - "squizlabs/php_codesniffer": "^3" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Uwil\\AdminSecure\\Laravel\\AdminSecureServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Uwil\\AdminSecure\\Laravel\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "Uwil\\AdminSecure\\Laravel\\Tests\\": "tests" - } - }, - "scripts": { - "test": [ - "vendor/bin/phpunit" - ], - "post-autoload-dump": [ - "@php ./vendor/bin/testbench package:discover --ansi" - ] - }, - "license": [ - "MIT" - ], - "description": "Restrict access to LDC Network", - "support": { - "email": "digital@ldc.fr", - "issues": "https://lab.s-web.fr/ldc-web/projets/ldc-web-admin-secure-laravel/-/issues" - } - }, { "name": "uwil/k8s-laravel", "version": "3.0.0", @@ -8030,6 +8515,81 @@ "issues": "https://lab.s-web.fr/ldc-web/projets/k8s-laravel/-/issues" } }, + { + "name": "uwil/laravel-admin-secure", + "version": "6.0.1", + "source": { + "type": "git", + "url": "git@lab.s-web.fr:ldc-web/projets/ldc-web-admin-secure-laravel.git", + "reference": "d0c4dbc6f0e196e30da85881aebc71b40464712a" + }, + "dist": { + "type": "zip", + "url": "https://lab.s-web.fr/api/v4/projects/20/packages/composer/archives/uwil/laravel-admin-secure.zip?sha=d0c4dbc6f0e196e30da85881aebc71b40464712a", + "reference": "d0c4dbc6f0e196e30da85881aebc71b40464712a", + "shasum": "" + }, + "require": { + "dxw/cidr": "^4.0.0", + "illuminate/support": "~11|~12|~13", + "laravel/framework": "~11|~12|~13", + "php": "^8.3", + "symfony/options-resolver": "^7.0|^8.0" + }, + "require-dev": { + "driftingly/rector-laravel": "^2.3", + "larastan/larastan": "^3.9", + "laravel/pint": "^1.29", + "orchestra/testbench": "^11.1", + "slevomat/coding-standard": "^8.3", + "squizlabs/php_codesniffer": "^3.7" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Uwil\\LaravelAdminSecure\\AdminSecureServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Uwil\\LaravelAdminSecure\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Uwil\\LaravelAdminSecure\\Tests\\": "tests" + } + }, + "scripts": { + "phpcs": [ + "./vendor/bin/phpcs" + ], + "rector": [ + "./vendor/bin/rector" + ], + "phpstan": [ + "./vendor/bin/phpstan" + ], + "post-autoload-dump": [ + "@php ./vendor/bin/testbench package:discover --ansi" + ] + }, + "license": [ + "MIT" + ], + "description": "Restrict access to LDC Network", + "keywords": [ + "laravel", + "security", + "uwil" + ], + "support": { + "email": "digital@ldc.fr", + "issues": "https://lab.s-web.fr/ldc-web/projets/laravel-admin-secure/-/issues" + } + }, { "name": "uwil/laravel-backend", "version": "8.0.1", @@ -8373,17 +8933,107 @@ "description": "A fluent builder Schema.org types and ld+json generator wrapper" }, { - "name": "vlucas/phpdotenv", - "version": "v5.7.0", + "name": "uwil/storage-laravel", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/phpdotenv/phpdotenv.git", - "reference": "301c07936b16d88628b126b01d082ba153cf4c40" + "url": "git@lab.s-web.fr:ldc-web/projets/file-storage-service.git", + "reference": "0552f17521eace9f2cf8c2ed9d51501880dc87bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpdotenv/phpdotenv/zipball/301c07936b16d88628b126b01d082ba153cf4c40", - "reference": "301c07936b16d88628b126b01d082ba153cf4c40", + "url": "https://lab.s-web.fr/api/v4/projects/284/packages/composer/archives/uwil/storage-laravel.zip?sha=0552f17521eace9f2cf8c2ed9d51501880dc87bc", + "reference": "0552f17521eace9f2cf8c2ed9d51501880dc87bc", + "shasum": "" + }, + "require": { + "illuminate/support": "~13", + "laravel/framework": "~13", + "php": "^8.5" + }, + "require-dev": { + "larastan/larastan": "^3.4", + "laravel/pint": "^1.29", + "orchestra/testbench": "^11.3", + "pestphp/pest": "^5.3", + "php-parallel-lint/php-parallel-lint": "^1.4", + "phpstan/phpstan-mockery": "^2.0", + "slevomat/coding-standard": "^8.22" + }, + "type": "library", + "extra": { + "laravel": { + "aliases": { + "StorageService": "Uwil\\Storage\\Facades\\StorageService" + }, + "providers": [ + "Uwil\\Storage\\StorageServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Uwil\\Storage\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Uwil\\Storage\\Tests\\": "tests/" + } + }, + "scripts": { + "lint": [ + "./vendor/bin/phpcs && ./vendor/bin/pint --test" + ], + "test": [ + "./vendor/bin/pest" + ], + "format": [ + "./vendor/bin/pint" + ], + "analyze": [ + "./vendor/bin/phpstan analyse" + ], + "lint:fix": [ + "./vendor/bin/phpcbf && ./vendor/bin/pint" + ], + "lint:php": [ + "./vendor/bin/parallel-lint --exclude vendor ." + ], + "lint:pint": [ + "./vendor/bin/pint --test" + ], + "lint:phpcs": [ + "./vendor/bin/phpcs" + ], + "lint:phpstan": [ + "./vendor/bin/phpstan analyse" + ], + "test:coverage": [ + "./vendor/bin/pest --log-junit=junit.xml --coverage --coverage-html=tests/coverage --coverage-clover=coverage.xml" + ] + }, + "license": [ + "MIT" + ], + "description": "Handles file storage", + "support": { + "email": "digital@ldc.fr", + "issues": "https://lab.s-web.fr/ldc-web/projets/storage-laravel/-/issues" + } + }, + { + "name": "vlucas/phpdotenv", + "version": "v5.8.0", + "source": { + "type": "git", + "url": "https://github.com/phpdotenv/phpdotenv.git", + "reference": "96149103e62ac67e915f6d2ef59b72dee2e011e0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpdotenv/phpdotenv/zipball/96149103e62ac67e915f6d2ef59b72dee2e011e0", + "reference": "96149103e62ac67e915f6d2ef59b72dee2e011e0", "shasum": "" }, "require": { @@ -8410,7 +9060,7 @@ "forward-command": false }, "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.8-dev" } }, "autoload": { @@ -8441,8 +9091,8 @@ "environment" ], "support": { - "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.7.0" + "issues": "https://github.com/phpdotenv/phpdotenv/issues", + "source": "https://github.com/phpdotenv/phpdotenv/tree/v5.8.0" }, "funding": [ { @@ -8454,7 +9104,7 @@ "type": "tidelift" } ], - "time": "2026-08-24T18:07:49+00:00" + "time": "2026-10-25T16:26:19+00:00" }, { "name": "voku/portable-ascii", @@ -8587,16 +9237,16 @@ }, { "name": "barryvdh/laravel-ide-helper", - "version": "v3.7.0", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "ad7e37676f1ff985d55ef1b6b96a0c0a40f2609a" + "reference": "f9521af2a0ed5ff1d70386cac3fae547a96be947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/ad7e37676f1ff985d55ef1b6b96a0c0a40f2609a", - "reference": "ad7e37676f1ff985d55ef1b6b96a0c0a40f2609a", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/f9521af2a0ed5ff1d70386cac3fae547a96be947", + "reference": "f9521af2a0ed5ff1d70386cac3fae547a96be947", "shasum": "" }, "require": { @@ -8633,7 +9283,7 @@ ] }, "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "3.7-dev" } }, "autoload": { @@ -8666,7 +9316,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-ide-helper/issues", - "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.7.0" + "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.8.0" }, "funding": [ { @@ -8678,7 +9328,7 @@ "type": "github" } ], - "time": "2026-03-17T14:12:51+00:00" + "time": "2026-09-15T12:58:37+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -8804,16 +9454,16 @@ }, { "name": "composer/class-map-generator", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "c0efbeb2f3fd7e23c7f180a59765c0b48a31fbc4" + "reference": "5fa48e0e1992ea8a786df3ceca80625c9a643b75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/c0efbeb2f3fd7e23c7f180a59765c0b48a31fbc4", - "reference": "c0efbeb2f3fd7e23c7f180a59765c0b48a31fbc4", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/5fa48e0e1992ea8a786df3ceca80625c9a643b75", + "reference": "5fa48e0e1992ea8a786df3ceca80625c9a643b75", "shasum": "" }, "require": { @@ -8857,7 +9507,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.8.0" + "source": "https://github.com/composer/class-map-generator/tree/1.9.0" }, "funding": [ { @@ -8869,7 +9519,7 @@ "type": "github" } ], - "time": "2026-09-25T15:24:19+00:00" + "time": "2026-11-03T10:10:19+00:00" }, { "name": "composer/pcre", @@ -8949,16 +9599,16 @@ }, { "name": "composer/semver", - "version": "3.5.1", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "528948210cc46f967a4b98e83b19e76f2b504993" + "reference": "d92543b7ede9c4ec6b59853cefb061e39866d2cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/528948210cc46f967a4b98e83b19e76f2b504993", - "reference": "528948210cc46f967a4b98e83b19e76f2b504993", + "url": "https://api.github.com/repos/composer/semver/zipball/d92543b7ede9c4ec6b59853cefb061e39866d2cf", + "reference": "d92543b7ede9c4ec6b59853cefb061e39866d2cf", "shasum": "" }, "require": { @@ -9010,7 +9660,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.5.1" + "source": "https://github.com/composer/semver/tree/3.6.0" }, "funding": [ { @@ -9022,7 +9672,7 @@ "type": "github" } ], - "time": "2026-10-05T13:12:12+00:00" + "time": "2026-10-29T09:13:34+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -9182,6 +9832,7 @@ "type": "yoomoney" } ], + "abandoned": true, "time": "2026-03-17T21:50:20+00:00" }, { @@ -9414,16 +10065,16 @@ }, { "name": "filp/whoops", - "version": "2.18.6", + "version": "2.19.2", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "7d0a2cde892089bb09372f4366e9b960eb3001a9" + "reference": "84e33631273138ac103d045dc02b0fb7e5485582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/7d0a2cde892089bb09372f4366e9b960eb3001a9", - "reference": "7d0a2cde892089bb09372f4366e9b960eb3001a9", + "url": "https://api.github.com/repos/filp/whoops/zipball/84e33631273138ac103d045dc02b0fb7e5485582", + "reference": "84e33631273138ac103d045dc02b0fb7e5485582", "shasum": "" }, "require": { @@ -9473,7 +10124,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.18.6" + "source": "https://github.com/filp/whoops/tree/2.19.2" }, "funding": [ { @@ -9481,7 +10132,7 @@ "type": "github" } ], - "time": "2026-10-03T17:03:57+00:00" + "time": "2026-11-03T23:38:01+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -9581,16 +10232,16 @@ }, { "name": "larastan/larastan", - "version": "v3.13.0", + "version": "v3.14.0", "source": { "type": "git", "url": "https://github.com/larastan/larastan.git", - "reference": "24ee69a7705ffc7c2cd8a3c96a5f498a4c2de5e3" + "reference": "d8fabc3fd35bec22b4f3f9c1144fc53c6686c43b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/larastan/larastan/zipball/24ee69a7705ffc7c2cd8a3c96a5f498a4c2de5e3", - "reference": "24ee69a7705ffc7c2cd8a3c96a5f498a4c2de5e3", + "url": "https://api.github.com/repos/larastan/larastan/zipball/d8fabc3fd35bec22b4f3f9c1144fc53c6686c43b", + "reference": "d8fabc3fd35bec22b4f3f9c1144fc53c6686c43b", "shasum": "" }, "require": { @@ -9609,7 +10260,7 @@ "doctrine/coding-standard": "^14", "laravel/framework": "^11.44.2 || ^12.7.2 || ^13", "mockery/mockery": "^1.6.12", - "nikic/php-parser": "^5.4", + "nikic/php-parser": "^5.6", "orchestra/canvas": "^v9.2.2 || ^10.0.1 || ^11", "orchestra/testbench-core": "^9.12.0 || ^10.1 || ^11", "phpstan/phpstan-deprecation-rules": "^2.0.1", @@ -9658,7 +10309,7 @@ ], "support": { "issues": "https://github.com/larastan/larastan/issues", - "source": "https://github.com/larastan/larastan/tree/v3.13.0" + "source": "https://github.com/larastan/larastan/tree/v3.14.0" }, "funding": [ { @@ -9666,7 +10317,7 @@ "type": "github" } ], - "time": "2026-10-07T14:14:28+00:00" + "time": "2026-11-03T11:34:05+00:00" }, { "name": "laravel-lang/actions", @@ -10136,16 +10787,16 @@ }, { "name": "laravel-lang/lang", - "version": "15.37.4", + "version": "15.37.5", "source": { "type": "git", "url": "https://github.com/Laravel-Lang/lang.git", - "reference": "a3a9ef9b039d10db442bfb3bed0a97c9b50f30a7" + "reference": "a3c03e04bef3feef72935b16be37a11192774e16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/a3a9ef9b039d10db442bfb3bed0a97c9b50f30a7", - "reference": "a3a9ef9b039d10db442bfb3bed0a97c9b50f30a7", + "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/a3c03e04bef3feef72935b16be37a11192774e16", + "reference": "a3c03e04bef3feef72935b16be37a11192774e16", "shasum": "" }, "require": { @@ -10206,7 +10857,7 @@ "type": "yoomoney" } ], - "time": "2026-10-09T09:55:05+00:00" + "time": "2026-10-31T20:36:55+00:00" }, { "name": "laravel-lang/locale-list", @@ -10955,16 +11606,16 @@ }, { "name": "laravel-lang/starter-kits", - "version": "1.16.1", + "version": "1.17.0", "source": { "type": "git", "url": "https://github.com/Laravel-Lang/starter-kits.git", - "reference": "87c00c77bbb73385d0526b35dbe07ea2bbfc32db" + "reference": "6e5da369a7d97de21b20eab6496a1cbed8490bbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Lang/starter-kits/zipball/87c00c77bbb73385d0526b35dbe07ea2bbfc32db", - "reference": "87c00c77bbb73385d0526b35dbe07ea2bbfc32db", + "url": "https://api.github.com/repos/Laravel-Lang/starter-kits/zipball/6e5da369a7d97de21b20eab6496a1cbed8490bbf", + "reference": "6e5da369a7d97de21b20eab6496a1cbed8490bbf", "shasum": "" }, "require": { @@ -11016,7 +11667,7 @@ ], "support": { "issues": "https://github.com/Laravel-Lang/starter-kits/issues", - "source": "https://github.com/Laravel-Lang/starter-kits/tree/1.16.1" + "source": "https://github.com/Laravel-Lang/starter-kits/tree/1.17.0" }, "funding": [ { @@ -11028,7 +11679,7 @@ "type": "yoomoney" } ], - "time": "2026-07-16T18:13:26+00:00" + "time": "2026-10-29T21:13:21+00:00" }, { "name": "laravel/breeze", @@ -11660,16 +12311,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "2.3.6", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "1427af4647235b4a73b13940b1f1258d3584f36e" + "reference": "af8e840551031d254cfdb3a18a62c3470a309c10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1427af4647235b4a73b13940b1f1258d3584f36e", - "reference": "1427af4647235b4a73b13940b1f1258d3584f36e", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/af8e840551031d254cfdb3a18a62c3470a309c10", + "reference": "af8e840551031d254cfdb3a18a62c3470a309c10", "shasum": "" }, "require": { @@ -11701,17 +12352,17 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.6" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.4.1" }, - "time": "2026-09-27T20:07:45+00:00" + "time": "2026-10-30T19:36:28+00:00" }, { "name": "phpstan/phpstan", - "version": "2.3.1", + "version": "2.3.5", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6155239b488e95d26d1ebd95c6b4bb294d7f09db", - "reference": "6155239b488e95d26d1ebd95c6b4bb294d7f09db", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/645a1bd6bead15fc1b8474137467961d0fa30a79", + "reference": "645a1bd6bead15fc1b8474137467961d0fa30a79", "shasum": "" }, "require": { @@ -11767,7 +12418,7 @@ "type": "github" } ], - "time": "2026-10-08T21:09:11+00:00" + "time": "2026-11-03T12:14:22+00:00" }, { "name": "phpunit/php-code-coverage", @@ -12128,16 +12779,16 @@ }, { "name": "phpunit/phpunit", - "version": "12.5.40", + "version": "12.5.43", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "76bd3198f16aeb375a4d5f3626471445aed0966e" + "reference": "1d5a4a3c98fa1ca3a51402c74b66c2c8df85e0bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/76bd3198f16aeb375a4d5f3626471445aed0966e", - "reference": "76bd3198f16aeb375a4d5f3626471445aed0966e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1d5a4a3c98fa1ca3a51402c74b66c2c8df85e0bb", + "reference": "1d5a4a3c98fa1ca3a51402c74b66c2c8df85e0bb", "shasum": "" }, "require": { @@ -12206,7 +12857,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.40" + "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.43" }, "funding": [ { @@ -12214,7 +12865,7 @@ "type": "other" } ], - "time": "2026-10-16T05:55:07+00:00" + "time": "2026-11-02T07:10:00+00:00" }, { "name": "sebastian/cli-parser", @@ -13151,32 +13802,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.31.1", + "version": "8.31.3", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "0a40807a48873948bfa7ffce2a4e69ba40cf5e76" + "reference": "b5c34b28811ee2ed323c52c7dabe2f2802dd2f8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/0a40807a48873948bfa7ffce2a4e69ba40cf5e76", - "reference": "0a40807a48873948bfa7ffce2a4e69ba40cf5e76", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b5c34b28811ee2ed323c52c7dabe2f2802dd2f8a", + "reference": "b5c34b28811ee2ed323c52c7dabe2f2802dd2f8a", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.2.1", "php": "^7.4 || ^8.0", - "phpstan/phpdoc-parser": "^2.3.3", - "squizlabs/php_codesniffer": "^4.0.1" + "phpstan/phpdoc-parser": "^2.3.6", + "squizlabs/php_codesniffer": "^4.0.4" }, "require-dev": { "phing/phing": "3.0.1|3.1.2", "php-parallel-lint/php-parallel-lint": "1.4.0", - "phpstan/phpstan": "2.2.7", + "phpstan/phpstan": "2.3.2", "phpstan/phpstan-deprecation-rules": "2.0.5", - "phpstan/phpstan-phpunit": "2.0.18", - "phpstan/phpstan-strict-rules": "2.0.12", - "phpunit/phpunit": "9.6.34|10.5.63|11.4.4|11.5.56|12.5.33" + "phpstan/phpstan-phpunit": "2.1.1", + "phpstan/phpstan-strict-rules": "2.1.0", + "phpunit/phpunit": "9.6.38|10.5.66|11.4.4|11.5.57|12.5.40" }, "type": "phpcodesniffer-standard", "extra": { @@ -13200,7 +13851,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.31.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.31.3" }, "funding": [ { @@ -13212,7 +13863,7 @@ "type": "tidelift" } ], - "time": "2026-07-31T10:42:43+00:00" + "time": "2026-10-28T16:34:46+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/config/storage-service.php b/config/storage-service.php new file mode 100644 index 00000000..d9430247 --- /dev/null +++ b/config/storage-service.php @@ -0,0 +1,15 @@ + 's3', + + 'eligibleDisks' => [ + 's3', + ], + + 'prefix' => env('STORAGE_SERVICE_PREFIX', 'media'), + + 'allowedExtensions' => ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'txt', 'doc', 'docx', 'csv', 'mp4', 'webm'], +]; diff --git a/database/migrations/2026_11_04_102600_migrate_model_files_to_storage_service.php b/database/migrations/2026_11_04_102600_migrate_model_files_to_storage_service.php new file mode 100644 index 00000000..01edf792 --- /dev/null +++ b/database/migrations/2026_11_04_102600_migrate_model_files_to_storage_service.php @@ -0,0 +1,147 @@ +migrateTableFiles('products', ['picture', 'pdf']); + $this->migrateTableFiles('recipes', ['picture']); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + // One-way migration. + } + + /** + * @param string[] $columns + */ + private function migrateTableFiles(string $tableName, array $columns): void + { + if (! Schema::hasTable($tableName)) { + return; + } + + DB::table($tableName) + ->select(array_merge(['id'], $columns)) + ->orderBy('id') + ->each(fn (object $record) => $this->migrateRecord( + $tableName, + $record, + $columns + )); + } + + /** + * @param string[] $columns + */ + private function migrateRecord(string $tableName, object $record, array $columns): void + { + $updates = []; + + foreach ($columns as $column) { + $newPath = $this->migrateColumnFile( + $tableName, + $column, + (string) $record->id, + $record->$column + ); + + if ($newPath !== null) { + $updates[$column] = $newPath; + } + } + + if ($updates !== []) { + DB::table($tableName) + ->where('id', $record->id) + ->update($updates); + } + } + + private function migrateColumnFile( + string $tableName, + string $column, + string $recordId, + mixed $rawPath + ): ?string { + if (! is_string($rawPath) || trim($rawPath) === '') { + return null; + } + + $cleanPath = ltrim($rawPath, '/'); + if (! str_starts_with($cleanPath, 'storage/')) { + return null; + } + + $resolvedFilePath = $this->resolveLocalFilePath($cleanPath); + if ($resolvedFilePath === null) { + Log::warning("Migration: file not found on disk for {$tableName}.{$column} (ID: {$recordId}): {$rawPath}"); + + return null; + } + + return $this->storeLocalFile( + $tableName, + $column, + $recordId, + $rawPath, + $resolvedFilePath + ); + } + + private function storeLocalFile(string $tableName, string $column, string $recordId, string $rawPath, string $filePath): ?string + { + try { + $splFile = new \SplFileObject($filePath); + $newStoragePath = StorageService::storeFile($splFile); + + Log::info("Migration: migrated {$tableName}.{$column} for ID {$recordId}: {$rawPath} -> {$newStoragePath->value}"); + + return $newStoragePath->value; + } catch (\Throwable $e) { + Log::error("Migration: failed to migrate file for {$tableName}.{$column} (ID: {$recordId}): " + . $e->getMessage(), [ + 'exception' => $e, + 'path' => $filePath, + ]); + + return null; + } + } + + private function resolveLocalFilePath(string $cleanPath): ?string + { + $subPath = substr($cleanPath, strlen('storage/')); + + $candidates = [ + storage_path('app/public/' . $subPath), + public_path($cleanPath), + storage_path('app/private/' . $subPath), + storage_path('app/' . $subPath), + base_path($cleanPath), + ]; + + foreach ($candidates as $candidate) { + if (is_file($candidate) && is_readable($candidate)) { + return $candidate; + } + } + + return null; + } +}; diff --git a/database/seeders/data/dynamic_pages.json b/database/seeders/data/dynamic_pages.json new file mode 100644 index 00000000..b69a33c8 --- /dev/null +++ b/database/seeders/data/dynamic_pages.json @@ -0,0 +1,62 @@ +[ + { + "id_key": "charte-de-confidentialite", + "title": { + "fr": "Charte de confidentialité" + }, + "slug": { + "fr": "charte-de-confidentialite" + }, + "content": { + "fr": { + "wysiwyg_contenu": "

INTRODUCTION

OVOTEAM est particulièrement attentif à la protection de vos données personnelles. Concernant les données personnelles que vous nous confiez nous vous informons de manière transparente sur notre politique en matière de protection des données personnelles.

OVOTEAM s’engage à traiter vos données à caractère personnel conformément aux dispositions du Règlement Général sur la Protection des Données 2016/679 du Parlement européen et du Conseil du 27 avril 2016 (RGPD) et la loi n°78-17 du 6 janvier 1978 modifiée relative à l’informatique, aux fichiers et aux libertés (loi « Informatique et Libertés »), qui définissent les conditions dans lesquelles des traitements de données à caractère personnel peuvent être mis en œuvre.

Toute information recueillie au travers du site internet et permettant de vous identifier, de manière directe ou indirecte, est considérée comme une donnée à caractère personnel et sera traitée conformément à cette politique.

Nous vous invitons à consulter régulièrement cette rubrique car OVOTEAM peut être amenée à la modifier à tout moment.

La présente Charte de confidentialité a été mise à jour le 30 novembre 2023.


RESPONSABLE DE TRAITEMENT ET DÉLÉGUÉ A LA PROTECTION DES DONNÉES

Le responsable de traitement des données collectées et traitées sur notre site internet est OVOTEAM et 13 Route de la Hautière ZI du Grand Plessis (ci-après désigné le « Responsable de Traitement »).

Le Responsable de Traitement a désigné un délégué à la protection des données ou « DPO » que vous pouvez contacter à l’adresse suivante : dpo@ldc.fr.


DONNÉES PERSONNELLES

Au sens du Règlement RGPD, une donnée à caractère personnel désigne toute information relative à une personne physique identifiée ou identifiable.


Les données personnelles collectées varient en fonction du but de la collecte et du service dont vous souhaitez bénéficier.

Vous vous engagez à fournir des données personnelles actualisées et valides et garantissez ne faire aucune fausse déclaration et ne donner aucune information erronée.



FINALITÉS DE TRAITEMENT, BASES JURIDIQUES ET DURÉES DE CONSERVATION

Finalité du traitement : Gérer les candidatures au travers de l’espace dédié sur le site

Base juridique : Consentement

Durée de conservation : 2 ans à compter du dernier contact avec le candidat


Finalité du traitement : Gérer les demandes qui nous parviennent au travers du formulaire de contact

Base juridique : Intérêt légitime (Répondre aux demandes de contacts)

Durée de conservation : Pour les clients : 3 ans à compter de la fin de la relation commerciale / Pour les prospects : 3 ans à compter de la collecte des données personnelles ou à compter du dernier contact émanant du prospect


Finalité du traitement : Gestion des cookies

Base juridique : Consentement


Durée de conservation : 13 mois



VOS DROITS

Conformément aux dispositions du RGPD, vous pouvez exercer vos droits suivants :

  • Un droit d’accès : le droit d’obtenir la confirmation que vos données personnelles font ou ne font pas l’objet d’un traitement, et d’en obtenir la communication

  • Un droit de rectification : le droit d’obtenir la rectification de données personnelles inexactes ou de pouvoir compléter des données incomplètes

  • Un droit d’effacement : le droit d’obtenir la suppression de vos données personnelles quand cela est possible

  • Un droit d’opposition : le droit de s’opposer à tout moment au traitement de vos données personnelles, quand celui-ci est fondé sur notre intérêt légitime

  • Un droit au retrait de votre consentement : lorsque le traitement de vos données est fondé sur votre consentement. Vous pouvez exercer ce droit à tout moment sans avoir à en justifier la raison

  • Un droit à la limitation : le droit de demander le gel des données du traitement pour une période donnée

  • Un droit à la portabilité : le droit de recevoir les données personnelles que vous avez fournies dans un format structuré, couramment lisible par machine, et de les communiquer à un tiers

  • Un droit à réclamation : le droit d’adresser à la CNIL une réclamation si vous estimez que vos droits ne sont pas respectés


Vous pouvez exercer ces droits à tout moment en nous contactant via le formulaire suivant :


https://rgpd.ldc.fr/fr/professionnels/
https://rgpd.ldc.fr/fr/consommateurs/
https://rgpd.ldc.fr/fr/salaries/

Droit de porter réclamation auprès de la CNIL

Si vous estimez, après nous avoir contactés, que vos droits « Informatique et Libertés » ne sont pas respectés, vous pouvez adresser une réclamation à la CNIL : https://www.cnil.fr/fr/plaintes.

PROTECTION DE VOS DONNÉES PERSONNELLES

Afin d’assurer la sécurité de vos données personnelles nous avons mis en place des mesures de sécurité, notamment des contrôles d’accès, des pare-feux, des serveurs sécurisés.

Ces mesures visent à protéger vos données personnelles contre toute perte, détournement, mauvaise utilisation, divulgation, modification, interférence, dommage, accès non autorisé des données.

ACCÈS A VOS DONNÉES PERSONNELLES

Vos données personnelles sont destinées au personnel du Responsable de Traitement habilité à les traiter, notamment le service marketing, développement durable, informatique, commercial, qualité et administratif.

PARTAGE DE VOS DONNÉES PERSONNELLES

Conformément à la réglementation, quand nous sommes amenés à partager vos données personnelles avec des sous-traitants pour certaines finalités décrites dans la présente Charte, nous nous assurons que leur dispositif en matière de sécurité des données et de leur stockage est au moins aussi important que celui de notre organisation. Nous veillons également à ce qu’ils respectent les lois relatives à la protection des données personnelles dans des conditions au moins équivalentes à celles que nous respectons.

Par ailleurs, les sous-traitants étant amenés à traiter de vos données personnelles pour notre compte et sur nos instructions, nous nous engageons à ce que vos données personnelles ne soient pas partagées ou divulguées pour des finalités autres que celles décrites dans la présente Charte. Nous pouvons cependant être amenés à transmettre vos données, pour des finalités autres que celles prévues dans la Charte, dans les cas où leur communication est requise par la loi et les autorités gouvernementales.

TRANSFERT DE VOS DONNÉES EN DEHORS DE L’ESPACE ÉCONOMIQUE EUROPÉEN

En principe, nous veillons à conserver vos données personnelles dans l’Union européenne. Il est toutefois possible que vos données soient ponctuellement transférées à des sous-traitants ou partenaires commerciaux situés dans d’autres pays sous réserve qu’ils offrent un niveau de protection adéquat reconnu par la Commission européenne. En cas de transfert de vos données vers un pays dont le niveau de protection n’a pas été reconnu comme adéquat, nous mettons en place des Clauses contractuelles types approuvées par la Commission européenne qui permettent de garantir un niveau de protection suffisant de la vie privée et des droits fondamentaux des personnes.

SITES INTERNET DE TIERS

Le site internet du Responsable de Traitement peut être associé à des sites internet tiers. Les sites hébergés par des tiers sont hors de notre contrôle. Lorsque vous renseignez des données personnelles sur un site internet tiers, le traitement de ces données n'est pas effectué sur notre site internet, mais sur le site internet tiers concerné. Toute donnée personnelle que vous fournissez sera collectée et traitée conformément à la politique relative à la confidentialité des données du tiers concerné.

Par conséquent, nous n'assumons aucune responsabilité concernant les pratiques exercées par lesdits tiers en matière de protection des données.

DROIT APPLICABLE

La présente Charte de confidentialité est régie et sera interprétée conformément au droit français.

", + "string_seo_title": "Notre charte de confidentialité", + "string_description": "Notre charte de confidentialité relative à notre site Internet.", + "string_seo_description": "Retrouvez la charte de confidentialité relative au site Internet Ovoteam." + } + }, + "config_view": "front/Pages/LegalPage", + "status": 2, + "isLocked": true, + "isRoot": false + }, + { + "id_key": "mentions-legales", + "title": { + "fr": "Mentions légales et CGU" + }, + "slug": { + "fr": "mentions-legales-et-cgu" + }, + "content": { + "fr": { + "wysiwyg_contenu": "

INTRODUCTION

Nous vous remercions de lire ces conditions générales d'utilisation qui régissent les conditions d'accès et d'utilisation du site www.ovoteam.net.

Nous vous invitons à consulter régulièrement cette rubrique car la société OVOTEAM peut être amenée à la modifier à tout moment.

Tout utilisateur déclare avoir lu et accepté les mentions légales et les conditions générales d'utilisation et s'engage à s'y conformer.

Mise à jour le 30 novembre 2023.

Mentions légales

OVOTEAM, Société par actions simplifiée au capital de 9 092 000 euros - 13 Route de la Hautière ZI du Grand Plessis - RCS 484 918 362 Saint-Brieuc

contact@ovoteam.net / 02 96 32 07 70

Numéro de TVA intracommunautaire : FR 23 484 918 362

Directeur de la publication : MOUSSET Bruno Marie Jacques / Directeur Général Pôle Amont LDC

Conception du site et réalisation : LDC Service

Le site est hébergé via LDC par : OVH, SAS, inscrite sous le numéro RCS 424 761 419 (Lille) dont le siège social est situé au 2 rue Kellerman, 59100 Roubaix, tel : 09 72 10 10 07.

Crédits photo : Agence With Barry (Jérôme Ganiovecchiolino), Agence Hotcakes, Julien MOTA

Droit d'auteur - Droit des marques - Protection des bases de données

La présentation et le contenu du site constituent, ensemble, une œuvre protégée par les lois en vigueur des droits d'auteur, de la propriété intellectuelle et industrielle.

Les créations apparaissant sur le site (dessins, photographies, images, textes, séquences animées sonores ou non et autres documentations représentées), sont objets de droits d'auteur, de propriété industrielle et/ou intellectuelle et sont, selon les cas, propriété de la société OVOTEAM ou de tiers ayant autorisé la société OVOTEAM à les utiliser.

Aucune exploitation commerciale, reproduction, représentation, utilisation, adaptation, modification, incorporation, traduction, commercialisation, partielle ou intégrale de ces éléments (y compris ceux téléchargeables ou copiables) ne pourra en être faite sans l'accord préalable et écrit de la société OVOTEAM, à l'exception de l'utilisation pour un usage privé sous réserve des dispositions différentes voire plus restrictives du Code de la propriété intellectuelle.

Toute utilisation non expressément autorisée peut engager la responsabilité civile et/ou pénale de son auteur. OVOTEAM se réserve le droit d'engager des poursuites judiciaires à l'encontre de toute personne qui n'aurait pas respecté cette interdiction.

Vie privée - Données personnelles - Cookies

Nous vous invitons à vous reporter à notre Charte de confidentialité en cliquant ici.

Mentions Sanitaires

Pour votre santé :

  • Mangez au moins cinq fruits et légumes par jour

  • Pratiquez une activité physique régulière

  • Évitez de manger trop gras, trop sucré, trop salé

  • Évitez de grignoter entre les repas

Pour toute information complémentaire, consultez le site : www.mangerbouger.fr

Index de l'égalité professionnelle femmes hommes

Conformément aux dispositions des articles L.1142 8 et D.1142 2 du Code du travail, la société publie chaque année son Index de l'égalité professionnelle entre les femmes et les hommes.

Période de référence : 01/01/2025 au 31/12/2025

  • Indicateur écart de rémunérations : 37/40 points

  • Indicateur écart de taux d'augmentations individuelles : 20/20 points

  • Indicateur écart de taux de promotion : 15/15 points

  • Indicateur retour de congés maternité : 15/15 points

  • Indicateur hautes rémunérations : 10/10 points

Soit Note INDEX 2025 : 97/100 points

Responsabilité

OVOTEAM a déployé ses meilleurs efforts pour s'assurer de l'exactitude des informations présentes sur son site internet (ci-après le Site). Cependant, OVOTEAM n'est responsable ni de l'exactitude, ni des erreurs, ni des omissions contenues sur le Site. L'utilisateur est seul responsable de l'utilisation de telles informations.

OVOTEAM ne donne aucune garantie, explicite ou implicite, et n'assume aucune responsabilité qui pourrait résulter de l'accès ou de l'utilisation de ce Site incluant toutes détériorations ou virus qui pourraient infecter l'équipement informatique ou tout autre bien de l'utilisateur.

Par ailleurs, OVOTEAM pourra unilatéralement et à tout moment interrompre temporairement ou définitivement l'accès à tout ou partie du Site, y compris notamment le contenu, les fonctionnalités ou les heures de disponibilité, sans que sa responsabilité ne puisse être recherchée et sans que cela ne puisse donner lieu à l'allocation de dommages et intérêts de quelque nature que ce soit.

Les pages du Site peuvent contenir des liens hypertextes renvoyant vers d'autres sites internet gérés par des sociétés distinctes de OVOTEAM et sur lesquels OVOTEAM n'exerce aucune sorte de contrôle. OVOTEAM n'est pas responsable du contenu de tout autre site auquel vous pourriez avoir accès via le Site ou les autres sites internet du groupe LDC. Tout utilisateur ou visiteur du Site ne peut mettre en place un lien hypertexte en direction de ce Site sans l'autorisation expresse préalable de OVOTEAM.

", + "string_seo_title": "Nos mentions légales & CGU", + "string_description": "Nos informations légales et les conditions d'utilisation relatives à notre site Internet.", + "string_seo_description": "Retrouvez les informations légales et les conditions d'utilisation du site Internet Ovoteam." + } + }, + "config_view": "front/Pages/LegalPage", + "status": 2, + "isLocked": true, + "isRoot": false + }, + { + "id_key": "accueil", + "title": { + "fr": "Accueil" + }, + "slug": { + "fr": "" + }, + "content": { + "fr": { + "string_title": "Accueil" + } + }, + "config_view": "front/Pages/Home", + "status": 2, + "isLocked": true, + "isRoot": true + } +] diff --git a/database/seeders/data/page_configs.json b/database/seeders/data/page_configs.json new file mode 100644 index 00000000..50331bda --- /dev/null +++ b/database/seeders/data/page_configs.json @@ -0,0 +1,57 @@ +[ + { + "label": { + "fr": "Page home" + }, + "view": "front/Pages/Home", + "config": { + "fr": [ + { + "key": "string_title", + "type": 1, + "label": "Titre", + "order": 1, + "validation": "required|string|between:3,255" + } + ] + } + }, + { + "label": { + "fr": "Legals" + }, + "view": "front/Pages/LegalPage", + "config": { + "fr": [ + { + "key": "string_seo_title", + "type": 1, + "label": "SEO Title", + "order": 1, + "validation": "required|string|between:3,255" + }, + { + "key": "string_seo_description", + "type": 1, + "label": "SEO Description", + "order": 2, + "validation": "required|string|between:3,255" + }, + { + "key": "string_description", + "type": 1, + "label": "Description", + "order": 3, + "validation": "required|string|between:3,255" + }, + { + "key": "wysiwyg_contenu", + "type": 3, + "label": "Contenu", + "order": 4, + "validation": "required|string|between:15,8000" + } + ] + } + } +] diff --git a/lang/fr/validation.php b/lang/fr/validation.php index eb1db91e..29585d83 100644 --- a/lang/fr/validation.php +++ b/lang/fr/validation.php @@ -158,6 +158,7 @@ return [ 'uppercase' => 'Le champ :attribute doit être en majuscules.', 'url' => 'Le format de l\'URL de :attribute n\'est pas valide.', 'uuid' => 'Le champ :attribute doit être un UUID valide.', + 'file_exists' => 'Le fichier du champ :attribute n\'existe pas.', 'attributes' => [ 'address' => 'adresse', 'affiliate_url' => 'URL d\'affiliation', @@ -243,17 +244,17 @@ return [ 'name' => 'nom', 'national_code' => 'code national', 'number' => 'numéro', - 'nutritional_values' => 'valeurs nutritionnelles', - 'nutritional_refWeightG' => 'poids de référence (g)', - 'nutritional_kj' => 'kJ', - 'nutritional_kcal' => 'kcal', - 'nutritional_fatG' => 'graisses (g)', - 'nutritional_satFatG' => 'acides gras saturés (g)', 'nutritional_carbG' => 'glucides (g)', - 'nutritional_sugarG' => 'sucres (g)', + 'nutritional_fatG' => 'graisses (g)', 'nutritional_fiberG' => 'fibres (g)', + 'nutritional_kcal' => 'kcal', + 'nutritional_kj' => 'kJ', 'nutritional_proteinG' => 'protéines (g)', + 'nutritional_refWeightG' => 'poids de référence (g)', 'nutritional_saltG' => 'sel (g)', + 'nutritional_satFatG' => 'acides gras saturés (g)', + 'nutritional_sugarG' => 'sucres (g)', + 'nutritional_values' => 'valeurs nutritionnelles', 'nutritional_values_unit' => 'unité des valeurs nutritionnelles', 'password' => 'mot de passe', 'password_confirmation' => 'confirmation du mot de passe', diff --git a/phpstan.neon b/phpstan.neon index 5e617820..5ea63989 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -13,7 +13,7 @@ parameters: ignoreErrors: - - message: '#has PHPDoc tag @method for method where.*Locales\(\) parameter \#2 \$[a-zA-Z0-9_]+ with no value type specified in iterable type array#' + message: '#has PHPDoc tag @method for method (where.*Locales|whereTranslationLike)\(\) parameter \#[0-9]+ \$[a-zA-Z0-9_]+ with no value type specified in iterable type array#' paths: - app/Models/* - diff --git a/public/assets/img/expertise/dates/2027.png b/public/assets/img/expertise/dates/2027.png new file mode 100644 index 00000000..bc11d8f8 Binary files /dev/null and b/public/assets/img/expertise/dates/2027.png differ diff --git a/public/assets/img/france/certifications/bbc.png b/public/assets/img/france/certifications/bbc.png index 32aae52e..a5b5ef4a 100644 Binary files a/public/assets/img/france/certifications/bbc.png and b/public/assets/img/france/certifications/bbc.png differ diff --git a/public/assets/img/france/certifications/cee2.png b/public/assets/img/france/certifications/cee2.png new file mode 100644 index 00000000..09b49de4 Binary files /dev/null and b/public/assets/img/france/certifications/cee2.png differ diff --git a/public/assets/img/france/certifications/label_rouge.png b/public/assets/img/france/certifications/label_rouge.png new file mode 100644 index 00000000..c00accf4 Binary files /dev/null and b/public/assets/img/france/certifications/label_rouge.png differ diff --git a/resources/assets/images/labels/1.Poules_Sol.png b/resources/assets/images/labels/1.Poules_Sol.png deleted file mode 100644 index b52d872d..00000000 Binary files a/resources/assets/images/labels/1.Poules_Sol.png and /dev/null differ diff --git a/resources/assets/images/labels/2.Poules_Plein_Air.png b/resources/assets/images/labels/2.Poules_Plein_Air.png deleted file mode 100644 index e214cd17..00000000 Binary files a/resources/assets/images/labels/2.Poules_Plein_Air.png and /dev/null differ diff --git a/resources/assets/images/labels/3.Logo_Bio.jpg b/resources/assets/images/labels/3.Logo_Bio.jpg deleted file mode 100644 index 095b6a40..00000000 Binary files a/resources/assets/images/labels/3.Logo_Bio.jpg and /dev/null differ diff --git a/resources/assets/images/labels/4.Logo_Gamme_CEE2.png b/resources/assets/images/labels/4.Logo_Gamme_CEE2.png deleted file mode 100644 index 0fe5ff09..00000000 Binary files a/resources/assets/images/labels/4.Logo_Gamme_CEE2.png and /dev/null differ diff --git a/resources/assets/images/labels/5.Logo_Bleu_Blanc_Coeur.png b/resources/assets/images/labels/5.Logo_Bleu_Blanc_Coeur.png deleted file mode 100644 index 62c729bf..00000000 Binary files a/resources/assets/images/labels/5.Logo_Bleu_Blanc_Coeur.png and /dev/null differ diff --git a/resources/assets/images/labels/6.Logo_Label_Rouge.png b/resources/assets/images/labels/6.Logo_Label_Rouge.png deleted file mode 100644 index 1bdde16d..00000000 Binary files a/resources/assets/images/labels/6.Logo_Label_Rouge.png and /dev/null differ diff --git a/resources/assets/images/labels/7.Logo_C_est_qui_le_patron.png b/resources/assets/images/labels/7.Logo_C_est_qui_le_patron.png deleted file mode 100644 index 07c5c97a..00000000 Binary files a/resources/assets/images/labels/7.Logo_C_est_qui_le_patron.png and /dev/null differ diff --git a/resources/assets/images/labels/8.Logo_Agri-éthique.png b/resources/assets/images/labels/8.Logo_Agri-éthique.png deleted file mode 100644 index ab91e8ca..00000000 Binary files a/resources/assets/images/labels/8.Logo_Agri-éthique.png and /dev/null differ diff --git a/resources/assets/images/labels/poules_plein_air.png b/resources/assets/images/labels/poules_plein_air.png new file mode 100644 index 00000000..c2d54381 Binary files /dev/null and b/resources/assets/images/labels/poules_plein_air.png differ diff --git a/resources/assets/images/labels/poules_sol.png b/resources/assets/images/labels/poules_sol.png new file mode 100644 index 00000000..55c1735f Binary files /dev/null and b/resources/assets/images/labels/poules_sol.png differ diff --git a/resources/ts/front/Components/Base/BreadCrumbsBase.tsx b/resources/ts/front/Components/Base/BreadCrumbsBase.tsx index 57538180..9a41a719 100644 --- a/resources/ts/front/Components/Base/BreadCrumbsBase.tsx +++ b/resources/ts/front/Components/Base/BreadCrumbsBase.tsx @@ -25,21 +25,23 @@ export default function BreadcrumbsBase({ {breadcrumbs.map((breadcrumb, breadcrumbIndex) => (
    {breadcrumbIndex >= 1 && } - + {breadcrumbIndex !== breadcrumbs.length - 1 && breadcrumb.url ? ( {breadcrumb.title} ) : ( - breadcrumb.title + + {breadcrumb.title} + )}
diff --git a/resources/ts/front/Components/Theme/Image.tsx b/resources/ts/front/Components/Theme/Image.tsx index b9794fa7..9df91c2f 100644 --- a/resources/ts/front/Components/Theme/Image.tsx +++ b/resources/ts/front/Components/Theme/Image.tsx @@ -23,8 +23,7 @@ export default function Image({ }: Readonly) { const customShape = shape === imageShapes.SQUARE ? "rounded-none" : "rounded-full"; - const objectFit = - shape === imageShapes.SQUARE ? "object-contain" : "object-fit"; + const objectFit = "object-cover"; const lazyload = image.lazyload ? "lazy" : "eager"; return (
{title?.text && ( -

+

{title.text}

)} {subtitle?.text && (
-

+

{title.text}

-

{description.text}

+

+ {description.text} +

); } diff --git a/resources/ts/front/Pages/Commitment.tsx b/resources/ts/front/Pages/Commitment.tsx index e2550b8b..211560c0 100644 --- a/resources/ts/front/Pages/Commitment.tsx +++ b/resources/ts/front/Pages/Commitment.tsx @@ -17,8 +17,8 @@ export default function Commitment() { return (
@@ -230,7 +246,7 @@ export default function Expertise() { variant={bgColors.PRIMARY} carousel={{ centeredSlides: isMobile, - wrapperClass: isMobile ? "pb-20" : "pb-0", + wrapperClass: "pb-20", breakpoints: { 0: { slidesPerView: 1.3, @@ -321,7 +337,7 @@ export default function Expertise() { variant={bgColors.BACKGROUND} carousel={{ centeredSlides: isMobile, - wrapperClass: isMobile ? "pb-20" : "pb-0", + wrapperClass: "pb-20", breakpoints: { 0: { slidesPerView: 1.3, @@ -403,7 +419,7 @@ export default function Expertise() { variant={bgColors.BACKGROUND} carousel={{ centeredSlides: isMobile, - wrapperClass: isMobile ? "pb-20" : "pb-0", + wrapperClass: "pb-20", breakpoints: { 0: { slidesPerView: 1.3, @@ -431,7 +447,7 @@ export default function Expertise() { weight: "font-bold", }, description: { - text: "Pour répondre à un marché de l'aide pâtissière en hausse (+3,5% en 2024), le Blanc d'œuf liquide 500mL Ovoteam est idéal pour vos pâtisseries (meringues, macarons, mousses au chocolat, pavlovas etc…).", + text: "Pour répondre à un marché de l'aide pâtissière en hausse (+3,5% en 2024), nos références de Blanc d'œuf et d'œuf Entier liquide 500mL Ovoteam sont idéales pour vos pâtisseries (meringues, macarons, mousses au chocolat, pavlovas etc…).", }, image: { alt: "Visuel d'une recette de mousse au chocolat réalisée grâce au Blanc d'œuf liquide 500mL Ovoteam pensé pour l'aide pâtissière.", diff --git a/resources/ts/front/Pages/Gamme.tsx b/resources/ts/front/Pages/Gamme.tsx index 4ad252bb..792693db 100644 --- a/resources/ts/front/Pages/Gamme.tsx +++ b/resources/ts/front/Pages/Gamme.tsx @@ -20,8 +20,8 @@ export default function Expertise() { return (
Plein Air & Bio.", + text: "Large choix de produits issus exclusivement d'élevages alternatifs : Sol, Plein Air & Bio.", }} description={{ - text: "Dans la démarche de diminuer l'élevage conventionnel, toutes nos gammes sont disponibles en élevage alternatif ; ainsi qu'une large offre éligible EGALIM.", + text: "Dans le cadre de notre engagement en faveur de la réduction de l'élevage conventionnel, l'ensemble de nos gammes, au 1er janvier 2027, sont exclusivement disponibles en élevage alternatif. Ainsi qu'une large offre de produits éligibles à la loi EGALIM.", }} image={{ alt: "Poules pondeuses élevées en Plein Air dans un champ verdoyant sous un ciel bleu.", @@ -108,6 +108,21 @@ export default function Expertise() { solutions en élevage alternatif sur la totalité de nos gammes.

+
+ +

+ Au 1er janvier 2027, nous nous engageons à proposer uniquement + des solutions en élevage alternatif à marque Ovoteam. +

+

- Au 1er janvier 2027, nous nous engageons à proposer uniquement - des solutions en élevage alternatif à marque Ovoteam. + En 2030, nous nous engageons à atteindre 90% de nos volumes + vendus en œufs issus d'élevages alternatifs.

-

- En 2030, nous nous engageons à atteindre 90% de nos volumes vendus - en œufs issus d'élevages alternatifs. -

diff --git a/resources/ts/front/Pages/Home.tsx b/resources/ts/front/Pages/Home.tsx index 63680bf6..6b68e713 100644 --- a/resources/ts/front/Pages/Home.tsx +++ b/resources/ts/front/Pages/Home.tsx @@ -17,7 +17,7 @@ export default function Home() { {/* Left Column: Info */} -
-

+
+

{product.name}

diff --git a/resources/ts/front/Pages/Recipes/Show.tsx b/resources/ts/front/Pages/Recipes/Show.tsx index 6101ec7e..d07cd9fb 100644 --- a/resources/ts/front/Pages/Recipes/Show.tsx +++ b/resources/ts/front/Pages/Recipes/Show.tsx @@ -187,8 +187,8 @@ export default function Show({
{/* Left Column: Info */} -
-

+
+

{recipe.name}

diff --git a/routes/web-front.php b/routes/web-front.php index 0a79c802..ca608bbf 100644 --- a/routes/web-front.php +++ b/routes/web-front.php @@ -4,6 +4,7 @@ declare(strict_types=1); use App\Http\Controllers\Front\ProductController; use App\Http\Controllers\Front\RecipeController; +use App\Http\Controllers\MediaController; use Illuminate\Support\Facades\Route; use Inertia\Inertia; @@ -15,11 +16,11 @@ Route::get('/nos-engagements/fabrique-en-france', function () { return Inertia::render('front/Pages/MadeInFrance'); })->name('made-in-france'); -Route::get('/nos-engagements/expertise-depuis-1963', function () { +Route::get('/nos-engagements/exhausteur-de-papilles', function () { return Inertia::render('front/Pages/Expertise'); })->name('expertise'); -Route::get('/nos-engagements/large-gamme-plein-air', function () { +Route::get('/nos-engagements/large-gamme-100-alternative', function () { return Inertia::render('front/Pages/Gamme'); })->name('gamme'); @@ -41,6 +42,8 @@ Route::name('recipes.')->prefix('recettes')->group(function () { Route::get('/{recipe}', [RecipeController::class, 'show'])->name('show'); }); +Route::get('/media/{path}', MediaController::class)->where('path', '.*'); + if (! app()->isProduction()) { Route::get('/demo', function () { return Inertia::render('front/Pages/Demo');