Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 00:41:34 +02:00
Code Issues Releases Activity

Merge pull request #4385 from turbo124/v5-develop

Browse Source 
Fixes for lock
This commit is contained in:
David Bomba 2020-11-28 15:16:00 +11:00 committed by GitHub
commit 7d96a6d389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 117 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.0.27
5.0.30

2
app/PaymentDrivers/DriverTemplate.php
View File

@ -13,7 +13,7 @@ namespace App\PaymentDrivers;
use App\Utils\Traits\MakesHash;
class YourGatewayPaymentDriver extends BaseDriver
class DriverTemplate extends BaseDriver
{
use MakesHash;

225
composer.lock generated
View File

@ -116,16 +116,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.163.3",
"version": "3.164.0",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "f6cd8fe1334b19e1dc0d841fa1b2da7cd30a1e8a"
"reference": "39ecf57d828eb50ab23fd70255a68b8996392ac9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f6cd8fe1334b19e1dc0d841fa1b2da7cd30a1e8a",
"reference": "f6cd8fe1334b19e1dc0d841fa1b2da7cd30a1e8a",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/39ecf57d828eb50ab23fd70255a68b8996392ac9",
"reference": "39ecf57d828eb50ab23fd70255a68b8996392ac9",
"shasum": ""
},
"require": {
@ -200,9 +200,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.163.3"
"source": "https://github.com/aws/aws-sdk-php/tree/3.164.0"
},
"time": "2020-11-23T20:34:30+00:00"
"time": "2020-11-24T19:18:22+00:00"
},
{
"name": "brick/math",
@ -1477,26 +1477,29 @@
},
{
"name": "dragonmantank/cron-expression",
"version": "v3.0.2",
"version": "v3.1.0",
"source": {
"type": "git",
"url": "https://github.com/dragonmantank/cron-expression.git",
"reference": "48212cdc0a79051d50d7fc2f0645c5a321caf926"
"reference": "7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/48212cdc0a79051d50d7fc2f0645c5a321caf926",
"reference": "48212cdc0a79051d50d7fc2f0645c5a321caf926",
"url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c",
"reference": "7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c",
"shasum": ""
},
"require": {
"php": "^7.1|^8.0"
"php": "^7.2|^8.0",
"webmozart/assert": "^1.7.0"
},
"replace": {
"mtdowling/cron-expression": "^1.0"
},
"require-dev": {
"phpstan/phpstan": "^0.11|^0.12",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-webmozart-assert": "^0.12.7",
"phpunit/phpunit": "^7.0|^8.0|^9.0"
},
"type": "library",
@ -1523,7 +1526,7 @@
],
"support": {
"issues": "https://github.com/dragonmantank/cron-expression/issues",
"source": "https://github.com/dragonmantank/cron-expression/tree/v3.0.2"
"source": "https://github.com/dragonmantank/cron-expression/tree/v3.1.0"
},
"funding": [
{
@ -1531,7 +1534,7 @@
"type": "github"
}
],
"time": "2020-10-13T01:26:01+00:00"
"time": "2020-11-24T19:55:57+00:00"
},
{
"name": "egulias/email-validator",
@ -2668,16 +2671,16 @@
},
{
"name": "laravel/framework",
"version": "v8.15.0",
"version": "v8.16.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "22e4182fa0885dea3772106c3b6df705b7c7363e"
"reference": "f7dfc22e6c42e9ed4dda14c05814349af6943206"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/22e4182fa0885dea3772106c3b6df705b7c7363e",
"reference": "22e4182fa0885dea3772106c3b6df705b7c7363e",
"url": "https://api.github.com/repos/laravel/framework/zipball/f7dfc22e6c42e9ed4dda14c05814349af6943206",
"reference": "f7dfc22e6c42e9ed4dda14c05814349af6943206",
"shasum": ""
},
"require": {
@ -2750,7 +2753,7 @@
"illuminate/view": "self.version"
},
"require-dev": {
"aws/aws-sdk-php": "^3.0",
"aws/aws-sdk-php": "^3.155",
"doctrine/dbal": "^2.6|^3.0",
"filp/whoops": "^2.8",
"guzzlehttp/guzzle": "^6.5.5|^7.0.1",
@ -2763,7 +2766,7 @@
"symfony/cache": "^5.1"
},
"suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).",
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6|^3.0).",
"ext-ftp": "Required to use the Flysystem FTP driver.",
"ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
@ -2831,7 +2834,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2020-11-17T14:53:20+00:00"
"time": "2020-11-25T15:01:02+00:00"
},
{
"name": "laravel/slack-notification-channel",
@ -2896,16 +2899,16 @@
},
{
"name": "laravel/socialite",
"version": "v5.1.0",
"version": "v5.1.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/socialite.git",
"reference": "14082c665186348028e5bde17ab33b21b36dac79"
"reference": "dc786c41eb3615ca430da3b9aa5c9c0282f7e390"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/socialite/zipball/14082c665186348028e5bde17ab33b21b36dac79",
"reference": "14082c665186348028e5bde17ab33b21b36dac79",
"url": "https://api.github.com/repos/laravel/socialite/zipball/dc786c41eb3615ca430da3b9aa5c9c0282f7e390",
"reference": "dc786c41eb3615ca430da3b9aa5c9c0282f7e390",
"shasum": ""
},
"require": {
@ -2961,7 +2964,7 @@
"issues": "https://github.com/laravel/socialite/issues",
"source": "https://github.com/laravel/socialite"
},
"time": "2020-11-03T19:24:43+00:00"
"time": "2020-11-24T17:34:35+00:00"
},
{
"name": "laravel/tinker",
@ -4657,16 +4660,16 @@
},
{
"name": "php-http/discovery",
"version": "1.12.0",
"version": "1.13.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/discovery.git",
"reference": "4366bf1bc39b663aa87459bd725501d2f1988b6c"
"reference": "788f72d64c43dc361e7fcc7464c3d947c64984a7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/discovery/zipball/4366bf1bc39b663aa87459bd725501d2f1988b6c",
"reference": "4366bf1bc39b663aa87459bd725501d2f1988b6c",
"url": "https://api.github.com/repos/php-http/discovery/zipball/788f72d64c43dc361e7fcc7464c3d947c64984a7",
"reference": "788f72d64c43dc361e7fcc7464c3d947c64984a7",
"shasum": ""
},
"require": {
@ -4720,9 +4723,9 @@
],
"support": {
"issues": "https://github.com/php-http/discovery/issues",
"source": "https://github.com/php-http/discovery/tree/1.12.0"
"source": "https://github.com/php-http/discovery/tree/1.13.0"
},
"time": "2020-09-22T13:31:04+00:00"
"time": "2020-11-27T14:49:42+00:00"
},
{
"name": "php-http/guzzle7-adapter",
@ -6587,25 +6590,25 @@
},
{
"name": "spatie/image",
"version": "1.9.0",
"version": "1.10.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/image.git",
"reference": "cef42a2d131e28d6f3e0af91c0570f6ba45a8d40"
"reference": "65d615c1f604e479764f25525291d696041dfcea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/image/zipball/cef42a2d131e28d6f3e0af91c0570f6ba45a8d40",
"reference": "cef42a2d131e28d6f3e0af91c0570f6ba45a8d40",
"url": "https://api.github.com/repos/spatie/image/zipball/65d615c1f604e479764f25525291d696041dfcea",
"reference": "65d615c1f604e479764f25525291d696041dfcea",
"shasum": ""
},
"require": {
"ext-exif": "*",
"ext-mbstring": "*",
"league/glide": "^1.4",
"league/glide": "^1.6",
"php": "^7.2|^8.0",
"spatie/image-optimizer": "^1.1",
"spatie/temporary-directory": "^1.0.0",
"spatie/temporary-directory": "^1.0",
"symfony/process": "^3.0|^4.0|^5.0"
},
"require-dev": {
@ -6638,7 +6641,7 @@
],
"support": {
"issues": "https://github.com/spatie/image/issues",
"source": "https://github.com/spatie/image/tree/1.9.0"
"source": "https://github.com/spatie/image/tree/1.10.0"
},
"funding": [
{
@ -6650,7 +6653,7 @@
"type": "github"
}
],
"time": "2020-11-13T09:39:41+00:00"
"time": "2020-11-27T14:44:09+00:00"
},
{
"name": "spatie/image-optimizer",
@ -6759,16 +6762,16 @@
},
{
"name": "stripe/stripe-php",
"version": "v7.65.0",
"version": "v7.66.0",
"source": {
"type": "git",
"url": "https://github.com/stripe/stripe-php.git",
"reference": "d4a22eeec7654efb8476fe8bea95b1e9928025a6"
"reference": "0dc50f42b06be83fe7029410616bda6e89c6d2be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/d4a22eeec7654efb8476fe8bea95b1e9928025a6",
"reference": "d4a22eeec7654efb8476fe8bea95b1e9928025a6",
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/0dc50f42b06be83fe7029410616bda6e89c6d2be",
"reference": "0dc50f42b06be83fe7029410616bda6e89c6d2be",
"shasum": ""
},
"require": {
@ -6814,9 +6817,9 @@
],
"support": {
"issues": "https://github.com/stripe/stripe-php/issues",
"source": "https://github.com/stripe/stripe-php/tree/v7.65.0"
"source": "https://github.com/stripe/stripe-php/tree/v7.66.0"
},
"time": "2020-11-19T19:37:25+00:00"
"time": "2020-11-24T16:33:56+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@ -9671,6 +9674,59 @@
],
"time": "2020-11-12T00:07:28+00:00"
},
{
"name": "webmozart/assert",
"version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
"reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
"reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
"shasum": ""
},
"require": {
"php": "^5.3.3 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
"phpstan/phpstan": "<0.12.20",
"vimeo/psalm": "<3.9.1"
},
"require-dev": {
"phpunit/phpunit": "^4.8.36 || ^7.5.13"
},
"type": "library",
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Bernhard Schussek",
"email": "bschussek@gmail.com"
}
],
"description": "Assertions to validate method input/output with nice error messages.",
"keywords": [
"assert",
"check",
"validate"
],
"support": {
"issues": "https://github.com/webmozart/assert/issues",
"source": "https://github.com/webmozart/assert/tree/master"
},
"time": "2020-07-08T17:02:28+00:00"
},
{
"name": "webpatser/laravel-countries",
"version": "dev-master",
@ -11694,16 +11750,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "9.2.3",
"version": "9.2.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "6b20e2055f7c29b56cb3870b3de7cc463d7add41"
"reference": "0a7f0acf9269c190fd982b5c04423feae986b6e0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6b20e2055f7c29b56cb3870b3de7cc463d7add41",
"reference": "6b20e2055f7c29b56cb3870b3de7cc463d7add41",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0a7f0acf9269c190fd982b5c04423feae986b6e0",
"reference": "0a7f0acf9269c190fd982b5c04423feae986b6e0",
"shasum": ""
},
"require": {
@ -11759,7 +11815,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.3"
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.4"
},
"funding": [
{
@ -11767,7 +11823,7 @@
"type": "github"
}
],
"time": "2020-10-30T10:46:41+00:00"
"time": "2020-11-27T06:15:15+00:00"
},
{
"name": "phpunit/php-file-iterator",
@ -13079,16 +13135,16 @@
},
{
"name": "swagger-api/swagger-ui",
"version": "v3.37.0",
"version": "v3.37.2",
"source": {
"type": "git",
"url": "https://github.com/swagger-api/swagger-ui.git",
"reference": "f0b7e7b0412d89b20a3f7def8397b60ca2ee5041"
"reference": "f568592c176aa479e507e5b9480bd10a36202ba3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/f0b7e7b0412d89b20a3f7def8397b60ca2ee5041",
"reference": "f0b7e7b0412d89b20a3f7def8397b60ca2ee5041",
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/f568592c176aa479e507e5b9480bd10a36202ba3",
"reference": "f568592c176aa479e507e5b9480bd10a36202ba3",
"shasum": ""
},
"type": "library",
@ -13134,9 +13190,9 @@
],
"support": {
"issues": "https://github.com/swagger-api/swagger-ui/issues",
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.37.0"
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.37.2"
},
"time": "2020-11-19T23:36:32+00:00"
"time": "2020-11-26T21:19:40+00:00"
},
{
"name": "symfony/debug",
@ -13567,59 +13623,6 @@
},
"time": "2020-11-20T14:56:53+00:00"
},
{
"name": "webmozart/assert",
"version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
"reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
"reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
"shasum": ""
},
"require": {
"php": "^5.3.3 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
"phpstan/phpstan": "<0.12.20",
"vimeo/psalm": "<3.9.1"
},
"require-dev": {
"phpunit/phpunit": "^4.8.36 || ^7.5.13"
},
"type": "library",
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Bernhard Schussek",
"email": "bschussek@gmail.com"
}
],
"description": "Assertions to validate method input/output with nice error messages.",
"keywords": [
"assert",
"check",
"validate"
],
"support": {
"issues": "https://github.com/webmozart/assert/issues",
"source": "https://github.com/webmozart/assert/tree/master"
},
"time": "2020-07-08T17:02:28+00:00"
},
{
"name": "webmozart/path-util",
"version": "2.3.0",

2
config/ninja.php
View File

@ -12,7 +12,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/').'/',
'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.0.27',
'app_version' => '5.0.30',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),