From 6bb8b1f40ee2d643a44b352cf57df58aa73dc3a4 Mon Sep 17 00:00:00 2001 From: Brian Faust Date: Mon, 4 Oct 2021 05:20:33 +0300 Subject: [PATCH 1/2] wip --- .github/workflows/deps.yml | 2 +- composer.json | 46 +++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml index d5f6605ae..49241f1fe 100644 --- a/.github/workflows/deps.yml +++ b/.github/workflows/deps.yml @@ -15,7 +15,7 @@ jobs: token: ${{ secrets.GH_TOKEN }} - name: Update dependencies - run: npx @faustbrian/node-composer-check-updates --caret + run: npx @faustbrian/node-composer-check-updates --caret-minor - name: Install dependencies run: composer install --ignore-platform-reqs diff --git a/composer.json b/composer.json index 899e7fdba..349bf81af 100644 --- a/composer.json +++ b/composer.json @@ -19,20 +19,20 @@ ], "require": { "php": "^8.0", - "calebporzio/sushi": "^2.1", - "danharrin/livewire-rate-limiting": "^0.3.0", - "ergebnis/phpstan-rules": "^0.15.3", - "fakerphp/faker": "^1.15", - "friendsofphp/php-cs-fixer": "^3.0", + "calebporzio/sushi": "^2.3", + "danharrin/livewire-rate-limiting": "^0.3", + "ergebnis/phpstan-rules": "^0.15", + "fakerphp/faker": "^1.16", + "friendsofphp/php-cs-fixer": "^3.1", "google/recaptcha": "^1.2", "graham-campbell/analyzer": "^3.0", "guzzlehttp/guzzle": "^7.3", - "illuminate/bus": "^8.0", - "illuminate/contracts": "^8.0", - "illuminate/http": "^8.0", - "illuminate/mail": "^8.0", - "illuminate/support": "^8.0", - "illuminate/view": "^8.0", + "illuminate/bus": "^8.62", + "illuminate/contracts": "^8.62", + "illuminate/http": "^8.62", + "illuminate/mail": "^8.62", + "illuminate/support": "^8.62", + "illuminate/view": "^8.62", "jasonmccreary/laravel-test-assertions": "^2.0", "jenssegers/agent": "^2.6", "johnkary/phpunit-speedtrap": "^4.0", @@ -40,33 +40,33 @@ "league/commonmark": "^2.0", "livewire/livewire": "^2.6", "mockery/mockery": "^1.4", - "nunomaduro/collision": "^5.5", + "nunomaduro/collision": "^5.10", "nunomaduro/larastan": "^0.7", "nunomaduro/laravel-mojito": "^0.2", - "orchestra/testbench": "^6.9", - "pestphp/pest": "^1.11", + "orchestra/testbench": "^6.21", + "pestphp/pest": "^1.20", "pestphp/pest-plugin-faker": "^1.0", "pestphp/pest-plugin-laravel": "^1.1", "pestphp/pest-plugin-livewire": "^1.0", - "pestphp/pest-plugin-parallel": "^0.3.1", + "pestphp/pest-plugin-parallel": "^0.3", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^0.12.6", - "phpstan/phpstan-strict-rules": "^0.12.10", + "phpstan/phpstan-deprecation-rules": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", "phpunit/phpunit": "^9.5", - "pragmarx/google2fa-laravel": "^1.3", - "rector/rector": "^0.11.38", + "pragmarx/google2fa-laravel": "^2.0", + "rector/rector": "^0.11", "ruafozy/mersenne-twister": "^1.3", - "spatie/laravel-flash": "^1.7", + "spatie/laravel-flash": "^1.8", "spatie/laravel-honeypot": "^4.0", "spatie/laravel-medialibrary": "^9.7", "spatie/laravel-newsletter": "^4.10", "spatie/laravel-package-tools": "^1.9", "spatie/laravel-personal-data-export": "^3.0", - "spatie/laravel-schemaless-attributes": "^1.8", + "spatie/laravel-schemaless-attributes": "^2.0", "spatie/pest-plugin-snapshots": "^1.1", "spatie/regex": "^2.0", "spatie/yaml-front-matter": "^2.0", - "teamtnt/laravel-scout-tntsearch-driver": "^11.0", + "teamtnt/laravel-scout-tntsearch-driver": "^11.5", "unicorn-fail/emoji": "1.0.x-dev" }, "autoload": { @@ -107,4 +107,4 @@ "config": { "sort-packages": true } -} +} \ No newline at end of file From a22d90df36f95f35811843a6debe2aa9e34b721f Mon Sep 17 00:00:00 2001 From: Brian Faust Date: Mon, 4 Oct 2021 05:22:17 +0300 Subject: [PATCH 2/2] wip --- composer.lock | 167 +++++++++++++++++++++++++++----------------------- 1 file changed, 90 insertions(+), 77 deletions(-) diff --git a/composer.lock b/composer.lock index d4aada77a..863cd031d 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": "e9c89e91cc6f14e11c2bb08d42fdeaf5", + "content-hash": "e258e42d6cb5fecd3dcc0a66b7292c17", "packages": [ { "name": "amphp/amp", @@ -1976,21 +1976,21 @@ }, { "name": "filp/whoops", - "version": "2.14.3", + "version": "2.14.4", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "89584ce67dd32307f1063cc43846674f4679feda" + "reference": "f056f1fe935d9ed86e698905a957334029899895" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/89584ce67dd32307f1063cc43846674f4679feda", - "reference": "89584ce67dd32307f1063cc43846674f4679feda", + "url": "https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895", + "reference": "f056f1fe935d9ed86e698905a957334029899895", "shasum": "" }, "require": { "php": "^5.5.9 || ^7.0 || ^8.0", - "psr/log": "^1.0.1" + "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "require-dev": { "mockery/mockery": "^0.9 || ^1.0", @@ -2035,7 +2035,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.14.3" + "source": "https://github.com/filp/whoops/tree/2.14.4" }, "funding": [ { @@ -2043,7 +2043,7 @@ "type": "github" } ], - "time": "2021-09-19T12:00:00+00:00" + "time": "2021-10-03T12:00:00+00:00" }, { "name": "friendsofphp/php-cs-fixer", @@ -4169,16 +4169,16 @@ }, { "name": "monolog/monolog", - "version": "2.3.4", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "437e7a1c50044b92773b361af77620efb76fff59" + "reference": "fd4380d6fc37626e2f799f29d91195040137eba9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437e7a1c50044b92773b361af77620efb76fff59", - "reference": "437e7a1c50044b92773b361af77620efb76fff59", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9", + "reference": "fd4380d6fc37626e2f799f29d91195040137eba9", "shasum": "" }, "require": { @@ -4194,7 +4194,7 @@ "elasticsearch/elasticsearch": "^7", "graylog2/gelf-php": "^1.4.2", "mongodb/mongodb": "^1.8", - "php-amqplib/php-amqplib": "~2.4", + "php-amqplib/php-amqplib": "~2.4 || ^3", "php-console/php-console": "^3.1.3", "phpspec/prophecy": "^1.6.1", "phpstan/phpstan": "^0.12.91", @@ -4252,7 +4252,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.3.4" + "source": "https://github.com/Seldaek/monolog/tree/2.3.5" }, "funding": [ { @@ -4264,7 +4264,7 @@ "type": "tidelift" } ], - "time": "2021-09-15T11:27:21+00:00" + "time": "2021-10-01T21:08:31+00:00" }, { "name": "myclabs/deep-copy", @@ -6089,16 +6089,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f" + "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30f38bffc6f24293dadd1823936372dfa9e86e2f", - "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae", + "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae", "shasum": "" }, "require": { @@ -6133,9 +6133,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1" }, - "time": "2021-09-17T15:28:14+00:00" + "time": "2021-10-02T14:08:47+00:00" }, { "name": "phpoption/phpoption", @@ -7011,24 +7011,25 @@ }, { "name": "pragmarx/google2fa-laravel", - "version": "v1.4.1", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/antonioribeiro/google2fa-laravel.git", - "reference": "f9014fd7ea36a1f7fffa233109cf59b209469647" + "reference": "ae2d11600df3db11a0c6bdd33ce8ce3c68cf5987" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/f9014fd7ea36a1f7fffa233109cf59b209469647", - "reference": "f9014fd7ea36a1f7fffa233109cf59b209469647", + "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/ae2d11600df3db11a0c6bdd33ce8ce3c68cf5987", + "reference": "ae2d11600df3db11a0c6bdd33ce8ce3c68cf5987", "shasum": "" }, "require": { "laravel/framework": ">=5.4.36|^8.0", "php": ">=7.0", - "pragmarx/google2fa-qrcode": "^1.0" + "pragmarx/google2fa-qrcode": "^1.0|^2.0|^3.0" }, "require-dev": { + "bacon/bacon-qr-code": "^2.0", "orchestra/testbench": "3.4.*|3.5.*|3.6.*|3.7.*|4.*|5.*|6.*", "phpunit/phpunit": "~5|~6|~7|~8" }, @@ -7062,7 +7063,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { @@ -7080,32 +7081,37 @@ ], "support": { "issues": "https://github.com/antonioribeiro/google2fa-laravel/issues", - "source": "https://github.com/antonioribeiro/google2fa-laravel/tree/v1.4.1" + "source": "https://github.com/antonioribeiro/google2fa-laravel/tree/v2.0.1" }, - "time": "2020-09-20T21:01:48+00:00" + "time": "2021-08-17T18:45:39+00:00" }, { "name": "pragmarx/google2fa-qrcode", - "version": "v1.0.3", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/antonioribeiro/google2fa-qrcode.git", - "reference": "fd5ff0531a48b193a659309cc5fb882c14dbd03f" + "reference": "ce4d8a729b6c93741c607cfb2217acfffb5bf76b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/fd5ff0531a48b193a659309cc5fb882c14dbd03f", - "reference": "fd5ff0531a48b193a659309cc5fb882c14dbd03f", + "url": "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/ce4d8a729b6c93741c607cfb2217acfffb5bf76b", + "reference": "ce4d8a729b6c93741c607cfb2217acfffb5bf76b", "shasum": "" }, "require": { - "bacon/bacon-qr-code": "~1.0|~2.0", - "php": ">=5.4", + "php": ">=7.1", "pragmarx/google2fa": ">=4.0" }, "require-dev": { + "bacon/bacon-qr-code": "^2.0", + "chillerlan/php-qrcode": "^1.0|^2.0|^3.0|^4.0", "khanamiryan/qrcode-detector-decoder": "^1.0", - "phpunit/phpunit": "~4|~5|~6|~7" + "phpunit/phpunit": "~4|~5|~6|~7|~8|~9" + }, + "suggest": { + "bacon/bacon-qr-code": "For QR Code generation, requires imagick", + "chillerlan/php-qrcode": "For QR Code generation" }, "type": "library", "extra": { @@ -7142,9 +7148,9 @@ ], "support": { "issues": "https://github.com/antonioribeiro/google2fa-qrcode/issues", - "source": "https://github.com/antonioribeiro/google2fa-qrcode/tree/master" + "source": "https://github.com/antonioribeiro/google2fa-qrcode/tree/v3.0.0" }, - "time": "2019-03-20T16:42:58+00:00" + "time": "2021-08-15T12:53:48+00:00" }, { "name": "psr/cache", @@ -9323,16 +9329,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "9.7.4", + "version": "9.7.5", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "41fa9dd7578c41194d2661d678304c558824c365" + "reference": "56cdcac0cbdbfaae227bf53f5d2a4ac6cbd1811a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/41fa9dd7578c41194d2661d678304c558824c365", - "reference": "41fa9dd7578c41194d2661d678304c558824c365", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/56cdcac0cbdbfaae227bf53f5d2a4ac6cbd1811a", + "reference": "56cdcac0cbdbfaae227bf53f5d2a4ac6cbd1811a", "shasum": "" }, "require": { @@ -9412,7 +9418,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/9.7.4" + "source": "https://github.com/spatie/laravel-medialibrary/tree/9.7.5" }, "funding": [ { @@ -9424,7 +9430,7 @@ "type": "github" } ], - "time": "2021-09-10T07:31:02+00:00" + "time": "2021-10-02T22:40:50+00:00" }, { "name": "spatie/laravel-newsletter", @@ -9634,16 +9640,16 @@ }, { "name": "spatie/laravel-ray", - "version": "1.26.0", + "version": "1.26.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ray.git", - "reference": "09e8629d8d97526d34d237409862ac8ab02cbd85" + "reference": "5ecc2ebbdad8ae3ec31274596d922495cff69184" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/09e8629d8d97526d34d237409862ac8ab02cbd85", - "reference": "09e8629d8d97526d34d237409862ac8ab02cbd85", + "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/5ecc2ebbdad8ae3ec31274596d922495cff69184", + "reference": "5ecc2ebbdad8ae3ec31274596d922495cff69184", "shasum": "" }, "require": { @@ -9700,7 +9706,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-ray/issues", - "source": "https://github.com/spatie/laravel-ray/tree/1.26.0" + "source": "https://github.com/spatie/laravel-ray/tree/1.26.1" }, "funding": [ { @@ -9712,30 +9718,35 @@ "type": "other" } ], - "time": "2021-09-27T09:59:08+00:00" + "time": "2021-10-01T13:08:05+00:00" }, { "name": "spatie/laravel-schemaless-attributes", - "version": "1.8.3", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-schemaless-attributes.git", - "reference": "e3037a509683fe7fc0a2681b6f404b90aeffdaf0" + "reference": "a2b3ebace5e6f75fa0f0c102370f25323071c38b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-schemaless-attributes/zipball/e3037a509683fe7fc0a2681b6f404b90aeffdaf0", - "reference": "e3037a509683fe7fc0a2681b6f404b90aeffdaf0", + "url": "https://api.github.com/repos/spatie/laravel-schemaless-attributes/zipball/a2b3ebace5e6f75fa0f0c102370f25323071c38b", + "reference": "a2b3ebace5e6f75fa0f0c102370f25323071c38b", "shasum": "" }, "require": { - "illuminate/database": "^5.6|^6.0|^7.0|^8.0", - "illuminate/support": "^5.6|^6.0|^7.0|^8.0", - "php": "^7.3|^8.0" + "illuminate/contracts": "^7.0|^8.0", + "illuminate/database": "^7.0|^8.0", + "illuminate/support": "^7.0|^8.0", + "php": "^8.0", + "spatie/laravel-package-tools": "^1.4.3" }, "require-dev": { - "orchestra/testbench": "^3.6|^4.0|^5.0|^6.0", - "phpunit/phpunit": "^7.0|^8.0|^9.0" + "brianium/paratest": "^6.2", + "mockery/mockery": "^1.4", + "nunomaduro/collision": "^5.3", + "orchestra/testbench": "^6.15", + "phpunit/phpunit": "^9.5.4" }, "type": "library", "extra": { @@ -9770,15 +9781,19 @@ ], "support": { "issues": "https://github.com/spatie/laravel-schemaless-attributes/issues", - "source": "https://github.com/spatie/laravel-schemaless-attributes/tree/1.8.3" + "source": "https://github.com/spatie/laravel-schemaless-attributes/tree/2.0.0" }, "funding": [ { "url": "https://spatie.be/open-source/support-us", "type": "custom" + }, + { + "url": "https://github.com/spatie", + "type": "github" } ], - "time": "2020-11-04T13:21:43+00:00" + "time": "2021-04-09T20:44:12+00:00" }, { "name": "spatie/macroable", @@ -13617,31 +13632,31 @@ }, { "name": "vlucas/phpdotenv", - "version": "v5.3.0", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "b3eac5c7ac896e52deab4a99068e3f4ab12d9e56" + "reference": "accaddf133651d4b5cf81a119f25296736ffc850" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/b3eac5c7ac896e52deab4a99068e3f4ab12d9e56", - "reference": "b3eac5c7ac896e52deab4a99068e3f4ab12d9e56", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/accaddf133651d4b5cf81a119f25296736ffc850", + "reference": "accaddf133651d4b5cf81a119f25296736ffc850", "shasum": "" }, "require": { "ext-pcre": "*", - "graham-campbell/result-type": "^1.0.1", + "graham-campbell/result-type": "^1.0.2", "php": "^7.1.3 || ^8.0", - "phpoption/phpoption": "^1.7.4", - "symfony/polyfill-ctype": "^1.17", - "symfony/polyfill-mbstring": "^1.17", - "symfony/polyfill-php80": "^1.17" + "phpoption/phpoption": "^1.8", + "symfony/polyfill-ctype": "^1.23", + "symfony/polyfill-mbstring": "^1.23.1", + "symfony/polyfill-php80": "^1.23.1" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "phpunit/phpunit": "^7.5.20 || ^8.5.14 || ^9.5.1" + "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10" }, "suggest": { "ext-filter": "Required to use the boolean validator." @@ -13664,13 +13679,11 @@ "authors": [ { "name": "Graham Campbell", - "email": "graham@alt-three.com", - "homepage": "https://gjcampbell.co.uk/" + "email": "hello@gjcampbell.co.uk" }, { "name": "Vance Lucas", - "email": "vance@vancelucas.com", - "homepage": "https://vancelucas.com/" + "email": "vance@vancelucas.com" } ], "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", @@ -13681,7 +13694,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.3.0" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.3.1" }, "funding": [ { @@ -13693,7 +13706,7 @@ "type": "tidelift" } ], - "time": "2021-01-20T15:23:13+00:00" + "time": "2021-10-02T19:24:42+00:00" }, { "name": "voku/portable-ascii",