mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-10 05:02:36 +01:00
Fixes for tests
This commit is contained in:
David Bomba
parent
0d5a5c5722
commit
3591f9ad28
@ -107,8 +107,11 @@ class Helpers
|
||||
* @param Client $client
|
||||
* @return null|string
|
||||
*/
|
||||
public static function processReservedKeywords(string $value, Client $client): ?string
|
||||
public static function processReservedKeywords(?string $value, Client $client): ?string
|
||||
{
|
||||
if(!$value)
|
||||
return '';
|
||||
|
||||
Carbon::setLocale($client->locale());
|
||||
|
||||
$replacements = [
|
||||
|
||||
115
composer.lock
generated
115
composer.lock
generated
@ -323,16 +323,16 @@
|
||||
},
|
||||
{
|
||||
"name": "aws/aws-sdk-php",
|
||||
"version": "3.194.1",
|
||||
"version": "3.194.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/aws/aws-sdk-php.git",
|
||||
"reference": "67bdee05acef9e8ad60098090996690b49babd09"
|
||||
"reference": "1f0a0cec5721b6346c968533fba9b44e462fc728"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/67bdee05acef9e8ad60098090996690b49babd09",
|
||||
"reference": "67bdee05acef9e8ad60098090996690b49babd09",
|
||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1f0a0cec5721b6346c968533fba9b44e462fc728",
|
||||
"reference": "1f0a0cec5721b6346c968533fba9b44e462fc728",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -408,9 +408,9 @@
|
||||
"support": {
|
||||
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
|
||||
"issues": "https://github.com/aws/aws-sdk-php/issues",
|
||||
"source": "https://github.com/aws/aws-sdk-php/tree/3.194.1"
|
||||
"source": "https://github.com/aws/aws-sdk-php/tree/3.194.2"
|
||||
},
|
||||
"time": "2021-09-17T18:15:42+00:00"
|
||||
"time": "2021-09-21T18:14:06+00:00"
|
||||
},
|
||||
{
|
||||
"name": "bacon/bacon-qr-code",
|
||||
@ -2652,16 +2652,16 @@
|
||||
},
|
||||
{
|
||||
"name": "google/apiclient",
|
||||
"version": "v2.10.1",
|
||||
"version": "v2.11.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/googleapis/google-api-php-client.git",
|
||||
"reference": "11871e94006ce7a419bb6124d51b6f9ace3f679b"
|
||||
"reference": "7db9eb40c8ba887e81c0fe84f2888a967396cdfb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/11871e94006ce7a419bb6124d51b6f9ace3f679b",
|
||||
"reference": "11871e94006ce7a419bb6124d51b6f9ace3f679b",
|
||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/7db9eb40c8ba887e81c0fe84f2888a967396cdfb",
|
||||
"reference": "7db9eb40c8ba887e81c0fe84f2888a967396cdfb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2669,8 +2669,8 @@
|
||||
"google/apiclient-services": "~0.200",
|
||||
"google/auth": "^1.10",
|
||||
"guzzlehttp/guzzle": "~5.3.3||~6.0||~7.0",
|
||||
"guzzlehttp/psr7": "^1.2",
|
||||
"monolog/monolog": "^1.17|^2.0",
|
||||
"guzzlehttp/psr7": "^1.7||^2.0.0",
|
||||
"monolog/monolog": "^1.17||^2.0",
|
||||
"php": "^5.6|^7.0|^8.0",
|
||||
"phpseclib/phpseclib": "~2.0||^3.0.2"
|
||||
},
|
||||
@ -2679,10 +2679,12 @@
|
||||
"composer/composer": "^1.10.22",
|
||||
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
|
||||
"phpcompatibility/php-compatibility": "^9.2",
|
||||
"phpunit/phpunit": "^5.7||^8.5.13",
|
||||
"phpspec/prophecy-phpunit": "^1.1||^2.0",
|
||||
"phpunit/phpunit": "^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
|
||||
"squizlabs/php_codesniffer": "~2.3",
|
||||
"symfony/css-selector": "~2.1",
|
||||
"symfony/dom-crawler": "~2.1"
|
||||
"symfony/dom-crawler": "~2.1",
|
||||
"yoast/phpunit-polyfills": "^1.0"
|
||||
},
|
||||
"suggest": {
|
||||
"cache/filesystem-adapter": "For caching certs and tokens (using Google\\Client::setCache)"
|
||||
@ -2715,22 +2717,22 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/googleapis/google-api-php-client/issues",
|
||||
"source": "https://github.com/googleapis/google-api-php-client/tree/v2.10.1"
|
||||
"source": "https://github.com/googleapis/google-api-php-client/tree/v2.11.0"
|
||||
},
|
||||
"time": "2021-06-25T14:25:44+00:00"
|
||||
"time": "2021-09-20T21:15:55+00:00"
|
||||
},
|
||||
{
|
||||
"name": "google/apiclient-services",
|
||||
"version": "v0.212.0",
|
||||
"version": "v0.213.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/googleapis/google-api-php-client-services.git",
|
||||
"reference": "2c4bd512502ad9cdfec8ea711ea1592c79d345e5"
|
||||
"reference": "260311821505438eb9208b068da0d849b8ea9baa"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/2c4bd512502ad9cdfec8ea711ea1592c79d345e5",
|
||||
"reference": "2c4bd512502ad9cdfec8ea711ea1592c79d345e5",
|
||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/260311821505438eb9208b068da0d849b8ea9baa",
|
||||
"reference": "260311821505438eb9208b068da0d849b8ea9baa",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2759,9 +2761,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
|
||||
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.212.0"
|
||||
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.213.0"
|
||||
},
|
||||
"time": "2021-09-12T11:18:27+00:00"
|
||||
"time": "2021-09-19T11:18:26+00:00"
|
||||
},
|
||||
{
|
||||
"name": "google/auth",
|
||||
@ -5586,20 +5588,20 @@
|
||||
},
|
||||
{
|
||||
"name": "nette/utils",
|
||||
"version": "v3.2.3",
|
||||
"version": "v3.2.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nette/utils.git",
|
||||
"reference": "5c36cc1ba9bb6abb8a9e425cf054e0c3fd5b9822"
|
||||
"reference": "9cd80396ca58d7969ab44fc7afcf03624dfa526e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nette/utils/zipball/5c36cc1ba9bb6abb8a9e425cf054e0c3fd5b9822",
|
||||
"reference": "5c36cc1ba9bb6abb8a9e425cf054e0c3fd5b9822",
|
||||
"url": "https://api.github.com/repos/nette/utils/zipball/9cd80396ca58d7969ab44fc7afcf03624dfa526e",
|
||||
"reference": "9cd80396ca58d7969ab44fc7afcf03624dfa526e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.2 <8.1"
|
||||
"php": ">=7.2 <8.2"
|
||||
},
|
||||
"conflict": {
|
||||
"nette/di": "<3.0.6"
|
||||
@ -5665,22 +5667,22 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/nette/utils/issues",
|
||||
"source": "https://github.com/nette/utils/tree/v3.2.3"
|
||||
"source": "https://github.com/nette/utils/tree/v3.2.5"
|
||||
},
|
||||
"time": "2021-08-16T21:05:00+00:00"
|
||||
"time": "2021-09-20T10:50:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nikic/php-parser",
|
||||
"version": "v4.12.0",
|
||||
"version": "v4.13.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nikic/PHP-Parser.git",
|
||||
"reference": "6608f01670c3cc5079e18c1dab1104e002579143"
|
||||
"reference": "50953a2691a922aa1769461637869a0a2faa3f53"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
|
||||
"reference": "6608f01670c3cc5079e18c1dab1104e002579143",
|
||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53",
|
||||
"reference": "50953a2691a922aa1769461637869a0a2faa3f53",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -5721,9 +5723,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/nikic/PHP-Parser/issues",
|
||||
"source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
|
||||
"source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0"
|
||||
},
|
||||
"time": "2021-07-21T10:44:31+00:00"
|
||||
"time": "2021-09-20T12:20:58+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nwidart/laravel-modules",
|
||||
@ -12740,16 +12742,16 @@
|
||||
},
|
||||
{
|
||||
"name": "filp/whoops",
|
||||
"version": "2.14.1",
|
||||
"version": "2.14.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/filp/whoops.git",
|
||||
"reference": "15ead64e9828f0fc90932114429c4f7923570cb1"
|
||||
"reference": "89584ce67dd32307f1063cc43846674f4679feda"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/filp/whoops/zipball/15ead64e9828f0fc90932114429c4f7923570cb1",
|
||||
"reference": "15ead64e9828f0fc90932114429c4f7923570cb1",
|
||||
"url": "https://api.github.com/repos/filp/whoops/zipball/89584ce67dd32307f1063cc43846674f4679feda",
|
||||
"reference": "89584ce67dd32307f1063cc43846674f4679feda",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -12799,7 +12801,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/filp/whoops/issues",
|
||||
"source": "https://github.com/filp/whoops/tree/2.14.1"
|
||||
"source": "https://github.com/filp/whoops/tree/2.14.3"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -12807,7 +12809,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2021-08-29T12:00:00+00:00"
|
||||
"time": "2021-09-19T12:00:00+00:00"
|
||||
},
|
||||
{
|
||||
"name": "friendsofphp/php-cs-fixer",
|
||||
@ -13290,33 +13292,32 @@
|
||||
},
|
||||
{
|
||||
"name": "nunomaduro/collision",
|
||||
"version": "v5.9.0",
|
||||
"version": "v5.10.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nunomaduro/collision.git",
|
||||
"reference": "63456f5c3e8c4bc52bd573e5c85674d64d84fd43"
|
||||
"reference": "3004cfa49c022183395eabc6d0e5207dfe498d00"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/63456f5c3e8c4bc52bd573e5c85674d64d84fd43",
|
||||
"reference": "63456f5c3e8c4bc52bd573e5c85674d64d84fd43",
|
||||
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/3004cfa49c022183395eabc6d0e5207dfe498d00",
|
||||
"reference": "3004cfa49c022183395eabc6d0e5207dfe498d00",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"facade/ignition-contracts": "^1.0",
|
||||
"filp/whoops": "^2.7.2",
|
||||
"filp/whoops": "^2.14.3",
|
||||
"php": "^7.3 || ^8.0",
|
||||
"symfony/console": "^5.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"brianium/paratest": "^6.1",
|
||||
"fideloper/proxy": "^4.4.1",
|
||||
"friendsofphp/php-cs-fixer": "^3.0",
|
||||
"fruitcake/laravel-cors": "^2.0.3",
|
||||
"laravel/framework": "^8.0 || ^9.0",
|
||||
"laravel/framework": "8.x-dev",
|
||||
"nunomaduro/larastan": "^0.6.2",
|
||||
"nunomaduro/mock-final-classes": "^1.0",
|
||||
"orchestra/testbench": "^6.0 || ^7.0",
|
||||
"orchestra/testbench": "^6.0",
|
||||
"phpstan/phpstan": "^0.12.64",
|
||||
"phpunit/phpunit": "^9.5.0"
|
||||
},
|
||||
@ -13374,7 +13375,7 @@
|
||||
"type": "patreon"
|
||||
}
|
||||
],
|
||||
"time": "2021-08-26T15:32:09+00:00"
|
||||
"time": "2021-09-20T15:06:32+00:00"
|
||||
},
|
||||
{
|
||||
"name": "openlss/lib-array2xml",
|
||||
@ -15274,16 +15275,16 @@
|
||||
},
|
||||
{
|
||||
"name": "swagger-api/swagger-ui",
|
||||
"version": "v3.52.2",
|
||||
"version": "v3.52.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/swagger-api/swagger-ui.git",
|
||||
"reference": "e5611d72ff6b4affb373fa8859cc5feb6981f367"
|
||||
"reference": "aa9f2e6733327b5f042f2529db76558d9c09bed2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/e5611d72ff6b4affb373fa8859cc5feb6981f367",
|
||||
"reference": "e5611d72ff6b4affb373fa8859cc5feb6981f367",
|
||||
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/aa9f2e6733327b5f042f2529db76558d9c09bed2",
|
||||
"reference": "aa9f2e6733327b5f042f2529db76558d9c09bed2",
|
||||
"shasum": ""
|
||||
},
|
||||
"type": "library",
|
||||
@ -15329,9 +15330,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/swagger-api/swagger-ui/issues",
|
||||
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.52.2"
|
||||
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.52.3"
|
||||
},
|
||||
"time": "2021-09-13T12:46:28+00:00"
|
||||
"time": "2021-09-20T12:12:56+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/debug",
|
||||
@ -15901,5 +15902,5 @@
|
||||
"platform-dev": {
|
||||
"php": "^7.3|^7.4|^8.0"
|
||||
},
|
||||
"plugin-api-version": "2.1.0"
|
||||
"plugin-api-version": "2.0.0"
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user