diff --git a/composer.json b/composer.json index cadd272b05..5c2606fb8d 100644 --- a/composer.json +++ b/composer.json @@ -34,13 +34,12 @@ "eduardokum/laravel-mail-auto-embed": "^2.0", "enshrined/svg-sanitize": "^0.15.0", "erusev/parsedown": "^1.7", - "spatie/laravel-ignition": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "intervention/image": "^2.5", "javiereguiluz/easyslugger": "^1.0", - "laravel/framework": "^10.0", "laravel-notification-channels/google-chat": "^3.0", "laravel-notification-channels/microsoft-teams": "^1.1", + "laravel/framework": "^10.0", "laravel/helpers": "^1.4", "laravel/passport": "^11.0", "laravel/slack-notification-channel": "^2.3", @@ -48,14 +47,13 @@ "laravel/tinker": "^2.6", "laravel/ui": "^4.0", "laravelcollective/html": "^6.2", - "lcobucci/clock": "^1.2.0|^2.0.0", - "lcobucci/jwt": "^3.4.5|^4.0.4", "league/csv": "^9.7", "league/flysystem-aws-s3-v3": "^3.0", "livewire/livewire": "^2.4", "neitanod/forceutf8": "^2.0", "nesbot/carbon": "^2.32", "nunomaduro/collision": "^6.1", + "okvpn/clock-lts": "^1.0", "onelogin/php-saml": "^3.4", "paragonie/constant_time_encoding": "^2.3", "paragonie/sodium_compat": "^1.19", @@ -64,6 +62,7 @@ "pragmarx/google2fa-laravel": "^1.3", "rollbar/rollbar-laravel": "^8.0", "spatie/laravel-backup": "^8.0", + "spatie/laravel-ignition": "^2.0", "tecnickcom/tc-lib-barcode": "^1.15", "tecnickcom/tcpdf": "^6.5", "unicodeveloper/laravel-password": "^1.0", diff --git a/composer.lock b/composer.lock index 03f5f51d50..9640a69e0a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7a56e1d3afaa4b796944dd1af5cc3686", + "content-hash": "09b576ccf0db4a09af74bc9f95593c20", "packages": [ { "name": "alek13/slack", @@ -3460,70 +3460,6 @@ "abandoned": "spatie/laravel-html", "time": "2023-04-25T02:46:11+00:00" }, - { - "name": "lcobucci/clock", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/lcobucci/clock.git", - "reference": "c7aadcd6fd97ed9e199114269c0be3f335e38876" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/lcobucci/clock/zipball/c7aadcd6fd97ed9e199114269c0be3f335e38876", - "reference": "c7aadcd6fd97ed9e199114269c0be3f335e38876", - "shasum": "" - }, - "require": { - "php": "~8.1.0 || ~8.2.0", - "stella-maris/clock": "^0.1.7" - }, - "provide": { - "psr/clock-implementation": "1.0" - }, - "require-dev": { - "infection/infection": "^0.26", - "lcobucci/coding-standard": "^9.0", - "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.9.4", - "phpstan/phpstan-deprecation-rules": "^1.1.1", - "phpstan/phpstan-phpunit": "^1.3.2", - "phpstan/phpstan-strict-rules": "^1.4.4", - "phpunit/phpunit": "^9.5.27" - }, - "type": "library", - "autoload": { - "psr-4": { - "Lcobucci\\Clock\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Luís Cobucci", - "email": "lcobucci@gmail.com" - } - ], - "description": "Yet another clock abstraction", - "support": { - "issues": "https://github.com/lcobucci/clock/issues", - "source": "https://github.com/lcobucci/clock/tree/2.3.0" - }, - "funding": [ - { - "url": "https://github.com/lcobucci", - "type": "github" - }, - { - "url": "https://www.patreon.com/lcobucci", - "type": "patreon" - } - ], - "time": "2022-12-19T14:38:11+00:00" - }, { "name": "lcobucci/jwt", "version": "4.3.0", @@ -5516,6 +5452,66 @@ ], "time": "2023-11-13T09:31:12+00:00" }, + { + "name": "okvpn/clock-lts", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/okvpn/clock-lts.git", + "reference": "5e7dc00d23a7d65e8ed2b0ff7a4dcf7860c05a14" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/okvpn/clock-lts/zipball/5e7dc00d23a7d65e8ed2b0ff7a4dcf7860c05a14", + "reference": "5e7dc00d23a7d65e8ed2b0ff7a4dcf7860c05a14", + "shasum": "" + }, + "require": { + "php": ">=7.2", + "psr/clock": "^1.0" + }, + "provide": { + "psr/clock-implementation": "1.0" + }, + "replace": { + "lcobucci/clock": "*" + }, + "require-dev": { + "infection/infection": "^0.27", + "lcobucci/coding-standard": "^11.0.0", + "phpstan/extension-installer": "^1.3.1", + "phpstan/phpstan": "^1.10.25", + "phpstan/phpstan-deprecation-rules": "^1.1.3", + "phpstan/phpstan-phpunit": "^1.3.13", + "phpstan/phpstan-strict-rules": "^1.5.1", + "phpunit/phpunit": "^10.2.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Lcobucci\\Clock\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Luís Cobucci", + "email": "lcobucci@gmail.com" + }, + { + "name": "Uładzimir Tsykun", + "email": "vtsykun@okvpn.org" + } + ], + "description": "Adding support for a wider range of PHP versions to lcobucci/clock", + "support": { + "source": "https://github.com/okvpn/clock-lts/tree/1.0.0" + }, + "time": "2023-09-26T11:13:49+00:00" + }, { "name": "onelogin/php-saml", "version": "3.6.1", @@ -8472,53 +8468,6 @@ ], "time": "2023-12-25T11:46:58+00:00" }, - { - "name": "stella-maris/clock", - "version": "0.1.7", - "source": { - "type": "git", - "url": "https://github.com/stella-maris-solutions/clock.git", - "reference": "fa23ce16019289a18bb3446fdecd45befcdd94f8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/stella-maris-solutions/clock/zipball/fa23ce16019289a18bb3446fdecd45befcdd94f8", - "reference": "fa23ce16019289a18bb3446fdecd45befcdd94f8", - "shasum": "" - }, - "require": { - "php": "^7.0|^8.0", - "psr/clock": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "StellaMaris\\Clock\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Heigl", - "role": "Maintainer" - } - ], - "description": "A pre-release of the proposed PSR-20 Clock-Interface", - "homepage": "https://gitlab.com/stella-maris/clock", - "keywords": [ - "clock", - "datetime", - "point in time", - "psr20" - ], - "support": { - "source": "https://github.com/stella-maris-solutions/clock/tree/0.1.7" - }, - "time": "2022-11-25T16:15:06+00:00" - }, { "name": "symfony/console", "version": "v6.4.4", @@ -16145,5 +16094,5 @@ "ext-pdo": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" }