Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for composer merge

This commit is contained in:
David Bomba 2024-10-07 10:53:00 +11:00
parent 806e4b3f30
commit 5db3fb1ba3
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
composer.json
View File

@ -152,7 +152,15 @@
"merge-plugin": {
"include": [
"Modules/*/composer.json"
]
],
"recurse": true,
"replace": false,
"ignore-duplicates": false,
"merge-dev": true,
"merge-extra": false,
"merge-extra-deep": false,
"merge-replace": true,
"merge-scripts": false
}
},
"scripts": {

36
composer.lock generated
View File

@ -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": "0674b79dac52954eb43b3bd9de85a142",
"content-hash": "6e2c50d0b6035b9a6f170107817df089",
"packages": [
{
"name": "adrienrn/php-mimetyper",
@ -3882,16 +3882,16 @@
},
{
"name": "horstoeko/zugferd",
"version": "v1.0.64",
"version": "v1.0.65",
"source": {
"type": "git",
"url": "https://github.com/horstoeko/zugferd.git",
"reference": "9fbb4543e4ac3ca4148d3111665b7da8fb7bb1fd"
"reference": "ccafcda546f6867b3203420331fd436baf028187"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/horstoeko/zugferd/zipball/9fbb4543e4ac3ca4148d3111665b7da8fb7bb1fd",
"reference": "9fbb4543e4ac3ca4148d3111665b7da8fb7bb1fd",
"url": "https://api.github.com/repos/horstoeko/zugferd/zipball/ccafcda546f6867b3203420331fd436baf028187",
"reference": "ccafcda546f6867b3203420331fd436baf028187",
"shasum": ""
},
"require": {
@ -3951,9 +3951,9 @@
],
"support": {
"issues": "https://github.com/horstoeko/zugferd/issues",
"source": "https://github.com/horstoeko/zugferd/tree/v1.0.64"
"source": "https://github.com/horstoeko/zugferd/tree/v1.0.65"
},
"time": "2024-10-04T18:49:47+00:00"
"time": "2024-10-06T09:56:35+00:00"
},
{
"name": "horstoeko/zugferdvisualizer",
@ -7527,16 +7527,16 @@
},
{
"name": "nette/schema",
"version": "v1.3.1",
"version": "v1.3.2",
"source": {
"type": "git",
"url": "https://github.com/nette/schema.git",
"reference": "9522dad6211c4d995a01a9ac529da88d0b0ba7b5"
"reference": "da801d52f0354f70a638673c4a0f04e16529431d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/schema/zipball/9522dad6211c4d995a01a9ac529da88d0b0ba7b5",
"reference": "9522dad6211c4d995a01a9ac529da88d0b0ba7b5",
"url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
"reference": "da801d52f0354f70a638673c4a0f04e16529431d",
"shasum": ""
},
"require": {
@ -7583,9 +7583,9 @@
],
"support": {
"issues": "https://github.com/nette/schema/issues",
"source": "https://github.com/nette/schema/tree/v1.3.1"
"source": "https://github.com/nette/schema/tree/v1.3.2"
},
"time": "2024-10-05T03:01:50+00:00"
"time": "2024-10-06T23:10:23+00:00"
},
{
"name": "nette/utils",
@ -17400,16 +17400,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.12.5",
"version": "1.12.6",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17"
"reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
"reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae",
"reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae",
"shasum": ""
},
"require": {
@ -17454,7 +17454,7 @@
"type": "github"
}
],
"time": "2024-09-26T12:45:22+00:00"
"time": "2024-10-06T15:03:59+00:00"
},
{
"name": "phpunit/php-code-coverage",