mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2025-08-04 02:05:16 +02:00
Merge branch 'master' into 2fa
This commit is contained in:
Jan Böhmer
commit
ac0928426b
40 changed files with 13330 additions and 5929 deletions
385
composer.lock
generated
385
composer.lock
generated
|
|
@ -4,20 +4,20 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "addae3263b772b9d16dce2392f8af0e7",
|
||||
"content-hash": "d47b430dcf83d23e3fb046457877da76",
|
||||
"packages": [
|
||||
{
|
||||
"name": "beberlei/assert",
|
||||
"version": "v3.2.6",
|
||||
"version": "v3.2.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/beberlei/assert.git",
|
||||
"reference": "99508be011753690fe108ded450f5caaae180cfa"
|
||||
"reference": "d63a6943fc4fd1a2aedb65994e3548715105abcf"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/beberlei/assert/zipball/99508be011753690fe108ded450f5caaae180cfa",
|
||||
"reference": "99508be011753690fe108ded450f5caaae180cfa",
|
||||
"url": "https://api.github.com/repos/beberlei/assert/zipball/d63a6943fc4fd1a2aedb65994e3548715105abcf",
|
||||
"reference": "d63a6943fc4fd1a2aedb65994e3548715105abcf",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
"assertion",
|
||||
"validation"
|
||||
],
|
||||
"time": "2019-10-10T10:33:57+00:00"
|
||||
"time": "2019-12-19T17:51:41+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/annotations",
|
||||
|
|
@ -2106,6 +2106,58 @@
|
|||
],
|
||||
"time": "2019-12-20T14:15:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nikic/php-parser",
|
||||
"version": "v4.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nikic/PHP-Parser.git",
|
||||
"reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
|
||||
"reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-tokenizer": "*",
|
||||
"php": ">=7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"ircmaxell/php-yacc": "0.0.5",
|
||||
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
|
||||
},
|
||||
"bin": [
|
||||
"bin/php-parse"
|
||||
],
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "4.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"PhpParser\\": "lib/PhpParser"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"BSD-3-Clause"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Nikita Popov"
|
||||
}
|
||||
],
|
||||
"description": "A PHP parser written in PHP",
|
||||
"keywords": [
|
||||
"parser",
|
||||
"php"
|
||||
],
|
||||
"time": "2019-11-08T13:50:10+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nikolaposa/version",
|
||||
"version": "3.0.2",
|
||||
|
|
@ -2159,6 +2211,53 @@
|
|||
],
|
||||
"time": "2018-05-28T18:15:22+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nyholm/nsa",
|
||||
"version": "1.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Nyholm/NSA.git",
|
||||
"reference": "213a70dee2dd04433d31a187e24e92c8b59d1655"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Nyholm/NSA/zipball/213a70dee2dd04433d31a187e24e92c8b59d1655",
|
||||
"reference": "213a70dee2dd04433d31a187e24e92c8b59d1655",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^5.3 || ^7.0",
|
||||
"webmozart/assert": "^1.1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^4.0"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Nyholm\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "See everything and do whatever you want. No privacy rule will stop us. Used in tests, debugging and fixtures to access properties and methods.",
|
||||
"homepage": "http://tnyholm.se",
|
||||
"keywords": [
|
||||
"Fixture",
|
||||
"debug",
|
||||
"reflection",
|
||||
"test"
|
||||
],
|
||||
"time": "2017-04-13T17:21:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nyholm/psr7",
|
||||
"version": "1.2.1",
|
||||
|
|
@ -2710,6 +2809,218 @@
|
|||
],
|
||||
"time": "2016-01-26T13:27:02+00:00"
|
||||
},
|
||||
{
|
||||
"name": "php-translation/common",
|
||||
"version": "1.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-translation/common.git",
|
||||
"reference": "ceac357a7ad0582d0a6be7b7f2db178c87f229fd"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-translation/common/zipball/ceac357a7ad0582d0a6be7b7f2db178c87f229fd",
|
||||
"reference": "ceac357a7ad0582d0a6be7b7f2db178c87f229fd",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^5.4 || ^7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "^3.4 || ^4.0"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Translation\\Common\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "Common translation stuff",
|
||||
"time": "2018-06-14T16:18:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "php-translation/extractor",
|
||||
"version": "1.7.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-translation/extractor.git",
|
||||
"reference": "82fc51a07fb626c0bfb31fb3f041baa88fee6acb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-translation/extractor/zipball/82fc51a07fb626c0bfb31fb3f041baa88fee6acb",
|
||||
"reference": "82fc51a07fb626c0bfb31fb3f041baa88fee6acb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/annotations": "^1.2",
|
||||
"nikic/php-parser": "^3.0 || ^4.0",
|
||||
"php": "^5.5 || ^7.0",
|
||||
"symfony/finder": "^2.7 || ^3.0 || ^4.0",
|
||||
"twig/twig": "^1.27 || ^2.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "^3.4 || ^4.0",
|
||||
"symfony/translation": "^3.0 || ^4.0",
|
||||
"symfony/twig-bridge": "^3.0 || ^4.0",
|
||||
"symfony/validator": "^3.0 || ^4.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Translation\\Extractor\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "Extract translations form the source code",
|
||||
"time": "2018-07-09T17:05:17+00:00"
|
||||
},
|
||||
{
|
||||
"name": "php-translation/symfony-bundle",
|
||||
"version": "0.9.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-translation/symfony-bundle.git",
|
||||
"reference": "584b8b99ed97cc56a309c28cdd6e9c7bbf98bebb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-translation/symfony-bundle/zipball/584b8b99ed97cc56a309c28cdd6e9c7bbf98bebb",
|
||||
"reference": "584b8b99ed97cc56a309c28cdd6e9c7bbf98bebb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"nyholm/nsa": "^1.1",
|
||||
"php": "^7.1",
|
||||
"php-translation/common": "^1.0",
|
||||
"php-translation/extractor": "^1.6",
|
||||
"php-translation/symfony-storage": "^1.0",
|
||||
"symfony/finder": "^3.4 || ^4.0",
|
||||
"symfony/framework-bundle": "^3.4 || ^4.0",
|
||||
"symfony/intl": "^3.4 || ^4.0",
|
||||
"symfony/translation": "^3.4 || ^4.0",
|
||||
"symfony/twig-bundle": "^3.4 || ^4.0",
|
||||
"symfony/validator": "^3.4 || ^4.0",
|
||||
"twig/twig": "^1.42 || ^2.11"
|
||||
},
|
||||
"require-dev": {
|
||||
"matthiasnoback/symfony-config-test": "^4.0",
|
||||
"matthiasnoback/symfony-dependency-injection-test": "^3.1",
|
||||
"nyholm/psr7": "^1.1",
|
||||
"nyholm/symfony-bundle-test": "^1.4",
|
||||
"php-http/curl-client": "^1.7",
|
||||
"php-http/message": "^1.6",
|
||||
"php-http/message-factory": "^1.0.2",
|
||||
"php-translation/translator": "^1.0",
|
||||
"symfony/asset": "^3.4 || ^4.0",
|
||||
"symfony/console": "^3.4 || ^4.0",
|
||||
"symfony/dependency-injection": "^3.4 || ^4.0",
|
||||
"symfony/phpunit-bridge": "^4.2",
|
||||
"symfony/templating": "^3.4 || ^4.0",
|
||||
"symfony/twig-bridge": "^3.4 || ^4.0",
|
||||
"symfony/web-profiler-bundle": "^3.4 || ^4.0"
|
||||
},
|
||||
"suggest": {
|
||||
"php-http/httplug-bundle": "To easier configure your httplug clients."
|
||||
},
|
||||
"type": "symfony-bundle",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "0.10-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Translation\\Bundle\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com"
|
||||
}
|
||||
],
|
||||
"time": "2019-09-06T07:39:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "php-translation/symfony-storage",
|
||||
"version": "1.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-translation/symfony-storage.git",
|
||||
"reference": "8d7b1ea6bf22bee0c7dc9b228cf9437312373a27"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-translation/symfony-storage/zipball/8d7b1ea6bf22bee0c7dc9b228cf9437312373a27",
|
||||
"reference": "8d7b1ea6bf22bee0c7dc9b228cf9437312373a27",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"nyholm/nsa": "^1.1",
|
||||
"php": "^5.5 || ^7.0",
|
||||
"php-translation/common": "^1.0",
|
||||
"symfony/translation": "^2.7 || ^3.0 || ^4.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/framework-bundle": "^2.7.39 || ^3.0 || ^4.0",
|
||||
"symfony/phpunit-bridge": "^3.4 || ^4.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "0.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Translation\\SymfonyStorage\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "A translation file storage using Symfony translation component.",
|
||||
"time": "2018-07-10T10:32:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpdocumentor/reflection-common",
|
||||
"version": "2.0.0",
|
||||
|
|
@ -3421,16 +3732,16 @@
|
|||
},
|
||||
{
|
||||
"name": "scheb/two-factor-bundle",
|
||||
"version": "v4.11.0",
|
||||
"version": "v4.11.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/scheb/two-factor-bundle.git",
|
||||
"reference": "eadac02014233ab45dac215d42fd06aaf629b09a"
|
||||
"reference": "f9198cfcd5b2a92691926fd10406e8817232ac16"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/eadac02014233ab45dac215d42fd06aaf629b09a",
|
||||
"reference": "eadac02014233ab45dac215d42fd06aaf629b09a",
|
||||
"url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/f9198cfcd5b2a92691926fd10406e8817232ac16",
|
||||
"reference": "f9198cfcd5b2a92691926fd10406e8817232ac16",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -3485,7 +3796,7 @@
|
|||
"two-factor",
|
||||
"two-step"
|
||||
],
|
||||
"time": "2019-12-08T16:03:05+00:00"
|
||||
"time": "2019-12-19T12:07:42+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sensio/framework-extra-bundle",
|
||||
|
|
@ -8799,58 +9110,6 @@
|
|||
"description": "Map nested JSON structures onto PHP classes",
|
||||
"time": "2019-08-15T19:41:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nikic/php-parser",
|
||||
"version": "v4.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nikic/PHP-Parser.git",
|
||||
"reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
|
||||
"reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-tokenizer": "*",
|
||||
"php": ">=7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"ircmaxell/php-yacc": "0.0.5",
|
||||
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
|
||||
},
|
||||
"bin": [
|
||||
"bin/php-parse"
|
||||
],
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "4.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"PhpParser\\": "lib/PhpParser"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"BSD-3-Clause"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Nikita Popov"
|
||||
}
|
||||
],
|
||||
"description": "A PHP parser written in PHP",
|
||||
"keywords": [
|
||||
"parser",
|
||||
"php"
|
||||
],
|
||||
"time": "2019-11-08T13:50:10+00:00"
|
||||
},
|
||||
{
|
||||
"name": "openlss/lib-array2xml",
|
||||
"version": "1.0.0",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue