0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-21 03:30:38 +00:00

Removed parallel testing, updated predis

Parallel testing paratest library caused issues due to a single version
not being compatibile across our php range. Removed for now as not
really worth the faff to get compatible.
This commit is contained in:
Dan Brown 2023-02-07 11:50:59 +00:00
parent 5e8ec56196
commit bc18dc7da6
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
2 changed files with 29 additions and 26 deletions

View file

@ -32,7 +32,7 @@
"onelogin/php-saml": "^4.0", "onelogin/php-saml": "^4.0",
"phpseclib/phpseclib": "^3.0", "phpseclib/phpseclib": "^3.0",
"pragmarx/google2fa": "^8.0", "pragmarx/google2fa": "^8.0",
"predis/predis": "^1.1", "predis/predis": "^2.1",
"socialiteproviders/discord": "^4.1", "socialiteproviders/discord": "^4.1",
"socialiteproviders/gitlab": "^4.1", "socialiteproviders/gitlab": "^4.1",
"socialiteproviders/microsoft-azure": "^5.1", "socialiteproviders/microsoft-azure": "^5.1",
@ -71,7 +71,6 @@
"format": "phpcbf", "format": "phpcbf",
"lint": "phpcs", "lint": "phpcs",
"test": "phpunit", "test": "phpunit",
"t": "@php artisan test --parallel",
"t-reset": "@php artisan test --recreate-databases", "t-reset": "@php artisan test --recreate-databases",
"post-autoload-dump": [ "post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",

52
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "7049e76ef5eed4fe73d86bb4ecb0db6a", "content-hash": "64276cbeb1f79f4c94992cc739807d72",
"packages": [ "packages": [
{ {
"name": "aws/aws-crt-php", "name": "aws/aws-crt-php",
@ -4009,29 +4009,33 @@
}, },
{ {
"name": "predis/predis", "name": "predis/predis",
"version": "v1.1.10", "version": "v2.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/predis/predis.git", "url": "https://github.com/predis/predis.git",
"reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e" "reference": "c5b60884e89630f9518a7919f0566db438f0fc9a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/predis/predis/zipball/a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e", "url": "https://api.github.com/repos/predis/predis/zipball/c5b60884e89630f9518a7919f0566db438f0fc9a",
"reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e", "reference": "c5b60884e89630f9518a7919f0566db438f0fc9a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.9" "php": "^7.2 || ^8.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.8" "phpunit/phpunit": "^8.0 || ~9.4.4"
}, },
"suggest": { "suggest": {
"ext-curl": "Allows access to Webdis when paired with phpiredis", "ext-curl": "Allows access to Webdis when paired with phpiredis"
"ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol"
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-main": "2.0-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Predis\\": "src/" "Predis\\": "src/"
@ -4042,19 +4046,19 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Daniele Alessandri",
"email": "suppakilla@gmail.com",
"homepage": "http://clorophilla.net",
"role": "Creator & Maintainer"
},
{ {
"name": "Till Krüss", "name": "Till Krüss",
"homepage": "https://till.im", "homepage": "https://till.im",
"role": "Maintainer" "role": "Maintainer"
},
{
"name": "Daniele Alessandri",
"email": "suppakilla@gmail.com",
"homepage": "http://clorophilla.net",
"role": "Creator"
} }
], ],
"description": "Flexible and feature-complete Redis client for PHP and HHVM", "description": "A flexible and feature-complete Redis client for PHP.",
"homepage": "http://github.com/predis/predis", "homepage": "http://github.com/predis/predis",
"keywords": [ "keywords": [
"nosql", "nosql",
@ -4063,7 +4067,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/predis/predis/issues", "issues": "https://github.com/predis/predis/issues",
"source": "https://github.com/predis/predis/tree/v1.1.10" "source": "https://github.com/predis/predis/tree/v2.1.1"
}, },
"funding": [ "funding": [
{ {
@ -4071,7 +4075,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-01-05T17:46:08+00:00" "time": "2023-01-17T20:57:35+00:00"
}, },
{ {
"name": "psr/cache", "name": "psr/cache",
@ -8647,16 +8651,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.9.14", "version": "1.9.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "e5fcc96289cf737304286a9b505fbed091f02e58" "reference": "922e2689bb180575d0f57de0443c431a5a698e8f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5fcc96289cf737304286a9b505fbed091f02e58", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/922e2689bb180575d0f57de0443c431a5a698e8f",
"reference": "e5fcc96289cf737304286a9b505fbed091f02e58", "reference": "922e2689bb180575d0f57de0443c431a5a698e8f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8686,7 +8690,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.9.14" "source": "https://github.com/phpstan/phpstan/tree/1.9.16"
}, },
"funding": [ "funding": [
{ {
@ -8702,7 +8706,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-19T10:47:09+00:00" "time": "2023-02-07T10:42:21+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",