diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index d1b458bdb..922aa5067 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -17,7 +17,7 @@ jobs: mysql -uroot -proot -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';" mysql -uroot -proot -e 'FLUSH PRIVILEGES;' - name: Install composer dependencies & Test - run: composer install --prefer-dist --no-interaction + run: composer install --prefer-dist --no-interaction --ansi - name: Migrate and seed the database run: | php${{ matrix.php }} artisan migrate --force -n --database=mysql_testing diff --git a/composer.json b/composer.json index d9d115017..68e6efda9 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "socialiteproviders/microsoft-azure": "^3.0", "socialiteproviders/okta": "^1.0", "socialiteproviders/slack": "^3.0", - "socialiteproviders/twitch": "^3.0" + "socialiteproviders/twitch": "^5.0" }, "require-dev": { "facade/ignition": "^1.4", diff --git a/composer.lock b/composer.lock index 5c3cb66b1..b2e298e85 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "322b6b585d85e066f97711fe8f1f7ccd", + "content-hash": "822da5f0292bf0d88faa51281434145c", "packages": [ { "name": "aws/aws-sdk-php", @@ -2761,21 +2761,21 @@ }, { "name": "socialiteproviders/twitch", - "version": "v3.0.0", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/SocialiteProviders/Twitch.git", - "reference": "a7ad148c0b42d0c607d8a034b6e47faf5fc85e93" + "reference": "8c19b26ff24c40cc019413042a5492c5ed21a658" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SocialiteProviders/Twitch/zipball/a7ad148c0b42d0c607d8a034b6e47faf5fc85e93", - "reference": "a7ad148c0b42d0c607d8a034b6e47faf5fc85e93", + "url": "https://api.github.com/repos/SocialiteProviders/Twitch/zipball/8c19b26ff24c40cc019413042a5492c5ed21a658", + "reference": "8c19b26ff24c40cc019413042a5492c5ed21a658", "shasum": "" }, "require": { "php": "^5.6 || ^7.0", - "socialiteproviders/manager": "~3.0" + "socialiteproviders/manager": "~2.0 || ~3.0" }, "type": "library", "autoload": { @@ -2794,7 +2794,7 @@ } ], "description": "Twitch OAuth2 Provider for Laravel Socialite", - "time": "2017-01-25T09:48:29+00:00" + "time": "2018-06-20T10:59:51+00:00" }, { "name": "swiftmailer/swiftmailer",