From 761fbcbbebf19f7e62c3dd0c42c31c5de869d8a7 Mon Sep 17 00:00:00 2001 From: Zach Garwood Date: Fri, 15 Nov 2024 15:06:22 -0600 Subject: [PATCH] Run composer require area17/twill:^3.0 [WEB-2956] --- composer.json | 2 +- composer.lock | 119 ++++++++++++++++++-------------------------------- 2 files changed, 43 insertions(+), 78 deletions(-) diff --git a/composer.json b/composer.json index 375896ba3..083ae9d72 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "require": { "php": "^8.1", "aic/data-hub-foundation": "^2.0", - "area17/twill": "2.13.*", + "area17/twill": "^3.0", "chillerlan/php-qrcode": "^5.0", "eluceo/ical": "2.0", "erusev/parsedown": "^1.7", diff --git a/composer.lock b/composer.lock index ba56c05c1..b4276b050 100644 --- a/composer.lock +++ b/composer.lock @@ -88,46 +88,54 @@ }, { "name": "area17/twill", - "version": "2.13.0", + "version": "3.4.1", "source": { "type": "git", "url": "https://github.com/area17/twill.git", - "reference": "dfa0ba5466658123e46280eb00ff41eadf6695d3" + "reference": "53f59c3623fca6f590baa3e0a260dd1edfdc187a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/area17/twill/zipball/dfa0ba5466658123e46280eb00ff41eadf6695d3", - "reference": "dfa0ba5466658123e46280eb00ff41eadf6695d3", + "url": "https://api.github.com/repos/area17/twill/zipball/53f59c3623fca6f590baa3e0a260dd1edfdc187a", + "reference": "53f59c3623fca6f590baa3e0a260dd1edfdc187a", "shasum": "" }, "require": { - "astrotomic/laravel-translatable": "^11.5", - "cartalyst/tags": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0", - "doctrine/dbal": "^2.12|^3.0", + "astrotomic/laravel-translatable": "^v11.12", + "cartalyst/tags": "^12.0 || ^13.0 || ^14.0", + "doctrine/dbal": "^3.0 || ^4.0", "ext-json": "*", "ext-pdo": "*", - "guzzlehttp/guzzle": "^6.2|^7.0", + "guzzlehttp/guzzle": "^7.0", "imgix/imgix-php": "^3.0", - "laravel/framework": "~5.6|~5.7|~5.8|^6.0|^7.0|^8.0|^9.0|^10.0", - "laravel/socialite": "^4.2|^5.0", - "laravel/ui": "^1.0|^2.0|^3.0|^4.0", - "league/flysystem-aws-s3-v3": "^1.0|^2.0|^3.0", - "league/glide-laravel": "^1.0", - "matthewbdaly/laravel-azure-storage": "^1.3|^2.0", + "kalnoy/nestedset": "^6.0", + "laravel/framework": "^9.0 || ^10.0 || ^11.0", + "laravel/socialite": "^5.3", + "laravel/ui": "^4.0", + "league/flysystem-aws-s3-v3": "^3.0", + "league/glide-symfony": "^1.0 || ^2.0", + "matthewbdaly/laravel-azure-storage": "^2.0", "myclabs/php-enum": "^1.5", - "php": "^7.1|^8.0", - "pragmarx/google2fa-qrcode": "^1.0|^2.0", - "spatie/laravel-activitylog": "^2.5|^3.2|^4.0", - "spatie/laravel-analytics": "^3.6|^4.0", - "spatie/once": "^2.0|^3.0" + "php": "^8.0", + "pragmarx/google2fa-qrcode": "^2.0", + "spatie/laravel-activitylog": "^4.0", + "spatie/laravel-analytics": "^4.0 || ^5.0", + "spatie/once": "^3.0" }, "require-dev": { - "chillerlan/php-qrcode": "~2.0|~3.0|~4.0", - "friendsofphp/php-cs-fixer": "^2.16|^3.0", - "kalnoy/nestedset": "^5.0|^6.0", - "nunomaduro/collision": "^3.0|^4.2|^5.0|^6.0", - "orchestra/testbench": "~3.3|~3.4|~3.5|~3.6|~3.7|~3.8|^4.0|^5.0|^6.0|^7.0|^8.0", - "phpunit/phpunit": "~5.0|~6.0|~7.0|~8.0|~9.0" + "area17/phptorch": "dev-main", + "chillerlan/php-qrcode": "~4.0", + "friendsofphp/php-cs-fixer": "^3.0", + "nette/php-generator": "^4.0.3", + "nunomaduro/collision": "^6.0 || ^7.0 || ^8.0", + "nunomaduro/larastan": "^2.0", + "orchestra/testbench": "^7.8 || ^8.0 || ^9.0", + "orchestra/testbench-dusk": "^7.8 || ^8.0 || ^9.0", + "phpunit/php-invoker": "^3.1 || ^4.0", + "phpunit/phpunit": "~9.0 || ~10.0", + "rector/rector": "^0.19.2 || ^1.0 ", + "spatie/invade": "^1.1", + "squizlabs/php_codesniffer": "*" }, "type": "library", "extra": { @@ -139,7 +147,10 @@ "TwillCapsules": "A17\\Twill\\Facades\\TwillCapsules", "TwillRoutes": "A17\\Twill\\Facades\\TwillRoutes", "TwillBlocks": "A17\\Twill\\Facades\\TwillBlocks", - "TwillUtil": "A17\\Twill\\Facades\\TwillUtil" + "TwillUtil": "A17\\Twill\\Facades\\TwillUtil", + "TwillAppSettings": "A17\\Twill\\Facades\\TwillAppSettings", + "TwillNavigation": "A17\\Twill\\Facades\\TwillNavigation", + "TwillPermissions": "A17\\Twill\\Facades\\TwillPermissions" } } }, @@ -160,7 +171,7 @@ } ], "description": "Twill is an open source CMS toolkit for Laravel that helps developers rapidly create a custom admin console that is intuitive, powerful and flexible.", - "homepage": "https://twill.io", + "homepage": "https://twillcms.com", "keywords": [ "A17", "cms", @@ -168,12 +179,12 @@ "twill" ], "support": { - "chat": "https://discord.link/twill", - "docs": "https://twill.io/docs", + "chat": "https://discord.gg/cnWk7EFv8R", + "docs": "https://twillcms.com/docs/", "issues": "https://github.com/area17/twill/issues/", - "source": "https://github.com/area17/twill/tree/2.13.0" + "source": "https://github.com/area17/twill/tree/3.4.1" }, - "time": "2023-04-12T22:39:07+00:00" + "time": "2024-10-21T20:52:06+00:00" }, { "name": "astrotomic/laravel-translatable", @@ -4231,52 +4242,6 @@ }, "time": "2023-07-08T06:26:07+00:00" }, - { - "name": "league/glide-laravel", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/glide-laravel.git", - "reference": "b525e33e32940f3b047d6ca357131aba0e973e72" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/glide-laravel/zipball/b525e33e32940f3b047d6ca357131aba0e973e72", - "reference": "b525e33e32940f3b047d6ca357131aba0e973e72", - "shasum": "" - }, - "require": { - "league/glide-symfony": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9", - "phpunit/phpunit": "^4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "League\\Glide\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jonathan Reinink", - "email": "jonathan@reinink.ca", - "homepage": "http://reinink.ca" - } - ], - "description": "Glide adapter for Laravel", - "homepage": "http://glide.thephpleague.com", - "support": { - "issues": "https://github.com/thephpleague/glide-laravel/issues", - "source": "https://github.com/thephpleague/glide-laravel/tree/master" - }, - "time": "2015-12-26T15:40:35+00:00" - }, { "name": "league/glide-symfony", "version": "1.1.0",