mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2025-12-06 02:59:29 +00:00
Compare commits
6 commits
3b4a099285
...
f27f0ab12d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f27f0ab12d | ||
|
|
9f2989444a | ||
|
|
8efc1ab07d | ||
|
|
1596b4d7ea | ||
|
|
d8ec65461e | ||
|
|
d89a76bdc3 |
7 changed files with 252 additions and 293 deletions
|
|
@ -48,7 +48,6 @@
|
||||||
"part-db/swap-bundle": "^6.0.0",
|
"part-db/swap-bundle": "^6.0.0",
|
||||||
"phpoffice/phpspreadsheet": "^5.0.0",
|
"phpoffice/phpspreadsheet": "^5.0.0",
|
||||||
"rhukster/dom-sanitizer": "^1.0",
|
"rhukster/dom-sanitizer": "^1.0",
|
||||||
"runtime/frankenphp-symfony": "^0.2.0",
|
|
||||||
"s9e/text-formatter": "^2.1",
|
"s9e/text-formatter": "^2.1",
|
||||||
"scheb/2fa-backup-code": "^v7.11.0",
|
"scheb/2fa-backup-code": "^v7.11.0",
|
||||||
"scheb/2fa-bundle": "^v7.11.0",
|
"scheb/2fa-bundle": "^v7.11.0",
|
||||||
|
|
|
||||||
471
composer.lock
generated
471
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1548,11 +1548,6 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
|
||||||
* dump_destination?: scalar|null, // A stream URL where dumps should be written to. // Default: null
|
* dump_destination?: scalar|null, // A stream URL where dumps should be written to. // Default: null
|
||||||
* theme?: "dark"|"light", // Changes the color of the dump() output when rendered directly on the templating. "dark" (default) or "light". // Default: "dark"
|
* theme?: "dark"|"light", // Changes the color of the dump() output when rendered directly on the templating. "dark" (default) or "light". // Default: "dark"
|
||||||
* }
|
* }
|
||||||
* @psalm-type MakerConfig = array{
|
|
||||||
* root_namespace?: scalar|null, // Default: "App"
|
|
||||||
* generate_final_classes?: bool, // Default: true
|
|
||||||
* generate_final_entities?: bool, // Default: false
|
|
||||||
* }
|
|
||||||
* @psalm-type WebpackEncoreConfig = array{
|
* @psalm-type WebpackEncoreConfig = array{
|
||||||
* output_path: scalar|null, // The path where Encore is building the assets - i.e. Encore.setOutputPath()
|
* output_path: scalar|null, // The path where Encore is building the assets - i.e. Encore.setOutputPath()
|
||||||
* crossorigin?: false|"anonymous"|"use-credentials", // crossorigin value when Encore.enableIntegrityHashes() is used, can be false (default), anonymous or use-credentials // Default: false
|
* crossorigin?: false|"anonymous"|"use-credentials", // crossorigin value when Encore.enableIntegrityHashes() is used, can be false (default), anonymous or use-credentials // Default: false
|
||||||
|
|
@ -1677,6 +1672,12 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
|
||||||
* post_processors?: array<string, array<string, mixed>>,
|
* post_processors?: array<string, array<string, mixed>>,
|
||||||
* },
|
* },
|
||||||
* }
|
* }
|
||||||
|
* @psalm-type DamaDoctrineTestConfig = array{
|
||||||
|
* enable_static_connection?: mixed, // Default: true
|
||||||
|
* enable_static_meta_data_cache?: bool, // Default: true
|
||||||
|
* enable_static_query_cache?: bool, // Default: true
|
||||||
|
* connection_keys?: list<mixed>,
|
||||||
|
* }
|
||||||
* @psalm-type TwigExtraConfig = array{
|
* @psalm-type TwigExtraConfig = array{
|
||||||
* cache?: bool|array{
|
* cache?: bool|array{
|
||||||
* enabled?: bool, // Default: false
|
* enabled?: bool, // Default: false
|
||||||
|
|
@ -2372,13 +2373,6 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
|
||||||
* invalidate_on_env_change?: bool, // Default: true
|
* invalidate_on_env_change?: bool, // Default: true
|
||||||
* },
|
* },
|
||||||
* }
|
* }
|
||||||
* @psalm-type JbtronicsTranslationEditorConfig = array{
|
|
||||||
* translations_path?: scalar|null, // Default: "%translator.default_path%"
|
|
||||||
* format?: scalar|null, // Default: "xlf"
|
|
||||||
* xliff_version?: scalar|null, // Default: "2.0"
|
|
||||||
* use_intl_icu_format?: bool, // Default: false
|
|
||||||
* writer_options?: list<scalar|null>,
|
|
||||||
* }
|
|
||||||
* @psalm-type ApiPlatformConfig = array{
|
* @psalm-type ApiPlatformConfig = array{
|
||||||
* title?: scalar|null, // The title of the API. // Default: ""
|
* title?: scalar|null, // The title of the API. // Default: ""
|
||||||
* description?: scalar|null, // The description of the API. // Default: ""
|
* description?: scalar|null, // The description of the API. // Default: ""
|
||||||
|
|
@ -2634,11 +2628,17 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
|
||||||
* ...<mixed>
|
* ...<mixed>
|
||||||
* },
|
* },
|
||||||
* }
|
* }
|
||||||
* @psalm-type DamaDoctrineTestConfig = array{
|
* @psalm-type MakerConfig = array{
|
||||||
* enable_static_connection?: mixed, // Default: true
|
* root_namespace?: scalar|null, // Default: "App"
|
||||||
* enable_static_meta_data_cache?: bool, // Default: true
|
* generate_final_classes?: bool, // Default: true
|
||||||
* enable_static_query_cache?: bool, // Default: true
|
* generate_final_entities?: bool, // Default: false
|
||||||
* connection_keys?: list<mixed>,
|
* }
|
||||||
|
* @psalm-type JbtronicsTranslationEditorConfig = array{
|
||||||
|
* translations_path?: scalar|null, // Default: "%translator.default_path%"
|
||||||
|
* format?: scalar|null, // Default: "xlf"
|
||||||
|
* xliff_version?: scalar|null, // Default: "2.0"
|
||||||
|
* use_intl_icu_format?: bool, // Default: false
|
||||||
|
* writer_options?: list<scalar|null>,
|
||||||
* }
|
* }
|
||||||
* @psalm-type ConfigType = array{
|
* @psalm-type ConfigType = array{
|
||||||
* imports?: ImportsConfig,
|
* imports?: ImportsConfig,
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,9 @@ services:
|
||||||
# this creates a service per class whose id is the fully-qualified class name
|
# this creates a service per class whose id is the fully-qualified class name
|
||||||
App\:
|
App\:
|
||||||
resource: '../src/'
|
resource: '../src/'
|
||||||
|
exclude:
|
||||||
|
- '../src/DataFixtures/'
|
||||||
|
- '../src/Doctrine/Purger/'
|
||||||
|
|
||||||
# controllers are imported separately to make sure services can be injected
|
# controllers are imported separately to make sure services can be injected
|
||||||
# as action arguments even if you don't extend any base controller class
|
# as action arguments even if you don't extend any base controller class
|
||||||
|
|
@ -230,10 +233,6 @@ services:
|
||||||
arguments:
|
arguments:
|
||||||
$enforce_index_php: '%env(bool:NO_URL_REWRITE_AVAILABLE)%'
|
$enforce_index_php: '%env(bool:NO_URL_REWRITE_AVAILABLE)%'
|
||||||
|
|
||||||
App\Doctrine\Purger\ResetAutoIncrementPurgerFactory:
|
|
||||||
tags:
|
|
||||||
- { name: 'doctrine.fixtures.purger_factory', alias: 'reset_autoincrement_purger' }
|
|
||||||
|
|
||||||
App\Repository\PartRepository:
|
App\Repository\PartRepository:
|
||||||
arguments:
|
arguments:
|
||||||
$translator: '@translator'
|
$translator: '@translator'
|
||||||
|
|
@ -275,8 +274,19 @@ services:
|
||||||
tags:
|
tags:
|
||||||
- { name: monolog.processor }
|
- { name: monolog.processor }
|
||||||
|
|
||||||
when@test:
|
when@test: &test
|
||||||
services:
|
services:
|
||||||
|
|
||||||
|
App\DataFixtures\:
|
||||||
|
resource: '../src/DataFixtures/'
|
||||||
|
|
||||||
|
App\Doctrine\Purger\:
|
||||||
|
resource: '../src/Doctrine/Purger/'
|
||||||
|
|
||||||
|
App\Doctrine\Purger\ResetAutoIncrementPurgerFactory:
|
||||||
|
tags:
|
||||||
|
- { name: 'doctrine.fixtures.purger_factory', alias: 'reset_autoincrement_purger' }
|
||||||
|
|
||||||
# Decorate the doctrine fixtures load command to use our custom purger by default
|
# Decorate the doctrine fixtures load command to use our custom purger by default
|
||||||
doctrine.fixtures_load_command.custom:
|
doctrine.fixtures_load_command.custom:
|
||||||
decorates: doctrine.fixtures_load_command
|
decorates: doctrine.fixtures_load_command
|
||||||
|
|
@ -285,3 +295,6 @@ when@test:
|
||||||
- '@doctrine.fixtures.loader'
|
- '@doctrine.fixtures.loader'
|
||||||
- '@doctrine'
|
- '@doctrine'
|
||||||
- { default: '@App\Doctrine\Purger\DoNotUsePurgerFactory' }
|
- { default: '@App\Doctrine\Purger\DoNotUsePurgerFactory' }
|
||||||
|
|
||||||
|
when@dev:
|
||||||
|
*test
|
||||||
|
|
|
||||||
|
|
@ -124,7 +124,7 @@ abstract class AbstractParameter extends AbstractNamedDBElement implements Uniqu
|
||||||
/**
|
/**
|
||||||
* @var float|null the guaranteed minimum value of this property
|
* @var float|null the guaranteed minimum value of this property
|
||||||
*/
|
*/
|
||||||
#[Assert\Type(['float', null])]
|
#[Assert\Type(['float', 'null'])]
|
||||||
#[Assert\LessThanOrEqual(propertyPath: 'value_typical', message: 'parameters.validator.min_lesser_typical')]
|
#[Assert\LessThanOrEqual(propertyPath: 'value_typical', message: 'parameters.validator.min_lesser_typical')]
|
||||||
#[Assert\LessThan(propertyPath: 'value_max', message: 'parameters.validator.min_lesser_max')]
|
#[Assert\LessThan(propertyPath: 'value_max', message: 'parameters.validator.min_lesser_max')]
|
||||||
#[Groups(['full', 'parameter:read', 'parameter:write', 'import'])]
|
#[Groups(['full', 'parameter:read', 'parameter:write', 'import'])]
|
||||||
|
|
@ -134,7 +134,7 @@ abstract class AbstractParameter extends AbstractNamedDBElement implements Uniqu
|
||||||
/**
|
/**
|
||||||
* @var float|null the typical value of this property
|
* @var float|null the typical value of this property
|
||||||
*/
|
*/
|
||||||
#[Assert\Type([null, 'float'])]
|
#[Assert\Type(['null', 'float'])]
|
||||||
#[Groups(['full', 'parameter:read', 'parameter:write', 'import'])]
|
#[Groups(['full', 'parameter:read', 'parameter:write', 'import'])]
|
||||||
#[ORM\Column(type: Types::FLOAT, nullable: true)]
|
#[ORM\Column(type: Types::FLOAT, nullable: true)]
|
||||||
protected ?float $value_typical = null;
|
protected ?float $value_typical = null;
|
||||||
|
|
@ -142,7 +142,7 @@ abstract class AbstractParameter extends AbstractNamedDBElement implements Uniqu
|
||||||
/**
|
/**
|
||||||
* @var float|null the maximum value of this property
|
* @var float|null the maximum value of this property
|
||||||
*/
|
*/
|
||||||
#[Assert\Type(['float', null])]
|
#[Assert\Type(['float', 'null'])]
|
||||||
#[Assert\GreaterThanOrEqual(propertyPath: 'value_typical', message: 'parameters.validator.max_greater_typical')]
|
#[Assert\GreaterThanOrEqual(propertyPath: 'value_typical', message: 'parameters.validator.max_greater_typical')]
|
||||||
#[Groups(['full', 'parameter:read', 'parameter:write', 'import'])]
|
#[Groups(['full', 'parameter:read', 'parameter:write', 'import'])]
|
||||||
#[ORM\Column(type: Types::FLOAT, nullable: true)]
|
#[ORM\Column(type: Types::FLOAT, nullable: true)]
|
||||||
|
|
@ -461,7 +461,7 @@ abstract class AbstractParameter extends AbstractNamedDBElement implements Uniqu
|
||||||
|
|
||||||
return $str;
|
return $str;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the class of the element that is allowed to be associated with this attachment.
|
* Returns the class of the element that is allowed to be associated with this attachment.
|
||||||
* @return string
|
* @return string
|
||||||
|
|
|
||||||
|
|
@ -72,11 +72,9 @@ class ProviderSelectType extends AbstractType
|
||||||
$resolver->setDefault('choice_label', function (Options $options){
|
$resolver->setDefault('choice_label', function (Options $options){
|
||||||
if ('object' === $options['input']) {
|
if ('object' === $options['input']) {
|
||||||
return ChoiceList::label($this, static fn (?InfoProviderInterface $choice) => new StaticMessage($choice?->getProviderInfo()['name']));
|
return ChoiceList::label($this, static fn (?InfoProviderInterface $choice) => new StaticMessage($choice?->getProviderInfo()['name']));
|
||||||
} else {
|
|
||||||
return static fn ($choice, $key, $value) => new StaticMessage($key);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return static fn ($choice, $key, $value) => new StaticMessage($key);
|
||||||
});
|
});
|
||||||
$resolver->setDefault('choice_value', function (Options $options) {
|
$resolver->setDefault('choice_value', function (Options $options) {
|
||||||
if ('object' === $options['input']) {
|
if ('object' === $options['input']) {
|
||||||
|
|
|
||||||
|
|
@ -2029,7 +2029,7 @@
|
||||||
"@symfony/ux-turbo@file:vendor/symfony/ux-turbo/assets":
|
"@symfony/ux-turbo@file:vendor/symfony/ux-turbo/assets":
|
||||||
version "2.30.0"
|
version "2.30.0"
|
||||||
|
|
||||||
"@symfony/webpack-encore@^5.0.0":
|
"@symfony/webpack-encore@^5.1.0":
|
||||||
version "5.3.1"
|
version "5.3.1"
|
||||||
resolved "https://registry.yarnpkg.com/@symfony/webpack-encore/-/webpack-encore-5.3.1.tgz#a8b183bb8ba9f8ce0aa47be5f520ae194ffa1412"
|
resolved "https://registry.yarnpkg.com/@symfony/webpack-encore/-/webpack-encore-5.3.1.tgz#a8b183bb8ba9f8ce0aa47be5f520ae194ffa1412"
|
||||||
integrity sha512-fNevCvcFMWrY63b901F2mvuECFUqwrQUUEJ9TZkO42lc81F0D6yiTMCFpzTKNrUIO7JSoD8aQxAWJbI5Kly4yg==
|
integrity sha512-fNevCvcFMWrY63b901F2mvuECFUqwrQUUEJ9TZkO42lc81F0D6yiTMCFpzTKNrUIO7JSoD8aQxAWJbI5Kly4yg==
|
||||||
|
|
@ -3094,7 +3094,7 @@ core-js-compat@^3.43.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
browserslist "^4.28.0"
|
browserslist "^4.28.0"
|
||||||
|
|
||||||
core-js@^3.23.0:
|
core-js@^3.38.0:
|
||||||
version "3.47.0"
|
version "3.47.0"
|
||||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.47.0.tgz#436ef07650e191afeb84c24481b298bd60eb4a17"
|
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.47.0.tgz#436ef07650e191afeb84c24481b298bd60eb4a17"
|
||||||
integrity sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==
|
integrity sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue