mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-21 09:35:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rector'

Browse source
This commit is contained in:
Jan Böhmer 2024-06-22 16:54:09 +02:00
commit eebc373734
177 changed files with 994 additions and 932 deletions
Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -104,7 +104,7 @@
"phpstan/phpstan-strict-rules": "^1.5", "phpstan/phpstan-strict-rules": "^1.5",
"phpstan/phpstan-symfony": "^1.1.7", "phpstan/phpstan-symfony": "^1.1.7",
"phpunit/phpunit": "^9.5", "phpunit/phpunit": "^9.5",
"rector/rector": "^0.18.0", "rector/rector": "^1.1.1",
"roave/security-advisories": "dev-latest", "roave/security-advisories": "dev-latest",
"symfony/browser-kit": "6.4.*", "symfony/browser-kit": "6.4.*",
"symfony/css-selector": "6.4.*", "symfony/css-selector": "6.4.*",

222
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b87b2ee767fbe00edcad0eba6e7fb6fd", "content-hash": "b9066d88608e5e8c968f4f297ecd7a80",
"packages": [ "packages": [
{ {
"name": "amphp/amp", "name": "amphp/amp",
@ -1925,16 +1925,16 @@
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "4.0.3", "version": "4.0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "8edbce73bc1aa2251ba8c754fc440f8e02c661bc" "reference": "50fda19f80724b55ff770bb4ff352407008e63c5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/8edbce73bc1aa2251ba8c754fc440f8e02c661bc", "url": "https://api.github.com/repos/doctrine/dbal/zipball/50fda19f80724b55ff770bb4ff352407008e63c5",
"reference": "8edbce73bc1aa2251ba8c754fc440f8e02c661bc", "reference": "50fda19f80724b55ff770bb4ff352407008e63c5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1947,13 +1947,13 @@
"doctrine/coding-standard": "12.0.0", "doctrine/coding-standard": "12.0.0",
"fig/log-test": "^1", "fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.2", "jetbrains/phpstorm-stubs": "2023.2",
"phpstan/phpstan": "1.11.1", "phpstan/phpstan": "1.11.5",
"phpstan/phpstan-phpunit": "1.4.0", "phpstan/phpstan-phpunit": "1.4.0",
"phpstan/phpstan-strict-rules": "^1.6", "phpstan/phpstan-strict-rules": "^1.6",
"phpunit/phpunit": "10.5.20", "phpunit/phpunit": "10.5.22",
"psalm/plugin-phpunit": "0.19.0", "psalm/plugin-phpunit": "0.19.0",
"slevomat/coding-standard": "8.13.1", "slevomat/coding-standard": "8.13.1",
"squizlabs/php_codesniffer": "3.9.2", "squizlabs/php_codesniffer": "3.10.1",
"symfony/cache": "^6.3.8|^7.0", "symfony/cache": "^6.3.8|^7.0",
"symfony/console": "^5.4|^6.3|^7.0", "symfony/console": "^5.4|^6.3|^7.0",
"vimeo/psalm": "5.24.0" "vimeo/psalm": "5.24.0"
@ -2013,7 +2013,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/4.0.3" "source": "https://github.com/doctrine/dbal/tree/4.0.4"
}, },
"funding": [ "funding": [
{ {
@ -2029,7 +2029,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-06-12T06:58:42+00:00" "time": "2024-06-19T11:57:23+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
@ -2811,16 +2811,16 @@
}, },
{ {
"name": "doctrine/persistence", "name": "doctrine/persistence",
"version": "3.3.2", "version": "3.3.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/persistence.git", "url": "https://github.com/doctrine/persistence.git",
"reference": "477da35bd0255e032826f440b94b3e37f2d56f42" "reference": "b337726451f5d530df338fc7f68dee8781b49779"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/persistence/zipball/477da35bd0255e032826f440b94b3e37f2d56f42", "url": "https://api.github.com/repos/doctrine/persistence/zipball/b337726451f5d530df338fc7f68dee8781b49779",
"reference": "477da35bd0255e032826f440b94b3e37f2d56f42", "reference": "b337726451f5d530df338fc7f68dee8781b49779",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2832,15 +2832,14 @@
"doctrine/common": "<2.10" "doctrine/common": "<2.10"
}, },
"require-dev": { "require-dev": {
"composer/package-versions-deprecated": "^1.11", "doctrine/coding-standard": "^12",
"doctrine/coding-standard": "^11",
"doctrine/common": "^3.0", "doctrine/common": "^3.0",
"phpstan/phpstan": "1.9.4", "phpstan/phpstan": "1.11.1",
"phpstan/phpstan-phpunit": "^1", "phpstan/phpstan-phpunit": "^1",
"phpstan/phpstan-strict-rules": "^1.1", "phpstan/phpstan-strict-rules": "^1.1",
"phpunit/phpunit": "^8.5 || ^9.5", "phpunit/phpunit": "^8.5 || ^9.5",
"symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/cache": "^4.4 || ^5.4 || ^6.0",
"vimeo/psalm": "4.30.0 || 5.3.0" "vimeo/psalm": "4.30.0 || 5.24.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -2889,7 +2888,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/persistence/issues", "issues": "https://github.com/doctrine/persistence/issues",
"source": "https://github.com/doctrine/persistence/tree/3.3.2" "source": "https://github.com/doctrine/persistence/tree/3.3.3"
}, },
"funding": [ "funding": [
{ {
@ -2905,7 +2904,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-03-12T14:54:36+00:00" "time": "2024-06-20T10:14:30+00:00"
}, },
{ {
"name": "doctrine/sql-formatter", "name": "doctrine/sql-formatter",
@ -5261,16 +5260,16 @@
}, },
{ {
"name": "liip/imagine-bundle", "name": "liip/imagine-bundle",
"version": "2.12.3", "version": "2.13.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/liip/LiipImagineBundle.git", "url": "https://github.com/liip/LiipImagineBundle.git",
"reference": "fa2baa6262bb74038f01ac746dc3e2a8bc441e09" "reference": "0c95437a7e1a0561004c8f7f7a412884f9f12438"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/liip/LiipImagineBundle/zipball/fa2baa6262bb74038f01ac746dc3e2a8bc441e09", "url": "https://api.github.com/repos/liip/LiipImagineBundle/zipball/0c95437a7e1a0561004c8f7f7a412884f9f12438",
"reference": "fa2baa6262bb74038f01ac746dc3e2a8bc441e09", "reference": "0c95437a7e1a0561004c8f7f7a412884f9f12438",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5296,6 +5295,7 @@
"phpstan/phpstan": "^1.10.0", "phpstan/phpstan": "^1.10.0",
"psr/cache": "^1.0|^2.0|^3.0", "psr/cache": "^1.0|^2.0|^3.0",
"psr/log": "^1.0", "psr/log": "^1.0",
"symfony/asset": "^3.4|^4.4|^5.3|^6.0|^7.0",
"symfony/browser-kit": "^3.4|^4.4|^5.3|^6.0|^7.0", "symfony/browser-kit": "^3.4|^4.4|^5.3|^6.0|^7.0",
"symfony/cache": "^3.4|^4.4|^5.3|^6.0|^7.0", "symfony/cache": "^3.4|^4.4|^5.3|^6.0|^7.0",
"symfony/console": "^3.4|^4.4|^5.3|^6.0|^7.0", "symfony/console": "^3.4|^4.4|^5.3|^6.0|^7.0",
@ -5317,10 +5317,12 @@
"ext-gd": "required to use gd driver", "ext-gd": "required to use gd driver",
"ext-gmagick": "required to use gmagick driver", "ext-gmagick": "required to use gmagick driver",
"ext-imagick": "required to use imagick driver", "ext-imagick": "required to use imagick driver",
"ext-json": "required to read JSON manifest versioning",
"ext-mongodb": "required for mongodb components", "ext-mongodb": "required for mongodb components",
"league/flysystem": "required to use FlySystem data loader or cache resolver", "league/flysystem": "required to use FlySystem data loader or cache resolver",
"monolog/monolog": "A psr/log compatible logger is required to enable logging", "monolog/monolog": "A psr/log compatible logger is required to enable logging",
"rokka/imagine-vips": "required to use 'vips' driver", "rokka/imagine-vips": "required to use 'vips' driver",
"symfony/asset": "If you want to use asset versioning",
"symfony/messenger": "If you like to process images in background", "symfony/messenger": "If you like to process images in background",
"symfony/templating": "required to use deprecated Templating component instead of Twig" "symfony/templating": "required to use deprecated Templating component instead of Twig"
}, },
@ -5358,9 +5360,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/liip/LiipImagineBundle/issues", "issues": "https://github.com/liip/LiipImagineBundle/issues",
"source": "https://github.com/liip/LiipImagineBundle/tree/2.12.3" "source": "https://github.com/liip/LiipImagineBundle/tree/2.13.0"
}, },
"time": "2024-05-16T08:51:30+00:00" "time": "2024-06-19T09:35:35+00:00"
}, },
{ {
"name": "lorenzo/pinky", "name": "lorenzo/pinky",
@ -11292,16 +11294,16 @@
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
"reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11351,7 +11353,7 @@
"portable" "portable"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -11367,20 +11369,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:11:03+00:00" "time": "2024-05-31T15:07:36+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-grapheme", "name": "symfony/polyfill-intl-grapheme",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
"reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a",
"reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11429,7 +11431,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -11445,20 +11447,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:11:03+00:00" "time": "2024-05-31T15:07:36+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-icu", "name": "symfony/polyfill-intl-icu",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-icu.git", "url": "https://github.com/symfony/polyfill-intl-icu.git",
"reference": "07094a28851a49107f3ab4f9120ca2975a64b6e1" "reference": "e76343c631b453088e2260ac41dfebe21954de81"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/07094a28851a49107f3ab4f9120ca2975a64b6e1", "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/e76343c631b453088e2260ac41dfebe21954de81",
"reference": "07094a28851a49107f3ab4f9120ca2975a64b6e1", "reference": "e76343c631b453088e2260ac41dfebe21954de81",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11513,7 +11515,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -11529,20 +11531,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:12:16+00:00" "time": "2024-05-31T15:07:36+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-idn", "name": "symfony/polyfill-intl-idn",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git", "url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "a287ed7475f85bf6f61890146edbc932c0fff919" "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919", "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
"reference": "a287ed7475f85bf6f61890146edbc932c0fff919", "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11597,7 +11599,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -11613,20 +11615,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:11:03+00:00" "time": "2024-05-31T15:07:36+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-normalizer", "name": "symfony/polyfill-intl-normalizer",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
"reference": "bc45c394692b948b4d383a08d7753968bed9a83d" "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
"reference": "bc45c394692b948b4d383a08d7753968bed9a83d", "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11678,7 +11680,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -11694,20 +11696,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:11:03+00:00" "time": "2024-05-31T15:07:36+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
"reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11758,7 +11760,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -11774,20 +11776,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:11:03+00:00" "time": "2024-06-19T12:30:46+00:00"
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php72.git", "url": "https://github.com/symfony/polyfill-php72.git",
"reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25" "reference": "10112722600777e02d2745716b70c5db4ca70442"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25", "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442",
"reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25", "reference": "10112722600777e02d2745716b70c5db4ca70442",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11831,7 +11833,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -11847,20 +11849,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:11:03+00:00" "time": "2024-06-19T12:30:46+00:00"
}, },
{ {
"name": "symfony/polyfill-php80", "name": "symfony/polyfill-php80",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php80.git", "url": "https://github.com/symfony/polyfill-php80.git",
"reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" "reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
"reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11911,7 +11913,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -11927,20 +11929,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:11:03+00:00" "time": "2024-05-31T15:07:36+00:00"
}, },
{ {
"name": "symfony/polyfill-php82", "name": "symfony/polyfill-php82",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php82.git", "url": "https://github.com/symfony/polyfill-php82.git",
"reference": "559d488c38784112c78b9bf17c5ce8366a265643" "reference": "77ff49780f56906788a88974867ed68bc49fae5b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/559d488c38784112c78b9bf17c5ce8366a265643", "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/77ff49780f56906788a88974867ed68bc49fae5b",
"reference": "559d488c38784112c78b9bf17c5ce8366a265643", "reference": "77ff49780f56906788a88974867ed68bc49fae5b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11987,7 +11989,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php82/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-php82/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -12003,25 +12005,24 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:11:03+00:00" "time": "2024-06-19T12:30:46+00:00"
}, },
{ {
"name": "symfony/polyfill-php83", "name": "symfony/polyfill-php83",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php83.git", "url": "https://github.com/symfony/polyfill-php83.git",
"reference": "86fcae159633351e5fd145d1c47de6c528f8caff" "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff", "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
"reference": "86fcae159633351e5fd145d1c47de6c528f8caff", "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.1", "php": ">=7.1"
"symfony/polyfill-php80": "^1.14"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -12064,7 +12065,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -12080,20 +12081,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:11:03+00:00" "time": "2024-06-19T12:35:24+00:00"
}, },
{ {
"name": "symfony/polyfill-uuid", "name": "symfony/polyfill-uuid",
"version": "v1.29.0", "version": "v1.30.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-uuid.git", "url": "https://github.com/symfony/polyfill-uuid.git",
"reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853" "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853", "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/2ba1f33797470debcda07fe9dce20a0003df18e9",
"reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853", "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -12143,7 +12144,7 @@
"uuid" "uuid"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-uuid/tree/v1.29.0" "source": "https://github.com/symfony/polyfill-uuid/tree/v1.30.0"
}, },
"funding": [ "funding": [
{ {
@ -12159,7 +12160,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-29T20:11:03+00:00" "time": "2024-05-31T15:07:36+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
@ -17137,21 +17138,21 @@
}, },
{ {
"name": "rector/rector", "name": "rector/rector",
"version": "0.18.13", "version": "1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/rectorphp/rector.git", "url": "https://github.com/rectorphp/rector.git",
"reference": "f8011a76d36aa4f839f60f3b4f97707d97176618" "reference": "c930cdb21294f10955ddfc31b720971e8333943d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/rectorphp/rector/zipball/f8011a76d36aa4f839f60f3b4f97707d97176618", "url": "https://api.github.com/repos/rectorphp/rector/zipball/c930cdb21294f10955ddfc31b720971e8333943d",
"reference": "f8011a76d36aa4f839f60f3b4f97707d97176618", "reference": "c930cdb21294f10955ddfc31b720971e8333943d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2|^8.0", "php": "^7.2|^8.0",
"phpstan/phpstan": "^1.10.35" "phpstan/phpstan": "^1.11"
}, },
"conflict": { "conflict": {
"rector/rector-doctrine": "*", "rector/rector-doctrine": "*",
@ -17159,6 +17160,9 @@
"rector/rector-phpunit": "*", "rector/rector-phpunit": "*",
"rector/rector-symfony": "*" "rector/rector-symfony": "*"
}, },
"suggest": {
"ext-dom": "To manipulate phpunit.xml via the custom-rule command"
},
"bin": [ "bin": [
"bin/rector" "bin/rector"
], ],
@ -17181,7 +17185,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/rectorphp/rector/issues", "issues": "https://github.com/rectorphp/rector/issues",
"source": "https://github.com/rectorphp/rector/tree/0.18.13" "source": "https://github.com/rectorphp/rector/tree/1.1.1"
}, },
"funding": [ "funding": [
{ {
@ -17189,7 +17193,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2023-12-20T16:08:01+00:00" "time": "2024-06-21T07:51:17+00:00"
}, },
{ {
"name": "roave/security-advisories", "name": "roave/security-advisories",
@ -17197,12 +17201,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "a36c08c63614a0da558615424f8b37b3216416b6" "reference": "64eaaecdc0e915ce201f399e4707f83155389e96"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/a36c08c63614a0da558615424f8b37b3216416b6", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/64eaaecdc0e915ce201f399e4707f83155389e96",
"reference": "a36c08c63614a0da558615424f8b37b3216416b6", "reference": "64eaaecdc0e915ce201f399e4707f83155389e96",
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@ -17211,7 +17215,7 @@
"adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3",
"aheinze/cockpit": "<2.2", "aheinze/cockpit": "<2.2",
"aimeos/ai-client-html": ">=2020.04.1,<2020.10.27|>=2021.04.1,<2021.10.21|>=2022.04.1,<2022.10.12|>=2023.04.1,<2023.10.14|>=2024.04.1,<2024.04.4", "aimeos/ai-client-html": ">=2020.04.1,<2020.10.27|>=2021.04.1,<2021.10.21|>=2022.04.1,<2022.10.12|>=2023.04.1,<2023.10.14|>=2024.04.1,<2024.04.4",
"aimeos/aimeos-core": "<2024.04.7", "aimeos/aimeos-core": ">=2022.04.1,<2022.10.17|>=2023.04.1,<2023.10.17|>=2024.04.1,<2024.04.7",
"aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5", "aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5",
"airesvsg/acf-to-rest-api": "<=3.1", "airesvsg/acf-to-rest-api": "<=3.1",
"akaunting/akaunting": "<2.1.13", "akaunting/akaunting": "<2.1.13",
@ -17485,6 +17489,7 @@
"jsdecena/laracom": "<2.0.9", "jsdecena/laracom": "<2.0.9",
"jsmitty12/phpwhois": "<5.1", "jsmitty12/phpwhois": "<5.1",
"juzaweb/cms": "<=3.4", "juzaweb/cms": "<=3.4",
"jweiland/events2": "<8.3.8|>=9,<9.0.6",
"kazist/phpwhois": "<=4.2.6", "kazist/phpwhois": "<=4.2.6",
"kelvinmo/simplexrd": "<3.1.1", "kelvinmo/simplexrd": "<3.1.1",
"kevinpapst/kimai2": "<1.16.7", "kevinpapst/kimai2": "<1.16.7",
@ -17555,7 +17560,7 @@
"mojo42/jirafeau": "<4.4", "mojo42/jirafeau": "<4.4",
"mongodb/mongodb": ">=1,<1.9.2", "mongodb/mongodb": ">=1,<1.9.2",
"monolog/monolog": ">=1.8,<1.12", "monolog/monolog": ">=1.8,<1.12",
"moodle/moodle": "<4.3.4", "moodle/moodle": "<4.3.5|>=4.4.0.0-beta,<4.4.1",
"mos/cimage": "<0.7.19", "mos/cimage": "<0.7.19",
"movim/moxl": ">=0.8,<=0.10", "movim/moxl": ">=0.8,<=0.10",
"movingbytes/social-network": "<=1.2.1", "movingbytes/social-network": "<=1.2.1",
@ -17761,6 +17766,7 @@
"statamic/cms": "<4.46|>=5.3,<5.6.2", "statamic/cms": "<4.46|>=5.3,<5.6.2",
"stormpath/sdk": "<9.9.99", "stormpath/sdk": "<9.9.99",
"studio-42/elfinder": "<2.1.62", "studio-42/elfinder": "<2.1.62",
"studiomitte/friendlycaptcha": "<0.1.4",
"subhh/libconnect": "<7.0.8|>=8,<8.1", "subhh/libconnect": "<7.0.8|>=8,<8.1",
"sukohi/surpass": "<1", "sukohi/surpass": "<1",
"sulu/form-bundle": ">=2,<2.5.3", "sulu/form-bundle": ">=2,<2.5.3",
@ -17827,7 +17833,7 @@
"thorsten/phpmyfaq": "<3.2.2", "thorsten/phpmyfaq": "<3.2.2",
"tikiwiki/tiki-manager": "<=17.1", "tikiwiki/tiki-manager": "<=17.1",
"timber/timber": ">=0.16.6,<1.23.1|>=1.24,<1.24.1|>=2,<2.1", "timber/timber": ">=0.16.6,<1.23.1|>=1.24,<1.24.1|>=2,<2.1",
"tinymce/tinymce": "<7", "tinymce/tinymce": "<7.2",
"tinymighty/wiki-seo": "<1.2.2", "tinymighty/wiki-seo": "<1.2.2",
"titon/framework": "<9.9.99", "titon/framework": "<9.9.99",
"tobiasbg/tablepress": "<=2.0.0.0-RC1", "tobiasbg/tablepress": "<=2.0.0.0-RC1",
@ -17992,7 +17998,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-06-17T23:04:35+00:00" "time": "2024-06-21T16:04:36+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",

22
rector.php
View file

@ -2,12 +2,17 @@
declare(strict_types=1); declare(strict_types=1);
use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
use Rector\Config\RectorConfig; use Rector\Config\RectorConfig;
use Rector\Doctrine\Set\DoctrineSetList; use Rector\Doctrine\Set\DoctrineSetList;
use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
use Rector\PHPUnit\Set\PHPUnitSetList; use Rector\PHPUnit\Set\PHPUnitSetList;
use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList; use Rector\Set\ValueObject\SetList;
use Rector\Symfony\CodeQuality\Rector\Class_\EventListenerToEventSubscriberRector;
use Rector\Symfony\CodeQuality\Rector\ClassMethod\ActionSuffixRemoverRector;
use Rector\Symfony\CodeQuality\Rector\MethodCall\LiteralGetToRequestClassConstantRector;
use Rector\Symfony\Set\SymfonySetList; use Rector\Symfony\Set\SymfonySetList;
use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector; use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
@ -55,5 +60,22 @@ return static function (RectorConfig $rectorConfig): void {
$rectorConfig->skip([ $rectorConfig->skip([
CountArrayToEmptyArrayComparisonRector::class, CountArrayToEmptyArrayComparisonRector::class,
//Leave our !== null checks alone
FlipTypeControlToUseExclusiveTypeRector::class,
//Leave our PartList TableAction alone
ActionSuffixRemoverRector::class,
//We declare event listeners via attributes, therefore no need to migrate them to subscribers
EventListenerToEventSubscriberRector::class,
PreferPHPUnitThisCallRector::class,
//Do not replace 'GET' with class constant,
LiteralGetToRequestClassConstantRector::class,
]);
//Do not apply rules to Symfony own files
$rectorConfig->skip([
__DIR__ . '/public/index.php',
__DIR__ . '/src/Kernel.php',
__DIR__ . '/config/preload.php',
__DIR__ . '/config/bundles.php',
]); ]);
}; };

4
src/ApiPlatform/Filter/EntityFilterHelper.php
View file

@ -81,12 +81,12 @@ class EntityFilterHelper
public function getDescription(array $properties): array public function getDescription(array $properties): array
{ {
if (!$properties) { if ($properties === []) {
return []; return [];
} }
$description = []; $description = [];
foreach ($properties as $property => $strategy) { foreach (array_keys($properties) as $property) {
$description[(string)$property] = [ $description[(string)$property] = [
'property' => $property, 'property' => $property,
'type' => Type::BUILTIN_TYPE_STRING, 'type' => Type::BUILTIN_TYPE_STRING,

2
src/ApiPlatform/Filter/LikeFilter.php
View file

@ -61,7 +61,7 @@ final class LikeFilter extends AbstractFilter
} }
$description = []; $description = [];
foreach ($this->properties as $property => $strategy) { foreach (array_keys($this->properties) as $property) {
$description[(string)$property] = [ $description[(string)$property] = [
'property' => $property, 'property' => $property,
'type' => Type::BUILTIN_TYPE_STRING, 'type' => Type::BUILTIN_TYPE_STRING,

21
src/Controller/AdminPages/BaseAdminController.php
View file

@ -52,7 +52,6 @@ use Doctrine\ORM\EntityManagerInterface;
use InvalidArgumentException; use InvalidArgumentException;
use Omines\DataTablesBundle\DataTableFactory; use Omines\DataTablesBundle\DataTableFactory;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\File\UploadedFile;
@ -74,15 +73,10 @@ abstract class BaseAdminController extends AbstractController
protected string $attachment_class = ''; protected string $attachment_class = '';
protected ?string $parameter_class = ''; protected ?string $parameter_class = '';
/**
* @var EventDispatcher|EventDispatcherInterface
*/
protected EventDispatcher|EventDispatcherInterface $eventDispatcher;
public function __construct(protected TranslatorInterface $translator, protected UserPasswordHasherInterface $passwordEncoder, public function __construct(protected TranslatorInterface $translator, protected UserPasswordHasherInterface $passwordEncoder,
protected AttachmentSubmitHandler $attachmentSubmitHandler, protected AttachmentSubmitHandler $attachmentSubmitHandler,
protected EventCommentHelper $commentHelper, protected HistoryHelper $historyHelper, protected TimeTravel $timeTravel, protected EventCommentHelper $commentHelper, protected HistoryHelper $historyHelper, protected TimeTravel $timeTravel,
protected DataTableFactory $dataTableFactory, EventDispatcherInterface $eventDispatcher, protected LabelExampleElementsGenerator $barcodeExampleGenerator, protected DataTableFactory $dataTableFactory, protected EventDispatcherInterface $eventDispatcher, protected LabelExampleElementsGenerator $barcodeExampleGenerator,
protected LabelGenerator $labelGenerator, protected EntityManagerInterface $entityManager) protected LabelGenerator $labelGenerator, protected EntityManagerInterface $entityManager)
{ {
if ('' === $this->entity_class || '' === $this->form_class || '' === $this->twig_template || '' === $this->route_base) { if ('' === $this->entity_class || '' === $this->form_class || '' === $this->twig_template || '' === $this->route_base) {
@ -96,7 +90,6 @@ abstract class BaseAdminController extends AbstractController
if ('' === $this->parameter_class || ($this->parameter_class && !is_a($this->parameter_class, AbstractParameter::class, true))) { if ('' === $this->parameter_class || ($this->parameter_class && !is_a($this->parameter_class, AbstractParameter::class, true))) {
throw new InvalidArgumentException('You have to override the $parameter_class value with a valid Parameter class in your subclass!'); throw new InvalidArgumentException('You have to override the $parameter_class value with a valid Parameter class in your subclass!');
} }
$this->eventDispatcher = $eventDispatcher;
} }
protected function revertElementIfNeeded(AbstractDBElement $entity, ?string $timestamp): ?DateTime protected function revertElementIfNeeded(AbstractDBElement $entity, ?string $timestamp): ?DateTime
@ -192,10 +185,8 @@ abstract class BaseAdminController extends AbstractController
} }
//Ensure that the master picture is still part of the attachments //Ensure that the master picture is still part of the attachments
if ($entity instanceof AttachmentContainingDBElement) { if ($entity instanceof AttachmentContainingDBElement && ($entity->getMasterPictureAttachment() !== null && !$entity->getAttachments()->contains($entity->getMasterPictureAttachment()))) {
if ($entity->getMasterPictureAttachment() !== null && !$entity->getAttachments()->contains($entity->getMasterPictureAttachment())) { $entity->setMasterPictureAttachment(null);
$entity->setMasterPictureAttachment(null);
}
} }
$this->commentHelper->setMessage($form['log_comment']->getData()); $this->commentHelper->setMessage($form['log_comment']->getData());
@ -283,10 +274,8 @@ abstract class BaseAdminController extends AbstractController
} }
//Ensure that the master picture is still part of the attachments //Ensure that the master picture is still part of the attachments
if ($new_entity instanceof AttachmentContainingDBElement) { if ($new_entity instanceof AttachmentContainingDBElement && ($new_entity->getMasterPictureAttachment() !== null && !$new_entity->getAttachments()->contains($new_entity->getMasterPictureAttachment()))) {
if ($new_entity->getMasterPictureAttachment() !== null && !$new_entity->getAttachments()->contains($new_entity->getMasterPictureAttachment())) { $new_entity->setMasterPictureAttachment(null);
$new_entity->setMasterPictureAttachment(null);
}
} }
$this->commentHelper->setMessage($form['log_comment']->getData()); $this->commentHelper->setMessage($form['log_comment']->getData());

5
src/Controller/KiCadApiController.php
View file

@ -30,6 +30,9 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\Attribute\Route;
/**
* @see \App\Tests\Controller\KiCadApiControllerTest
*/
#[Route('/kicad-api/v1')] #[Route('/kicad-api/v1')]
class KiCadApiController extends AbstractController class KiCadApiController extends AbstractController
{ {
@ -62,7 +65,7 @@ class KiCadApiController extends AbstractController
#[Route('/parts/category/{category}.json', name: 'kicad_api_category')] #[Route('/parts/category/{category}.json', name: 'kicad_api_category')]
public function categoryParts(?Category $category): Response public function categoryParts(?Category $category): Response
{ {
if ($category) { if ($category !== null) {
$this->denyAccessUnlessGranted('read', $category); $this->denyAccessUnlessGranted('read', $category);
} else { } else {
$this->denyAccessUnlessGranted('@categories.read'); $this->denyAccessUnlessGranted('@categories.read');

2
src/Controller/OAuthClientController.php
View file

@ -51,7 +51,7 @@ class OAuthClientController extends AbstractController
} }
#[Route('/{name}/check', name: 'oauth_client_check')] #[Route('/{name}/check', name: 'oauth_client_check')]
public function check(string $name, Request $request): Response public function check(string $name): Response
{ {
$this->denyAccessUnlessGranted('@system.manage_oauth_tokens'); $this->denyAccessUnlessGranted('@system.manage_oauth_tokens');

8
src/Controller/PartController.php
View file

@ -329,7 +329,7 @@ class PartController extends AbstractController
$this->em->flush(); $this->em->flush();
if ($mode === 'new') { if ($mode === 'new') {
$this->addFlash('success', 'part.created_flash'); $this->addFlash('success', 'part.created_flash');
} else if ($mode === 'edit') { } elseif ($mode === 'edit') {
$this->addFlash('success', 'part.edited_flash'); $this->addFlash('success', 'part.edited_flash');
} }
@ -358,11 +358,11 @@ class PartController extends AbstractController
$template = ''; $template = '';
if ($mode === 'new') { if ($mode === 'new') {
$template = 'parts/edit/new_part.html.twig'; $template = 'parts/edit/new_part.html.twig';
} else if ($mode === 'edit') { } elseif ($mode === 'edit') {
$template = 'parts/edit/edit_part_info.html.twig'; $template = 'parts/edit/edit_part_info.html.twig';
} else if ($mode === 'merge') { } elseif ($mode === 'merge') {
$template = 'parts/edit/merge_parts.html.twig'; $template = 'parts/edit/merge_parts.html.twig';
} else if ($mode === 'update_from_ip') { } elseif ($mode === 'update_from_ip') {
$template = 'parts/edit/update_from_ip.html.twig'; $template = 'parts/edit/update_from_ip.html.twig';
} }

2
src/Controller/ProjectController.php
View file

@ -219,7 +219,7 @@ class ProjectController extends AbstractController
'project' => $project, 'project' => $project,
'part' => $part 'part' => $part
]); ]);
if ($bom_entry) { if ($bom_entry !== null) {
$preset_data->add($bom_entry); $preset_data->add($bom_entry);
} else { //Otherwise create an empty one } else { //Otherwise create an empty one
$entry = new ProjectBOMEntry(); $entry = new ProjectBOMEntry();

3
src/Controller/ScanController.php
View file

@ -54,6 +54,9 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Attribute\MapQueryParameter; use Symfony\Component\HttpKernel\Attribute\MapQueryParameter;
use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\Attribute\Route;
/**
* @see \App\Tests\Controller\ScanControllerTest
*/
#[Route(path: '/scan')] #[Route(path: '/scan')]
class ScanController extends AbstractController class ScanController extends AbstractController
{ {

3
src/Controller/ToolsController.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
*/ */
namespace App\Controller; namespace App\Controller;
use Symfony\Component\Runtime\SymfonyRuntime;
use App\Services\Attachments\AttachmentSubmitHandler; use App\Services\Attachments\AttachmentSubmitHandler;
use App\Services\Attachments\AttachmentURLGenerator; use App\Services\Attachments\AttachmentURLGenerator;
use App\Services\Attachments\BuiltinAttachmentsFinder; use App\Services\Attachments\BuiltinAttachmentsFinder;
@ -84,7 +85,7 @@ class ToolsController extends AbstractController
'php_post_max_size' => ini_get('post_max_size'), 'php_post_max_size' => ini_get('post_max_size'),
'kernel_runtime_environment' => $this->getParameter('kernel.runtime_environment'), 'kernel_runtime_environment' => $this->getParameter('kernel.runtime_environment'),
'kernel_runtime_mode' => $this->getParameter('kernel.runtime_mode'), 'kernel_runtime_mode' => $this->getParameter('kernel.runtime_mode'),
'kernel_runtime' => $_SERVER['APP_RUNTIME'] ?? $_ENV['APP_RUNTIME'] ?? 'Symfony\\Component\\Runtime\\SymfonyRuntime', 'kernel_runtime' => $_SERVER['APP_RUNTIME'] ?? $_ENV['APP_RUNTIME'] ?? SymfonyRuntime::class,
//DB section //DB section
'db_type' => $DBInfoHelper->getDatabaseType() ?? 'Unknown', 'db_type' => $DBInfoHelper->getDatabaseType() ?? 'Unknown',

6
src/Controller/UserSettingsController.php
View file

@ -38,7 +38,6 @@ use Doctrine\ORM\EntityManagerInterface;
use RuntimeException; use RuntimeException;
use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorInterface; use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\Extension\Core\Type\DateTimeType; use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
use Symfony\Component\Form\Extension\Core\Type\EnumType; use Symfony\Component\Form\Extension\Core\Type\EnumType;
@ -59,11 +58,8 @@ use Symfony\Component\Validator\Constraints\Length;
#[Route(path: '/user')] #[Route(path: '/user')]
class UserSettingsController extends AbstractController class UserSettingsController extends AbstractController
{ {
protected EventDispatcher|EventDispatcherInterface $eventDispatcher; public function __construct(protected bool $demo_mode, protected EventDispatcherInterface $eventDispatcher)
public function __construct(protected bool $demo_mode, EventDispatcherInterface $eventDispatcher)
{ {
$this->eventDispatcher = $eventDispatcher;
} }
#[Route(path: '/2fa_backup_codes', name: 'show_backup_codes')] #[Route(path: '/2fa_backup_codes', name: 'show_backup_codes')]

13
src/DataTables/Adapters/TwoStepORMAdapter.php
View file

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace App\DataTables\Adapters; namespace App\DataTables\Adapters;
use Doctrine\ORM\Query\Expr\From;
use Doctrine\ORM\Query; use Doctrine\ORM\Query;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Doctrine\ORM\Tools\Pagination\Paginator; use Doctrine\ORM\Tools\Pagination\Paginator;
@ -51,12 +52,12 @@ class TwoStepORMAdapter extends ORMAdapter
private bool $use_simple_total = false; private bool $use_simple_total = false;
private \Closure|null $query_modifier; private \Closure|null $query_modifier = null;
public function __construct(ManagerRegistry $registry = null) public function __construct(ManagerRegistry $registry = null)
{ {
parent::__construct($registry); parent::__construct($registry);
$this->detailQueryCallable = static function (QueryBuilder $qb, array $ids) { $this->detailQueryCallable = static function (QueryBuilder $qb, array $ids): never {
throw new \RuntimeException('You need to set the detail_query option to use the TwoStepORMAdapter'); throw new \RuntimeException('You need to set the detail_query option to use the TwoStepORMAdapter');
}; };
} }
@ -66,9 +67,7 @@ class TwoStepORMAdapter extends ORMAdapter
parent::configureOptions($resolver); parent::configureOptions($resolver);
$resolver->setRequired('filter_query'); $resolver->setRequired('filter_query');
$resolver->setDefault('query', function (Options $options) { $resolver->setDefault('query', fn(Options $options) => $options['filter_query']);
return $options['filter_query'];
});
$resolver->setRequired('detail_query'); $resolver->setRequired('detail_query');
$resolver->setAllowedTypes('detail_query', \Closure::class); $resolver->setAllowedTypes('detail_query', \Closure::class);
@ -108,7 +107,7 @@ class TwoStepORMAdapter extends ORMAdapter
} }
} }
/** @var Query\Expr\From $fromClause */ /** @var From $fromClause */
$fromClause = $builder->getDQLPart('from')[0]; $fromClause = $builder->getDQLPart('from')[0];
$identifier = "{$fromClause->getAlias()}.{$this->metadata->getSingleIdentifierFieldName()}"; $identifier = "{$fromClause->getAlias()}.{$this->metadata->getSingleIdentifierFieldName()}";
@ -201,7 +200,7 @@ class TwoStepORMAdapter extends ORMAdapter
/** The paginator count queries can be rather slow, so when query for total count (100ms or longer), /** The paginator count queries can be rather slow, so when query for total count (100ms or longer),
* just return the entity count. * just return the entity count.
*/ */
/** @var Query\Expr\From $from_expr */ /** @var From $from_expr */
$from_expr = $queryBuilder->getDQLPart('from')[0]; $from_expr = $queryBuilder->getDQLPart('from')[0];
return $this->manager->getRepository($from_expr->getFrom())->count([]); return $this->manager->getRepository($from_expr->getFrom())->count([]);

2
src/DataTables/AttachmentDataTable.php
View file

@ -92,7 +92,7 @@ final class AttachmentDataTable implements DataTableTypeInterface
if ($context->isExternal()) { if ($context->isExternal()) {
return sprintf( return sprintf(
'<a href="%s" class="link-external">%s</a>', '<a href="%s" class="link-external">%s</a>',
htmlspecialchars($context->getURL()), htmlspecialchars((string) $context->getURL()),
htmlspecialchars($value) htmlspecialchars($value)
); );
} }

4
src/DataTables/Column/EnumColumn.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\DataTables\Column; namespace App\DataTables\Column;
use Omines\DataTablesBundle\Column\AbstractColumn; use Omines\DataTablesBundle\Column\AbstractColumn;

2
src/DataTables/Helpers/ColumnSortHelper.php
View file

@ -109,7 +109,7 @@ class ColumnSortHelper
} }
//and the remaining non-visible columns //and the remaining non-visible columns
foreach ($this->columns as $col_id => $col_data) { foreach (array_keys($this->columns) as $col_id) {
if (in_array($col_id, $processed_columns, true)) { if (in_array($col_id, $processed_columns, true)) {
// column already processed // column already processed
continue; continue;

2
src/DataTables/LogDataTable.php
View file

@ -162,7 +162,7 @@ class LogDataTable implements DataTableTypeInterface
if (!$user instanceof User) { if (!$user instanceof User) {
if ($context->isCLIEntry()) { if ($context->isCLIEntry()) {
return sprintf('%s [%s]', return sprintf('%s [%s]',
htmlentities($context->getCLIUsername()), htmlentities((string) $context->getCLIUsername()),
$this->translator->trans('log.cli_user') $this->translator->trans('log.cli_user')
); );
} }

4
src/DataTables/PartsDataTable.php
View file

@ -156,7 +156,7 @@ final class PartsDataTable implements DataTableTypeInterface
'orderField' => 'NATSORT(_partUnit.name)', 'orderField' => 'NATSORT(_partUnit.name)',
'render' => function($value, Part $context): string { 'render' => function($value, Part $context): string {
$partUnit = $context->getPartUnit(); $partUnit = $context->getPartUnit();
if (!$partUnit) { if ($partUnit === null) {
return ''; return '';
} }
@ -184,7 +184,7 @@ final class PartsDataTable implements DataTableTypeInterface
'label' => $this->translator->trans('part.table.manufacturingStatus'), 'label' => $this->translator->trans('part.table.manufacturingStatus'),
'class' => ManufacturingStatus::class, 'class' => ManufacturingStatus::class,
'render' => function (?ManufacturingStatus $status, Part $context): string { 'render' => function (?ManufacturingStatus $status, Part $context): string {
if (!$status) { if ($status === null) {
return ''; return '';
} }

6
src/DataTables/ProjectBomEntriesDataTable.php
View file

@ -85,7 +85,7 @@ class ProjectBomEntriesDataTable implements DataTableTypeInterface
'orderField' => 'NATSORT(part.name)', 'orderField' => 'NATSORT(part.name)',
'render' => function ($value, ProjectBOMEntry $context) { 'render' => function ($value, ProjectBOMEntry $context) {
if(!$context->getPart() instanceof Part) { if(!$context->getPart() instanceof Part) {
return htmlspecialchars($context->getName()); return htmlspecialchars((string) $context->getName());
} }
if($context->getPart() instanceof Part) { if($context->getPart() instanceof Part) {
$tmp = $this->partDataTableHelper->renderName($context->getPart()); $tmp = $this->partDataTableHelper->renderName($context->getPart());
@ -154,7 +154,7 @@ class ProjectBomEntriesDataTable implements DataTableTypeInterface
'label' => 'project.bom.instockAmount', 'label' => 'project.bom.instockAmount',
'visible' => false, 'visible' => false,
'render' => function ($value, ProjectBOMEntry $context) { 'render' => function ($value, ProjectBOMEntry $context) {
if ($context->getPart()) { if ($context->getPart() !== null) {
return $this->partDataTableHelper->renderAmount($context->getPart()); return $this->partDataTableHelper->renderAmount($context->getPart());
} }
@ -165,7 +165,7 @@ class ProjectBomEntriesDataTable implements DataTableTypeInterface
'label' => 'part.table.storeLocations', 'label' => 'part.table.storeLocations',
'visible' => false, 'visible' => false,
'render' => function ($value, ProjectBOMEntry $context) { 'render' => function ($value, ProjectBOMEntry $context) {
if ($context->getPart()) { if ($context->getPart() !== null) {
return $this->partDataTableHelper->renderStorageLocations($context->getPart()); return $this->partDataTableHelper->renderStorageLocations($context->getPart());
} }

13
src/Doctrine/Functions/Field2.php
View file

@ -23,6 +23,8 @@ declare(strict_types=1);
namespace App\Doctrine\Functions; namespace App\Doctrine\Functions;
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
use Doctrine\ORM\Query\AST\Functions\FunctionNode; use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\TokenType; use Doctrine\ORM\Query\TokenType;
@ -36,7 +38,7 @@ class Field2 extends FunctionNode
private $values = []; private $values = [];
public function parse(\Doctrine\ORM\Query\Parser $parser): void public function parse(Parser $parser): void
{ {
$parser->match(TokenType::T_IDENTIFIER); $parser->match(TokenType::T_IDENTIFIER);
$parser->match(TokenType::T_OPEN_PARENTHESIS); $parser->match(TokenType::T_OPEN_PARENTHESIS);
@ -58,15 +60,16 @@ class Field2 extends FunctionNode
$parser->match(TokenType::T_CLOSE_PARENTHESIS); $parser->match(TokenType::T_CLOSE_PARENTHESIS);
} }
public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string public function getSql(SqlWalker $sqlWalker): string
{ {
$query = 'FIELD2('; $query = 'FIELD2(';
$query .= $this->field->dispatch($sqlWalker); $query .= $this->field->dispatch($sqlWalker);
$query .= ', '; $query .= ', ';
$counter = count($this->values);
for ($i = 0; $i < count($this->values); $i++) { for ($i = 0; $i < $counter; $i++) {
if ($i > 0) { if ($i > 0) {
$query .= ', '; $query .= ', ';
} }
@ -74,8 +77,6 @@ class Field2 extends FunctionNode
$query .= $this->values[$i]->dispatch($sqlWalker); $query .= $this->values[$i]->dispatch($sqlWalker);
} }
$query .= ')'; return $query . ')';
return $query;
} }
} }

7
src/Doctrine/Functions/Natsort.php
View file

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace App\Doctrine\Functions; namespace App\Doctrine\Functions;
use Doctrine\DBAL\Exception;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Driver\AbstractPostgreSQLDriver; use Doctrine\DBAL\Driver\AbstractPostgreSQLDriver;
use Doctrine\DBAL\Platforms\AbstractMySQLPlatform; use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
@ -59,9 +60,9 @@ class Natsort extends FunctionNode
* The result is cached in memory. * The result is cached in memory.
* @param Connection $connection * @param Connection $connection
* @return bool * @return bool
* @throws \Doctrine\DBAL\Exception * @throws Exception
*/ */
private static function mariaDBSupportsNaturalSort(Connection $connection): bool private function mariaDBSupportsNaturalSort(Connection $connection): bool
{ {
if (self::$supportsNaturalSort !== null) { if (self::$supportsNaturalSort !== null) {
return self::$supportsNaturalSort; return self::$supportsNaturalSort;
@ -95,7 +96,7 @@ class Natsort extends FunctionNode
return $this->field->dispatch($sqlWalker) . ' COLLATE numeric'; return $this->field->dispatch($sqlWalker) . ' COLLATE numeric';
} }
if ($platform instanceof MariaDBPlatform && self::mariaDBSupportsNaturalSort($sqlWalker->getConnection())) { if ($platform instanceof MariaDBPlatform && $this->mariaDBSupportsNaturalSort($sqlWalker->getConnection())) {
return 'NATURAL_SORT_KEY(' . $this->field->dispatch($sqlWalker) . ')'; return 'NATURAL_SORT_KEY(' . $this->field->dispatch($sqlWalker) . ')';
} }

2
src/Doctrine/Helpers/FieldHelper.php
View file

@ -109,7 +109,7 @@ final class FieldHelper
//If we are on MySQL, we can just use the FIELD function //If we are on MySQL, we can just use the FIELD function
if ($db_platform instanceof AbstractMySQLPlatform) { if ($db_platform instanceof AbstractMySQLPlatform) {
$qb->orderBy("FIELD2($field_expr, :field_arr)", $order); $qb->orderBy("FIELD2($field_expr, :field_arr)", $order);
} else if ($db_platform instanceof PostgreSQLPlatform) { } elseif ($db_platform instanceof PostgreSQLPlatform) {
//Use the postgres native array_position function //Use the postgres native array_position function
self::addPostgresOrderBy($qb, $field_expr, $key, $values, $order); self::addPostgresOrderBy($qb, $field_expr, $key, $values, $order);
} else { } else {

3
src/Doctrine/Middleware/SQLiteRegexExtensionMiddlewareDriver.php
View file

@ -98,10 +98,9 @@ class SQLiteRegexExtensionMiddlewareDriver extends AbstractDriverMiddleware
* This function returns the index (position) of the first argument in the subsequent arguments. * This function returns the index (position) of the first argument in the subsequent arguments.
* If the first argument is not found or is NULL, 0 is returned. * If the first argument is not found or is NULL, 0 is returned.
* @param string|int|null $value * @param string|int|null $value
* @param mixed ...$array
* @return int * @return int
*/ */
final public static function field(string|int|null $value, ...$array): int final public static function field(string|int|null $value, mixed ...$array): int
{ {
if ($value === null) { if ($value === null) {
return 0; return 0;

5
src/Entity/Attachments/Attachment.php
View file

@ -385,7 +385,7 @@ abstract class Attachment extends AbstractNamedDBElement
return null; return null;
} }
return parse_url($this->getURL(), PHP_URL_HOST); return parse_url((string) $this->getURL(), PHP_URL_HOST);
} }
/** /**
@ -477,7 +477,8 @@ abstract class Attachment extends AbstractNamedDBElement
*/ */
public function setElement(AttachmentContainingDBElement $element): self public function setElement(AttachmentContainingDBElement $element): self
{ {
if (!is_a($element, static::ALLOWED_ELEMENT_CLASS)) { //Do not allow Rector to replace this check with a instanceof. It will not work!!
if (!is_a($element, static::ALLOWED_ELEMENT_CLASS, true)) {
throw new InvalidArgumentException(sprintf('The element associated with a %s must be a %s!', static::class, static::ALLOWED_ELEMENT_CLASS)); throw new InvalidArgumentException(sprintf('The element associated with a %s must be a %s!', static::class, static::ALLOWED_ELEMENT_CLASS));
} }

7
src/Entity/Attachments/AttachmentType.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\Attachments; namespace App\Entity\Attachments;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
@ -86,7 +87,7 @@ use Symfony\Component\Validator\Constraints as Assert;
class AttachmentType extends AbstractStructuralDBElement class AttachmentType extends AbstractStructuralDBElement
{ {
#[ORM\OneToMany(mappedBy: 'parent', targetEntity: AttachmentType::class, cascade: ['persist'])] #[ORM\OneToMany(mappedBy: 'parent', targetEntity: AttachmentType::class, cascade: ['persist'])]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $children; protected Collection $children;
#[ORM\ManyToOne(targetEntity: AttachmentType::class, inversedBy: 'children')] #[ORM\ManyToOne(targetEntity: AttachmentType::class, inversedBy: 'children')]
@ -110,7 +111,7 @@ class AttachmentType extends AbstractStructuralDBElement
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: AttachmentTypeAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: AttachmentTypeAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
#[Groups(['attachment_type:read', 'attachment_type:write'])] #[Groups(['attachment_type:read', 'attachment_type:write'])]
protected Collection $attachments; protected Collection $attachments;
@ -123,7 +124,7 @@ class AttachmentType extends AbstractStructuralDBElement
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: AttachmentTypeParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: AttachmentTypeParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
#[Groups(['attachment_type:read', 'attachment_type:write'])] #[Groups(['attachment_type:read', 'attachment_type:write'])]
protected Collection $parameters; protected Collection $parameters;

4
src/Entity/LabelSystem/BarcodeType.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Entity\LabelSystem; namespace App\Entity\LabelSystem;
enum BarcodeType: string enum BarcodeType: string

6
src/Entity/LabelSystem/LabelPictureType.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Entity\LabelSystem; namespace App\Entity\LabelSystem;
enum LabelPictureType: string enum LabelPictureType: string
@ -34,4 +36,4 @@ enum LabelPictureType: string
* Show the main attachment of the element on the label * Show the main attachment of the element on the label
*/ */
case MAIN_ATTACHMENT = 'main_attachment'; case MAIN_ATTACHMENT = 'main_attachment';
} }

6
src/Entity/LabelSystem/LabelProcessMode.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Entity\LabelSystem; namespace App\Entity\LabelSystem;
enum LabelProcessMode: string enum LabelProcessMode: string
@ -26,4 +28,4 @@ enum LabelProcessMode: string
case PLACEHOLDER = 'html'; case PLACEHOLDER = 'html';
/** Interpret the given lines as twig template */ /** Interpret the given lines as twig template */
case TWIG = 'twig'; case TWIG = 'twig';
} }

3
src/Entity/LabelSystem/LabelProfile.php
View file

@ -41,6 +41,7 @@ declare(strict_types=1);
namespace App\Entity\LabelSystem; namespace App\Entity\LabelSystem;
use Doctrine\Common\Collections\Criteria;
use App\Entity\Attachments\Attachment; use App\Entity\Attachments\Attachment;
use App\Repository\LabelProfileRepository; use App\Repository\LabelProfileRepository;
use App\EntityListeners\TreeCacheInvalidationListener; use App\EntityListeners\TreeCacheInvalidationListener;
@ -66,7 +67,7 @@ class LabelProfile extends AttachmentContainingDBElement
* @var Collection<int, LabelAttachment> * @var Collection<int, LabelAttachment>
*/ */
#[ORM\OneToMany(mappedBy: 'element', targetEntity: LabelAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: LabelAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $attachments; protected Collection $attachments;
#[ORM\ManyToOne(targetEntity: LabelAttachment::class)] #[ORM\ManyToOne(targetEntity: LabelAttachment::class)]

6
src/Entity/LabelSystem/LabelSupportedElement.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Entity\LabelSystem; namespace App\Entity\LabelSystem;
use App\Entity\Parts\Part; use App\Entity\Parts\Part;
@ -42,4 +44,4 @@ enum LabelSupportedElement: string
self::STORELOCATION => StorageLocation::class, self::STORELOCATION => StorageLocation::class,
}; };
} }
} }

5
src/Entity/LogSystem/AbstractLogEntry.php
View file

@ -55,10 +55,11 @@ abstract class AbstractLogEntry extends AbstractDBElement
#[ORM\Column(type: Types::STRING)] #[ORM\Column(type: Types::STRING)]
protected string $username = ''; protected string $username = '';
/** @var \DateTime The datetime the event associated with this log entry has occured /**
* @var \DateTimeInterface The datetime the event associated with this log entry has occured
*/ */
#[ORM\Column(name: 'datetime', type: Types::DATETIME_MUTABLE)] #[ORM\Column(name: 'datetime', type: Types::DATETIME_MUTABLE)]
protected \DateTime $timestamp; protected \DateTimeInterface $timestamp;
/** /**
* @var LogLevel The priority level of the associated level. 0 is highest, 7 lowest * @var LogLevel The priority level of the associated level. 0 is highest, 7 lowest

4
src/Entity/LogSystem/LogLevel.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Entity\LogSystem; namespace App\Entity\LogSystem;
use Psr\Log\LogLevel as PSRLogLevel; use Psr\Log\LogLevel as PSRLogLevel;

6
src/Entity/LogSystem/LogTargetType.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Entity\LogSystem; namespace App\Entity\LogSystem;
use App\Entity\Attachments\Attachment; use App\Entity\Attachments\Attachment;
@ -120,7 +122,7 @@ enum LogTargetType: int
} }
} }
$elementClass = is_object($element) ? get_class($element) : $element; $elementClass = is_object($element) ? $element::class : $element;
//If no matching type was found, throw an exception //If no matching type was found, throw an exception
throw new \InvalidArgumentException("The given class $elementClass is not a valid log target type."); throw new \InvalidArgumentException("The given class $elementClass is not a valid log target type.");
} }

6
src/Entity/LogSystem/LogWithEventUndoTrait.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Entity\LogSystem; namespace App\Entity\LogSystem;
use App\Entity\Contracts\LogWithEventUndoInterface; use App\Entity\Contracts\LogWithEventUndoInterface;
@ -48,4 +50,4 @@ trait LogWithEventUndoTrait
$mode_int = $this->extra['um'] ?? 1; $mode_int = $this->extra['um'] ?? 1;
return EventUndoMode::fromExtraInt($mode_int); return EventUndoMode::fromExtraInt($mode_int);
} }
} }

6
src/Entity/LogSystem/PartStockChangeType.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Entity\LogSystem; namespace App\Entity\LogSystem;
enum PartStockChangeType: string enum PartStockChangeType: string
@ -53,4 +55,4 @@ enum PartStockChangeType: string
default => throw new \InvalidArgumentException("Invalid short type: $value"), default => throw new \InvalidArgumentException("Invalid short type: $value"),
}; };
} }
} }

2
src/Entity/LogSystem/PartStockChangedLogEntry.php
View file

@ -52,8 +52,6 @@ class PartStockChangedLogEntry extends AbstractLogEntry
$this->level = LogLevel::INFO; $this->level = LogLevel::INFO;
$this->setTargetElement($lot); $this->setTargetElement($lot);
$this->typeString = 'part_stock_changed';
$this->extra = array_merge($this->extra, [ $this->extra = array_merge($this->extra, [
't' => $type->toExtraShortType(), 't' => $type->toExtraShortType(),
'o' => $old_stock, 'o' => $old_stock,

4
src/Entity/OAuthToken.php
View file

@ -38,7 +38,7 @@ use League\OAuth2\Client\Token\AccessTokenInterface;
class OAuthToken extends AbstractNamedDBElement implements AccessTokenInterface class OAuthToken extends AbstractNamedDBElement implements AccessTokenInterface
{ {
/** @var string|null The short-term usable OAuth2 token */ /** @var string|null The short-term usable OAuth2 token */
#[ORM\Column(type: 'text', nullable: true)] #[ORM\Column(type: Types::TEXT, nullable: true)]
private ?string $token = null; private ?string $token = null;
/** @var \DateTimeImmutable|null The date when the token expires */ /** @var \DateTimeImmutable|null The date when the token expires */
@ -46,7 +46,7 @@ class OAuthToken extends AbstractNamedDBElement implements AccessTokenInterface
private ?\DateTimeImmutable $expires_at = null; private ?\DateTimeImmutable $expires_at = null;
/** @var string|null The refresh token for the OAuth2 auth */ /** @var string|null The refresh token for the OAuth2 auth */
#[ORM\Column(type: 'text', nullable: true)] #[ORM\Column(type: Types::TEXT, nullable: true)]
private ?string $refresh_token = null; private ?string $refresh_token = null;
/** /**

7
src/Entity/Parts/Category.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\Parts; namespace App\Entity\Parts;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
@ -91,7 +92,7 @@ use Symfony\Component\Validator\Constraints as Assert;
class Category extends AbstractPartsContainingDBElement class Category extends AbstractPartsContainingDBElement
{ {
#[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)] #[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $children; protected Collection $children;
#[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')] #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
@ -165,7 +166,7 @@ class Category extends AbstractPartsContainingDBElement
#[Assert\Valid] #[Assert\Valid]
#[Groups(['full', 'category:read', 'category:write'])] #[Groups(['full', 'category:read', 'category:write'])]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: CategoryAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: CategoryAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $attachments; protected Collection $attachments;
#[ORM\ManyToOne(targetEntity: CategoryAttachment::class)] #[ORM\ManyToOne(targetEntity: CategoryAttachment::class)]
@ -178,7 +179,7 @@ class Category extends AbstractPartsContainingDBElement
#[Assert\Valid] #[Assert\Valid]
#[Groups(['full', 'category:read', 'category:write'])] #[Groups(['full', 'category:read', 'category:write'])]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: CategoryParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: CategoryParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
protected Collection $parameters; protected Collection $parameters;
#[Groups(['category:read'])] #[Groups(['category:read'])]

7
src/Entity/Parts/Footprint.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\Parts; namespace App\Entity\Parts;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
@ -96,7 +97,7 @@ class Footprint extends AbstractPartsContainingDBElement
protected ?AbstractStructuralDBElement $parent = null; protected ?AbstractStructuralDBElement $parent = null;
#[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)] #[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $children; protected Collection $children;
#[Groups(['footprint:read', 'footprint:write'])] #[Groups(['footprint:read', 'footprint:write'])]
@ -107,7 +108,7 @@ class Footprint extends AbstractPartsContainingDBElement
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: FootprintAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: FootprintAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
#[Groups(['footprint:read', 'footprint:write'])] #[Groups(['footprint:read', 'footprint:write'])]
protected Collection $attachments; protected Collection $attachments;
@ -128,7 +129,7 @@ class Footprint extends AbstractPartsContainingDBElement
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: FootprintParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: FootprintParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
#[Groups(['footprint:read', 'footprint:write'])] #[Groups(['footprint:read', 'footprint:write'])]
protected Collection $parameters; protected Collection $parameters;

7
src/Entity/Parts/InfoProviderReference.php
View file

@ -31,25 +31,26 @@ use Symfony\Component\Serializer\Annotation\Groups;
/** /**
* This class represents a reference to a info provider inside a part. * This class represents a reference to a info provider inside a part.
* @see \App\Tests\Entity\Parts\InfoProviderReferenceTest
*/ */
#[Embeddable] #[Embeddable]
class InfoProviderReference class InfoProviderReference
{ {
/** @var string|null The key referencing the provider used to get this part, or null if it was not provided by a data provider */ /** @var string|null The key referencing the provider used to get this part, or null if it was not provided by a data provider */
#[Column(type: 'string', nullable: true)] #[Column(type: Types::STRING, nullable: true)]
#[Groups(['provider_reference:read'])] #[Groups(['provider_reference:read'])]
private ?string $provider_key = null; private ?string $provider_key = null;
/** @var string|null The id of this part inside the provider system or null if the part was not provided by a data provider */ /** @var string|null The id of this part inside the provider system or null if the part was not provided by a data provider */
#[Column(type: 'string', nullable: true)] #[Column(type: Types::STRING, nullable: true)]
#[Groups(['provider_reference:read'])] #[Groups(['provider_reference:read'])]
private ?string $provider_id = null; private ?string $provider_id = null;
/** /**
* @var string|null The url of this part inside the provider system or null if this info is not existing * @var string|null The url of this part inside the provider system or null if this info is not existing
*/ */
#[Column(type: 'string', nullable: true)] #[Column(type: Types::STRING, nullable: true)]
#[Groups(['provider_reference:read'])] #[Groups(['provider_reference:read'])]
private ?string $provider_url = null; private ?string $provider_url = null;

7
src/Entity/Parts/Manufacturer.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\Parts; namespace App\Entity\Parts;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
@ -95,7 +96,7 @@ class Manufacturer extends AbstractCompany
protected ?AbstractStructuralDBElement $parent = null; protected ?AbstractStructuralDBElement $parent = null;
#[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)] #[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $children; protected Collection $children;
/** /**
@ -103,7 +104,7 @@ class Manufacturer extends AbstractCompany
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: ManufacturerAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: ManufacturerAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
#[Groups(['manufacturer:read', 'manufacturer:write'])] #[Groups(['manufacturer:read', 'manufacturer:write'])]
#[ApiProperty(readableLink: false, writableLink: true)] #[ApiProperty(readableLink: false, writableLink: true)]
protected Collection $attachments; protected Collection $attachments;
@ -118,7 +119,7 @@ class Manufacturer extends AbstractCompany
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: ManufacturerParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: ManufacturerParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
#[Groups(['manufacturer:read', 'manufacturer:write'])] #[Groups(['manufacturer:read', 'manufacturer:write'])]
#[ApiProperty(readableLink: false, writableLink: true)] #[ApiProperty(readableLink: false, writableLink: true)]
protected Collection $parameters; protected Collection $parameters;

7
src/Entity/Parts/MeasurementUnit.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\Parts; namespace App\Entity\Parts;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
@ -123,7 +124,7 @@ class MeasurementUnit extends AbstractPartsContainingDBElement
protected bool $use_si_prefix = false; protected bool $use_si_prefix = false;
#[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class, cascade: ['persist'])] #[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class, cascade: ['persist'])]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $children; protected Collection $children;
#[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')] #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
@ -137,7 +138,7 @@ class MeasurementUnit extends AbstractPartsContainingDBElement
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: MeasurementUnitAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: MeasurementUnitAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
#[Groups(['measurement_unit:read', 'measurement_unit:write'])] #[Groups(['measurement_unit:read', 'measurement_unit:write'])]
protected Collection $attachments; protected Collection $attachments;
@ -150,7 +151,7 @@ class MeasurementUnit extends AbstractPartsContainingDBElement
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: MeasurementUnitParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: MeasurementUnitParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
#[Groups(['measurement_unit:read', 'measurement_unit:write'])] #[Groups(['measurement_unit:read', 'measurement_unit:write'])]
protected Collection $parameters; protected Collection $parameters;

5
src/Entity/Parts/Part.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\Parts; namespace App\Entity\Parts;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter; use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
@ -119,7 +120,7 @@ class Part extends AttachmentContainingDBElement
#[Assert\Valid] #[Assert\Valid]
#[Groups(['full', 'part:read', 'part:write'])] #[Groups(['full', 'part:read', 'part:write'])]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: PartParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: PartParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
#[UniqueObjectCollection(fields: ['name', 'group', 'element'])] #[UniqueObjectCollection(fields: ['name', 'group', 'element'])]
protected Collection $parameters; protected Collection $parameters;
@ -140,7 +141,7 @@ class Part extends AttachmentContainingDBElement
#[Assert\Valid] #[Assert\Valid]
#[Groups(['full', 'part:read', 'part:write'])] #[Groups(['full', 'part:read', 'part:write'])]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: PartAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: PartAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $attachments; protected Collection $attachments;
/** /**

1
src/Entity/Parts/PartAssociation.php
View file

@ -49,6 +49,7 @@ use Symfony\Component\Validator\Constraints\Length;
/** /**
* This entity describes a part association, which is a semantic connection between two parts. * This entity describes a part association, which is a semantic connection between two parts.
* For example, a part association can be used to describe that a part is a replacement for another part. * For example, a part association can be used to describe that a part is a replacement for another part.
* @see \App\Tests\Entity\Parts\PartAssociationTest
*/ */
#[ORM\Entity(repositoryClass: DBElementRepository::class)] #[ORM\Entity(repositoryClass: DBElementRepository::class)]
#[ORM\HasLifecycleCallbacks] #[ORM\HasLifecycleCallbacks]

3
src/Entity/Parts/PartTraits/InstockTrait.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\Parts\PartTraits; namespace App\Entity\Parts\PartTraits;
use Doctrine\Common\Collections\Criteria;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use App\Entity\Parts\MeasurementUnit; use App\Entity\Parts\MeasurementUnit;
use App\Entity\Parts\PartLot; use App\Entity\Parts\PartLot;
@ -42,7 +43,7 @@ trait InstockTrait
#[Assert\Valid] #[Assert\Valid]
#[Groups(['extended', 'full', 'import', 'part:read', 'part:write'])] #[Groups(['extended', 'full', 'import', 'part:read', 'part:write'])]
#[ORM\OneToMany(mappedBy: 'part', targetEntity: PartLot::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'part', targetEntity: PartLot::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['amount' => 'DESC'])] #[ORM\OrderBy(['amount' => Criteria::DESC])]
protected Collection $partLots; protected Collection $partLots;
/** /**

3
src/Entity/Parts/PartTraits/OrderTrait.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\Parts\PartTraits; namespace App\Entity\Parts\PartTraits;
use Doctrine\Common\Collections\Criteria;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
use App\Entity\PriceInformations\Orderdetail; use App\Entity\PriceInformations\Orderdetail;
use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Serializer\Annotation\Groups;
@ -41,7 +42,7 @@ trait OrderTrait
#[Assert\Valid] #[Assert\Valid]
#[Groups(['extended', 'full', 'import', 'part:read', 'part:write'])] #[Groups(['extended', 'full', 'import', 'part:read', 'part:write'])]
#[ORM\OneToMany(mappedBy: 'part', targetEntity: Orderdetail::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'part', targetEntity: Orderdetail::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['supplierpartnr' => 'ASC'])] #[ORM\OrderBy(['supplierpartnr' => Criteria::ASC])]
protected Collection $orderdetails; protected Collection $orderdetails;
/** /**

5
src/Entity/Parts/StorageLocation.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\Parts; namespace App\Entity\Parts;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
@ -90,7 +91,7 @@ use Symfony\Component\Validator\Constraints as Assert;
class StorageLocation extends AbstractPartsContainingDBElement class StorageLocation extends AbstractPartsContainingDBElement
{ {
#[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)] #[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $children; protected Collection $children;
#[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')] #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
@ -114,7 +115,7 @@ class StorageLocation extends AbstractPartsContainingDBElement
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: StorageLocationParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: StorageLocationParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
#[Groups(['location:read', 'location:write'])] #[Groups(['location:read', 'location:write'])]
protected Collection $parameters; protected Collection $parameters;

7
src/Entity/Parts/Supplier.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\Parts; namespace App\Entity\Parts;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
@ -92,7 +93,7 @@ use Symfony\Component\Validator\Constraints as Assert;
class Supplier extends AbstractCompany class Supplier extends AbstractCompany
{ {
#[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)] #[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $children; protected Collection $children;
#[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')] #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
@ -129,7 +130,7 @@ class Supplier extends AbstractCompany
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: SupplierAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: SupplierAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
#[Groups(['supplier:read', 'supplier:write'])] #[Groups(['supplier:read', 'supplier:write'])]
#[ApiProperty(readableLink: false, writableLink: true)] #[ApiProperty(readableLink: false, writableLink: true)]
protected Collection $attachments; protected Collection $attachments;
@ -144,7 +145,7 @@ class Supplier extends AbstractCompany
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: SupplierParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: SupplierParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
#[Groups(['supplier:read', 'supplier:write'])] #[Groups(['supplier:read', 'supplier:write'])]
#[ApiProperty(readableLink: false, writableLink: true)] #[ApiProperty(readableLink: false, writableLink: true)]
protected Collection $parameters; protected Collection $parameters;

7
src/Entity/PriceInformations/Currency.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\PriceInformations; namespace App\Entity\PriceInformations;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
@ -118,7 +119,7 @@ class Currency extends AbstractStructuralDBElement
protected string $iso_code = ""; protected string $iso_code = "";
#[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class, cascade: ['persist'])] #[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class, cascade: ['persist'])]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $children; protected Collection $children;
#[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')] #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
@ -132,7 +133,7 @@ class Currency extends AbstractStructuralDBElement
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: CurrencyAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: CurrencyAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
#[Groups(['currency:read', 'currency:write'])] #[Groups(['currency:read', 'currency:write'])]
protected Collection $attachments; protected Collection $attachments;
@ -145,7 +146,7 @@ class Currency extends AbstractStructuralDBElement
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: CurrencyParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: CurrencyParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
#[Groups(['currency:read', 'currency:write'])] #[Groups(['currency:read', 'currency:write'])]
protected Collection $parameters; protected Collection $parameters;

6
src/Entity/PriceInformations/Orderdetail.php
View file

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace App\Entity\PriceInformations; namespace App\Entity\PriceInformations;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter; use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
@ -96,10 +97,13 @@ class Orderdetail extends AbstractDBElement implements TimeStampableInterface, N
{ {
use TimestampTrait; use TimestampTrait;
/**
* @var Collection<int, Pricedetail>
*/
#[Assert\Valid] #[Assert\Valid]
#[Groups(['extended', 'full', 'import', 'orderdetail:read', 'orderdetail:write'])] #[Groups(['extended', 'full', 'import', 'orderdetail:read', 'orderdetail:write'])]
#[ORM\OneToMany(mappedBy: 'orderdetail', targetEntity: Pricedetail::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'orderdetail', targetEntity: Pricedetail::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['min_discount_quantity' => 'ASC'])] #[ORM\OrderBy(['min_discount_quantity' => Criteria::ASC])]
protected Collection $pricedetails; protected Collection $pricedetails;
/** /**

10
src/Entity/ProjectSystem/Project.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\ProjectSystem; namespace App\Entity\ProjectSystem;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
use ApiPlatform\Metadata\ApiFilter; use ApiPlatform\Metadata\ApiFilter;
use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\ApiProperty;
@ -88,7 +89,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
class Project extends AbstractStructuralDBElement class Project extends AbstractStructuralDBElement
{ {
#[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)] #[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $children; protected Collection $children;
#[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')] #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
@ -100,6 +101,9 @@ class Project extends AbstractStructuralDBElement
#[Groups(['project:read', 'project:write'])] #[Groups(['project:read', 'project:write'])]
protected string $comment = ''; protected string $comment = '';
/**
* @var Collection<int, ProjectBOMEntry>
*/
#[Assert\Valid] #[Assert\Valid]
#[Groups(['extended', 'full'])] #[Groups(['extended', 'full'])]
#[ORM\OneToMany(mappedBy: 'project', targetEntity: ProjectBOMEntry::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'project', targetEntity: ProjectBOMEntry::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
@ -137,7 +141,7 @@ class Project extends AbstractStructuralDBElement
* @var Collection<int, ProjectAttachment> * @var Collection<int, ProjectAttachment>
*/ */
#[ORM\OneToMany(mappedBy: 'element', targetEntity: ProjectAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: ProjectAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
#[Groups(['project:read', 'project:write'])] #[Groups(['project:read', 'project:write'])]
protected Collection $attachments; protected Collection $attachments;
@ -149,7 +153,7 @@ class Project extends AbstractStructuralDBElement
/** @var Collection<int, ProjectParameter> /** @var Collection<int, ProjectParameter>
*/ */
#[ORM\OneToMany(mappedBy: 'element', targetEntity: ProjectParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: ProjectParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
#[Groups(['project:read', 'project:write'])] #[Groups(['project:read', 'project:write'])]
protected Collection $parameters; protected Collection $parameters;

7
src/Entity/UserSystem/Group.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\UserSystem; namespace App\Entity\UserSystem;
use Doctrine\Common\Collections\Criteria;
use App\Entity\Attachments\Attachment; use App\Entity\Attachments\Attachment;
use App\Validator\Constraints\NoLockout; use App\Validator\Constraints\NoLockout;
use Doctrine\DBAL\Types\Types; use Doctrine\DBAL\Types\Types;
@ -49,7 +50,7 @@ use Symfony\Component\Validator\Constraints as Assert;
class Group extends AbstractStructuralDBElement implements HasPermissionsInterface class Group extends AbstractStructuralDBElement implements HasPermissionsInterface
{ {
#[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)] #[ORM\OneToMany(mappedBy: 'parent', targetEntity: self::class)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $children; protected Collection $children;
#[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')] #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
@ -74,7 +75,7 @@ class Group extends AbstractStructuralDBElement implements HasPermissionsInterfa
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: GroupAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: GroupAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
protected Collection $attachments; protected Collection $attachments;
#[ORM\ManyToOne(targetEntity: GroupAttachment::class)] #[ORM\ManyToOne(targetEntity: GroupAttachment::class)]
@ -91,7 +92,7 @@ class Group extends AbstractStructuralDBElement implements HasPermissionsInterfa
*/ */
#[Assert\Valid] #[Assert\Valid]
#[ORM\OneToMany(mappedBy: 'element', targetEntity: GroupParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: GroupParameter::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])] #[ORM\OrderBy(['group' => Criteria::ASC, 'name' => 'ASC'])]
protected Collection $parameters; protected Collection $parameters;
public function __construct() public function __construct()

3
src/Entity/UserSystem/User.php
View file

@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Entity\UserSystem; namespace App\Entity\UserSystem;
use Doctrine\Common\Collections\Criteria;
use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface;
use ApiPlatform\Doctrine\Orm\Filter\DateFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
use ApiPlatform\Doctrine\Orm\Filter\OrderFilter; use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
@ -267,7 +268,7 @@ class User extends AttachmentContainingDBElement implements UserInterface, HasPe
* @var Collection<int, UserAttachment> * @var Collection<int, UserAttachment>
*/ */
#[ORM\OneToMany(mappedBy: 'element', targetEntity: UserAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(mappedBy: 'element', targetEntity: UserAttachment::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => Criteria::ASC])]
#[Groups(['user:read', 'user:write'])] #[Groups(['user:read', 'user:write'])]
protected Collection $attachments; protected Collection $attachments;

2
src/Form/AttachmentFormType.php
View file

@ -142,7 +142,7 @@ class AttachmentFormType extends AbstractType
if (!$file instanceof UploadedFile) { if (!$file instanceof UploadedFile) {
//When no file was uploaded, but a URL was entered, try to determine the attachment name from the URL //When no file was uploaded, but a URL was entered, try to determine the attachment name from the URL
if (empty($attachment->getName()) && !empty($attachment->getURL())) { if ((trim($attachment->getName()) === '') && ($attachment->getURL() !== null && $attachment->getURL() !== '')) {
$name = basename(parse_url($attachment->getURL(), PHP_URL_PATH)); $name = basename(parse_url($attachment->getURL(), PHP_URL_PATH));
$attachment->setName($name); $attachment->setName($name);
} }

6
src/Form/PasswordTypeExtension.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Form; namespace App\Form;
use Symfony\Component\Form\AbstractTypeExtension; use Symfony\Component\Form\AbstractTypeExtension;
@ -51,4 +53,4 @@ class PasswordTypeExtension extends AbstractTypeExtension
$view->vars['password_estimator'] = $options['password_estimator']; $view->vars['password_estimator'] = $options['password_estimator'];
} }
} }

4
src/Form/Permissions/PermissionsType.php
View file

@ -45,9 +45,7 @@ class PermissionsType extends AbstractType
$resolver->setDefaults([ $resolver->setDefaults([
'show_legend' => true, 'show_legend' => true,
'show_presets' => false, 'show_presets' => false,
'show_dependency_notice' => static function (Options $options) { 'show_dependency_notice' => static fn(Options $options) => !$options['disabled'],
return !$options['disabled'];
},
'constraints' => static function (Options $options) { 'constraints' => static function (Options $options) {
if (!$options['disabled']) { if (!$options['disabled']) {
return [new NoLockout()]; return [new NoLockout()];

6
src/Form/ProjectSystem/ProjectAddPartsType.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Form\ProjectSystem; namespace App\Form\ProjectSystem;
use App\Entity\ProjectSystem\Project; use App\Entity\ProjectSystem\Project;
@ -83,4 +85,4 @@ class ProjectAddPartsType extends AbstractType
$resolver->setAllowedTypes('project', ['null', Project::class]); $resolver->setAllowedTypes('project', ['null', Project::class]);
} }
} }

2
src/Form/Type/Helper/StructuralEntityChoiceHelper.php
View file

@ -100,7 +100,7 @@ class StructuralEntityChoiceHelper
public function generateChoiceAttrCurrency(Currency $choice, Options|array $options): array public function generateChoiceAttrCurrency(Currency $choice, Options|array $options): array
{ {
$tmp = $this->generateChoiceAttr($choice, $options); $tmp = $this->generateChoiceAttr($choice, $options);
$symbol = empty($choice->getIsoCode()) ? null : Currencies::getSymbol($choice->getIsoCode()); $symbol = $choice->getIsoCode() === '' ? null : Currencies::getSymbol($choice->getIsoCode());
$tmp['data-short'] = $options['short'] ? $symbol : $choice->getName(); $tmp['data-short'] = $options['short'] ? $symbol : $choice->getName();
//Show entities that are not added to DB yet separately from other entities //Show entities that are not added to DB yet separately from other entities

8
src/Form/Type/Helper/StructuralEntityChoiceLoader.php
View file

@ -52,11 +52,7 @@ class StructuralEntityChoiceLoader extends AbstractChoiceLoader
protected function loadChoices(): iterable protected function loadChoices(): iterable
{ {
//If the starting_element is set and not persisted yet, add it to the list //If the starting_element is set and not persisted yet, add it to the list
if ($this->starting_element !== null && $this->starting_element->getID() === null) { $tmp = $this->starting_element !== null && $this->starting_element->getID() === null ? [$this->starting_element] : [];
$tmp = [$this->starting_element];
} else {
$tmp = [];
}
if ($this->additional_element) { if ($this->additional_element) {
$tmp = $this->createNewEntitiesFromValue($this->additional_element); $tmp = $this->createNewEntitiesFromValue($this->additional_element);
@ -163,7 +159,7 @@ class StructuralEntityChoiceLoader extends AbstractChoiceLoader
// the same as the value that is generated for the same entity after it is persisted. // the same as the value that is generated for the same entity after it is persisted.
// Otherwise, errors occurs that the element could not be found. // Otherwise, errors occurs that the element could not be found.
foreach ($values as &$data) { foreach ($values as &$data) {
$data = trim($data); $data = trim((string) $data);
$data = preg_replace('/\s*->\s*/', '->', $data); $data = preg_replace('/\s*->\s*/', '->', $data);
} }
unset ($data); unset ($data);

8
src/Form/Type/StructuralEntityType.php
View file

@ -108,12 +108,8 @@ class StructuralEntityType extends AbstractType
$resolver->setDefault('dto_value', null); $resolver->setDefault('dto_value', null);
$resolver->setAllowedTypes('dto_value', ['null', 'string']); $resolver->setAllowedTypes('dto_value', ['null', 'string']);
//If no help text is explicitly set, we use the dto value as help text and show it as html //If no help text is explicitly set, we use the dto value as help text and show it as html
$resolver->setDefault('help', function (Options $options) { $resolver->setDefault('help', fn(Options $options) => $this->dtoText($options['dto_value']));
return $this->dtoText($options['dto_value']); $resolver->setDefault('help_html', fn(Options $options) => $options['dto_value'] !== null);
});
$resolver->setDefault('help_html', function (Options $options) {
return $options['dto_value'] !== null;
});
$resolver->setDefault('attr', function (Options $options) { $resolver->setDefault('attr', function (Options $options) {
$tmp = [ $tmp = [

4
src/Helpers/FilenameSanatizer.php
View file

@ -47,9 +47,9 @@ class FilenameSanatizer
'-', $filename); '-', $filename);
// avoids ".", ".." or ".hiddenFiles" // avoids ".", ".." or ".hiddenFiles"
$filename = ltrim($filename, '.-'); $filename = ltrim((string) $filename, '.-');
//Limit filename length to 255 bytes //Limit filename length to 255 bytes
$ext = pathinfo($filename, PATHINFO_EXTENSION); $ext = pathinfo($filename, PATHINFO_EXTENSION);
return mb_strcut(pathinfo($filename, PATHINFO_FILENAME), 0, 255 - ($ext ? strlen($ext) + 1 : 0), mb_detect_encoding($filename)) . ($ext ? '.' . $ext : ''); return mb_strcut(pathinfo($filename, PATHINFO_FILENAME), 0, 255 - ($ext !== '' && $ext !== '0' ? strlen($ext) + 1 : 0), mb_detect_encoding($filename)) . ($ext !== '' && $ext !== '0' ? '.' . $ext : '');
} }
} }

6
src/Helpers/Projects/ProjectBuildRequest.php
View file

@ -174,11 +174,7 @@ final class ProjectBuildRequest
*/ */
public function getLotWithdrawAmount(PartLot|int $lot): float public function getLotWithdrawAmount(PartLot|int $lot): float
{ {
if ($lot instanceof PartLot) { $lot_id = $lot instanceof PartLot ? $lot->getID() : $lot;
$lot_id = $lot->getID();
} else { // Then it must be an int
$lot_id = $lot;
}
if (! array_key_exists($lot_id, $this->withdraw_amounts)) { if (! array_key_exists($lot_id, $this->withdraw_amounts)) {
throw new \InvalidArgumentException('The given lot is not in the withdraw amounts array!'); throw new \InvalidArgumentException('The given lot is not in the withdraw amounts array!');

1
src/Helpers/TrinaryLogicHelper.php
View file

@ -26,6 +26,7 @@ namespace App\Helpers;
/** /**
* Helper functions for logic operations with trinary logic. * Helper functions for logic operations with trinary logic.
* True and false are represented as classical boolean values, undefined is represented as null. * True and false are represented as classical boolean values, undefined is represented as null.
* @see \App\Tests\Helpers\TrinaryLogicHelperTest
*/ */
class TrinaryLogicHelper class TrinaryLogicHelper
{ {

2
src/Migration/WithPermPresetsTrait.php
View file

@ -64,7 +64,7 @@ trait WithPermPresetsTrait
public function setContainer(ContainerInterface $container = null): void public function setContainer(ContainerInterface $container = null): void
{ {
if ($container) { if ($container !== null) {
$this->container = $container; $this->container = $container;
$this->permission_presets_helper = $container->get(PermissionPresetsHelper::class); $this->permission_presets_helper = $container->get(PermissionPresetsHelper::class);
} }

1
src/Repository/AttachmentContainingDBElementRepository.php
View file

@ -30,6 +30,7 @@ use Doctrine\ORM\Mapping\ClassMetadata;
/** /**
* @template TEntityClass of AttachmentContainingDBElement * @template TEntityClass of AttachmentContainingDBElement
* @extends NamedDBElementRepository<TEntityClass> * @extends NamedDBElementRepository<TEntityClass>
* @see \App\Tests\Repository\AttachmentContainingDBElementRepositoryTest
*/ */
class AttachmentContainingDBElementRepository extends NamedDBElementRepository class AttachmentContainingDBElementRepository extends NamedDBElementRepository
{ {

5
src/Repository/DBElementRepository.php
View file

@ -49,6 +49,7 @@ use ReflectionClass;
/** /**
* @template TEntityClass of AbstractDBElement * @template TEntityClass of AbstractDBElement
* @extends EntityRepository<TEntityClass> * @extends EntityRepository<TEntityClass>
* @see \App\Tests\Repository\DBElementRepositoryTest
*/ */
class DBElementRepository extends EntityRepository class DBElementRepository extends EntityRepository
{ {
@ -143,9 +144,7 @@ class DBElementRepository extends EntityRepository
*/ */
protected function sortResultArrayByIDArray(array &$result_array, array $ids): void protected function sortResultArrayByIDArray(array &$result_array, array $ids): void
{ {
usort($result_array, static function (AbstractDBElement $a, AbstractDBElement $b) use ($ids) { usort($result_array, static fn(AbstractDBElement $a, AbstractDBElement $b) => array_search($a->getID(), $ids, true) <=> array_search($b->getID(), $ids, true));
return array_search($a->getID(), $ids, true) <=> array_search($b->getID(), $ids, true);
});
} }
protected function setField(AbstractDBElement $element, string $field, int $new_value): void protected function setField(AbstractDBElement $element, string $field, int $new_value): void

1
src/Repository/NamedDBElementRepository.php
View file

@ -29,6 +29,7 @@ use App\Helpers\Trees\TreeViewNode;
/** /**
* @template TEntityClass of AbstractNamedDBElement * @template TEntityClass of AbstractNamedDBElement
* @extends DBElementRepository<TEntityClass> * @extends DBElementRepository<TEntityClass>
* @see \App\Tests\Repository\NamedDBElementRepositoryTest
*/ */
class NamedDBElementRepository extends DBElementRepository class NamedDBElementRepository extends DBElementRepository
{ {

4
src/Repository/StructuralDBElementRepository.php
View file

@ -52,7 +52,7 @@ class StructuralDBElementRepository extends AttachmentContainingDBElementReposit
$qb->select('e') $qb->select('e')
->orderBy('NATSORT(e.name)', $nameOrdering); ->orderBy('NATSORT(e.name)', $nameOrdering);
if ($parent) { if ($parent !== null) {
$qb->where('e.parent = :parent') $qb->where('e.parent = :parent')
->setParameter('parent', $parent); ->setParameter('parent', $parent);
} else { } else {
@ -260,7 +260,7 @@ class StructuralDBElementRepository extends AttachmentContainingDBElementReposit
//Try to find if we already have an element cached for this name //Try to find if we already have an element cached for this name
$entity = $this->getNewEntityFromCache($name, null); $entity = $this->getNewEntityFromCache($name, null);
if ($entity) { if ($entity !== null) {
return $entity; return $entity;
} }

1
src/Repository/UserRepository.php
View file

@ -36,6 +36,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
* @method User[] findAll() * @method User[] findAll()
* @method User[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) * @method User[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
* @extends NamedDBElementRepository<User> * @extends NamedDBElementRepository<User>
* @see \App\Tests\Repository\UserRepositoryTest
*/ */
final class UserRepository extends NamedDBElementRepository implements PasswordUpgraderInterface final class UserRepository extends NamedDBElementRepository implements PasswordUpgraderInterface
{ {

8
src/Security/TwoFactor/WebauthnKeyLastUseTwoFactorProvider.php
View file

@ -44,12 +44,12 @@ class WebauthnKeyLastUseTwoFactorProvider implements TwoFactorProviderInterface
public function __construct( public function __construct(
#[AutowireDecorated] #[AutowireDecorated]
private TwoFactorProviderInterface $decorated, private readonly TwoFactorProviderInterface $decorated,
private EntityManagerInterface $entityManager, private readonly EntityManagerInterface $entityManager,
#[Autowire(service: 'jbtronics_webauthn_tfa.user_public_key_source_repo')] #[Autowire(service: 'jbtronics_webauthn_tfa.user_public_key_source_repo')]
private UserPublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository, private readonly UserPublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository,
#[Autowire(service: 'jbtronics_webauthn_tfa.webauthn_provider')] #[Autowire(service: 'jbtronics_webauthn_tfa.webauthn_provider')]
private WebauthnProvider $webauthnProvider, private readonly WebauthnProvider $webauthnProvider,
) )
{ {
} }

3
src/Serializer/APIPlatform/DetermineTypeFromElementIRIDenormalizer.php
View file

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace App\Serializer\APIPlatform; namespace App\Serializer\APIPlatform;
use ApiPlatform\Metadata\Exception\ResourceClassNotFoundException;
use ApiPlatform\Api\IriConverterInterface; use ApiPlatform\Api\IriConverterInterface;
use ApiPlatform\Metadata\Operation; use ApiPlatform\Metadata\Operation;
use ApiPlatform\Metadata\Post; use ApiPlatform\Metadata\Post;
@ -59,7 +60,7 @@ class DetermineTypeFromElementIRIDenormalizer implements DenormalizerInterface,
* @param array $input * @param array $input
* @param Operation $operation * @param Operation $operation
* @return array * @return array
* @throws \ApiPlatform\Metadata\Exception\ResourceClassNotFoundException * @throws ResourceClassNotFoundException
*/ */
private function addTypeDiscriminatorIfNecessary(array $input, Operation $operation): array private function addTypeDiscriminatorIfNecessary(array $input, Operation $operation): array
{ {

2
src/Serializer/PartNormalizer.php
View file

@ -161,7 +161,7 @@ class PartNormalizer implements NormalizerInterface, DenormalizerInterface, Norm
if (isset($data['supplier']) && $data['supplier'] !== "") { if (isset($data['supplier']) && $data['supplier'] !== "") {
$supplier = $this->locationDenormalizer->denormalize($data['supplier'], Supplier::class, $format, $context); $supplier = $this->locationDenormalizer->denormalize($data['supplier'], Supplier::class, $format, $context);
if ($supplier) { if ($supplier !== null) {
$orderdetail = new Orderdetail(); $orderdetail = new Orderdetail();
$orderdetail->setSupplier($supplier); $orderdetail->setSupplier($supplier);

6
src/Services/Attachments/AttachmentPathResolver.php
View file

@ -139,12 +139,12 @@ class AttachmentPathResolver
} }
//If we have now have a placeholder left, the string is invalid: //If we have now have a placeholder left, the string is invalid:
if (preg_match('#%\w+%#', $placeholder_path)) { if (preg_match('#%\w+%#', (string) $placeholder_path)) {
return null; return null;
} }
//Path is invalid if path is directory traversal //Path is invalid if path is directory traversal
if (str_contains($placeholder_path, '..')) { if (str_contains((string) $placeholder_path, '..')) {
return null; return null;
} }
@ -183,7 +183,7 @@ class AttachmentPathResolver
} }
//If the new string does not begin with a placeholder, it is invalid //If the new string does not begin with a placeholder, it is invalid
if (!preg_match('#^%\w+%#', $real_path)) { if (!preg_match('#^%\w+%#', (string) $real_path)) {
return null; return null;
} }

4
src/Services/Attachments/AttachmentSubmitHandler.php
View file

@ -300,7 +300,7 @@ class AttachmentSubmitHandler
return $attachment; return $attachment;
} }
$filename = basename($old_path); $filename = basename((string) $old_path);
//If the basename is not one of the new unique on, we have to save the old filename //If the basename is not one of the new unique on, we have to save the old filename
if (!preg_match('#\w+-\w{13}\.#', $filename)) { if (!preg_match('#\w+-\w{13}\.#', $filename)) {
//Save filename to attachment field //Save filename to attachment field
@ -378,7 +378,7 @@ class AttachmentSubmitHandler
//If we don't know filename yet, try to determine it out of url //If we don't know filename yet, try to determine it out of url
if ('' === $filename) { if ('' === $filename) {
$filename = basename(parse_url($url, PHP_URL_PATH)); $filename = basename(parse_url((string) $url, PHP_URL_PATH));
} }
//Set original file //Set original file

9
src/Services/Cache/ElementCacheTagGenerator.php
View file

@ -46,11 +46,10 @@ class ElementCacheTagGenerator
{ {
//Ensure that the given element is a class name //Ensure that the given element is a class name
if (is_object($element)) { if (is_object($element)) {
$element = get_class($element); $element = $element::class;
} else { //And that the class exists } elseif (!class_exists($element)) {
if (!class_exists($element)) { //And that the class exists
throw new \InvalidArgumentException("The given class '$element' does not exist!"); throw new \InvalidArgumentException("The given class '$element' does not exist!");
}
} }
//Check if the tag is already cached //Check if the tag is already cached

21
src/Services/EDA/KiCadHelper.php
View file

@ -134,7 +134,7 @@ class KiCadHelper
if ($this->category_depth >= 0) { if ($this->category_depth >= 0) {
//Ensure that the category is set //Ensure that the category is set
if (!$category) { if ($category === null) {
throw new NotFoundHttpException('Category must be set, if category_depth is greater than 1!'); throw new NotFoundHttpException('Category must be set, if category_depth is greater than 1!');
} }
@ -196,25 +196,25 @@ class KiCadHelper
//Add basic fields //Add basic fields
$result["fields"]["description"] = $this->createField($part->getDescription()); $result["fields"]["description"] = $this->createField($part->getDescription());
if ($part->getCategory()) { if ($part->getCategory() !== null) {
$result["fields"]["Category"] = $this->createField($part->getCategory()->getFullPath('/')); $result["fields"]["Category"] = $this->createField($part->getCategory()->getFullPath('/'));
} }
if ($part->getManufacturer()) { if ($part->getManufacturer() !== null) {
$result["fields"]["Manufacturer"] = $this->createField($part->getManufacturer()->getName()); $result["fields"]["Manufacturer"] = $this->createField($part->getManufacturer()->getName());
} }
if ($part->getManufacturerProductNumber() !== "") { if ($part->getManufacturerProductNumber() !== "") {
$result['fields']["MPN"] = $this->createField($part->getManufacturerProductNumber()); $result['fields']["MPN"] = $this->createField($part->getManufacturerProductNumber());
} }
if ($part->getManufacturingStatus()) { if ($part->getManufacturingStatus() !== null) {
$result["fields"]["Manufacturing Status"] = $this->createField( $result["fields"]["Manufacturing Status"] = $this->createField(
//Always use the english translation //Always use the english translation
$this->translator->trans($part->getManufacturingStatus()->toTranslationKey(), locale: 'en') $this->translator->trans($part->getManufacturingStatus()->toTranslationKey(), locale: 'en')
); );
} }
if ($part->getFootprint()) { if ($part->getFootprint() !== null) {
$result["fields"]["Part-DB Footprint"] = $this->createField($part->getFootprint()->getName()); $result["fields"]["Part-DB Footprint"] = $this->createField($part->getFootprint()->getName());
} }
if ($part->getPartUnit()) { if ($part->getPartUnit() !== null) {
$unit = $part->getPartUnit()->getName(); $unit = $part->getPartUnit()->getName();
if ($part->getPartUnit()->getUnit() !== "") { if ($part->getPartUnit()->getUnit() !== "") {
$unit .= ' ('.$part->getPartUnit()->getUnit().')'; $unit .= ' ('.$part->getPartUnit()->getUnit().')';
@ -225,7 +225,7 @@ class KiCadHelper
$result["fields"]["Mass"] = $this->createField($part->getMass() . ' g'); $result["fields"]["Mass"] = $this->createField($part->getMass() . ' g');
} }
$result["fields"]["Part-DB ID"] = $this->createField($part->getId()); $result["fields"]["Part-DB ID"] = $this->createField($part->getId());
if (!empty($part->getIpn())) { if ($part->getIpn() !== null && $part->getIpn() !== '' && $part->getIpn() !== '0') {
$result["fields"]["Part-DB IPN"] = $this->createField($part->getIpn()); $result["fields"]["Part-DB IPN"] = $this->createField($part->getIpn());
} }
@ -308,14 +308,9 @@ class KiCadHelper
)) { )) {
return true; return true;
} }
//And on the footprint //And on the footprint
if ($part->getFootprint() && $part->getFootprint()->getEdaInfo()->getKicadFootprint() !== null) {
return true;
}
//Otherwise the part should be not visible //Otherwise the part should be not visible
return false; return $part->getFootprint() && $part->getFootprint()->getEdaInfo()->getKicadFootprint() !== null;
} }
/** /**

2
src/Services/EntityMergers/EntityMerger.php
View file

@ -69,7 +69,7 @@ class EntityMerger
{ {
$merger = $this->findMergerForObject($target, $other, $context); $merger = $this->findMergerForObject($target, $other, $context);
if ($merger === null) { if ($merger === null) {
throw new \RuntimeException('No merger found for merging '.get_class($other).' into '.get_class($target)); throw new \RuntimeException('No merger found for merging '.$other::class.' into '.$target::class);
} }
return $merger->merge($target, $other, $context); return $merger->merge($target, $other, $context);
} }

52
src/Services/EntityMergers/Mergers/EntityMergerHelperTrait.php
View file

@ -85,9 +85,7 @@ trait EntityMergerHelperTrait
protected function useOtherValueIfNotNull(object $target, object $other, string $field): object protected function useOtherValueIfNotNull(object $target, object $other, string $field): object
{ {
return $this->useCallback( return $this->useCallback(
function ($target_value, $other_value) { fn($target_value, $other_value) => $target_value ?? $other_value,
return $target_value ?? $other_value;
},
$target, $target,
$other, $other,
$field $field
@ -106,9 +104,7 @@ trait EntityMergerHelperTrait
protected function useOtherValueIfNotEmtpy(object $target, object $other, string $field): object protected function useOtherValueIfNotEmtpy(object $target, object $other, string $field): object
{ {
return $this->useCallback( return $this->useCallback(
function ($target_value, $other_value) { fn($target_value, $other_value) => empty($target_value) ? $other_value : $target_value,
return empty($target_value) ? $other_value : $target_value;
},
$target, $target,
$other, $other,
$field $field
@ -126,9 +122,7 @@ trait EntityMergerHelperTrait
protected function useLargerValue(object $target, object $other, string $field): object protected function useLargerValue(object $target, object $other, string $field): object
{ {
return $this->useCallback( return $this->useCallback(
function ($target_value, $other_value) { fn($target_value, $other_value) => max($target_value, $other_value),
return max($target_value, $other_value);
},
$target, $target,
$other, $other,
$field $field
@ -146,9 +140,7 @@ trait EntityMergerHelperTrait
protected function useSmallerValue(object $target, object $other, string $field): object protected function useSmallerValue(object $target, object $other, string $field): object
{ {
return $this->useCallback( return $this->useCallback(
function ($target_value, $other_value) { fn($target_value, $other_value) => min($target_value, $other_value),
return min($target_value, $other_value);
},
$target, $target,
$other, $other,
$field $field
@ -166,9 +158,7 @@ trait EntityMergerHelperTrait
protected function useTrueValue(object $target, object $other, string $field): object protected function useTrueValue(object $target, object $other, string $field): object
{ {
return $this->useCallback( return $this->useCallback(
function (bool $target_value, bool $other_value): bool { fn(bool $target_value, bool $other_value): bool => $target_value || $other_value,
return $target_value || $other_value;
},
$target, $target,
$other, $other,
$field $field
@ -232,10 +222,8 @@ trait EntityMergerHelperTrait
continue 2; continue 2;
} }
} }
} else { } elseif ($target_collection->contains($item)) {
if ($target_collection->contains($item)) { continue;
continue;
}
} }
$clones[] = clone $item; $clones[] = clone $item;
@ -257,11 +245,9 @@ trait EntityMergerHelperTrait
*/ */
protected function mergeAttachments(AttachmentContainingDBElement $target, AttachmentContainingDBElement $other): object protected function mergeAttachments(AttachmentContainingDBElement $target, AttachmentContainingDBElement $other): object
{ {
return $this->mergeCollections($target, $other, 'attachments', function (Attachment $t, Attachment $o): bool { return $this->mergeCollections($target, $other, 'attachments', fn(Attachment $t, Attachment $o): bool => $t->getName() === $o->getName()
return $t->getName() === $o->getName() && $t->getAttachmentType() === $o->getAttachmentType()
&& $t->getAttachmentType() === $o->getAttachmentType() && $t->getPath() === $o->getPath());
&& $t->getPath() === $o->getPath();
});
} }
/** /**
@ -272,16 +258,14 @@ trait EntityMergerHelperTrait
*/ */
protected function mergeParameters(AbstractStructuralDBElement|Part $target, AbstractStructuralDBElement|Part $other): object protected function mergeParameters(AbstractStructuralDBElement|Part $target, AbstractStructuralDBElement|Part $other): object
{ {
return $this->mergeCollections($target, $other, 'parameters', function (AbstractParameter $t, AbstractParameter $o): bool { return $this->mergeCollections($target, $other, 'parameters', fn(AbstractParameter $t, AbstractParameter $o): bool => $t->getName() === $o->getName()
return $t->getName() === $o->getName() && $t->getSymbol() === $o->getSymbol()
&& $t->getSymbol() === $o->getSymbol() && $t->getUnit() === $o->getUnit()
&& $t->getUnit() === $o->getUnit() && $t->getValueMax() === $o->getValueMax()
&& $t->getValueMax() === $o->getValueMax() && $t->getValueMin() === $o->getValueMin()
&& $t->getValueMin() === $o->getValueMin() && $t->getValueTypical() === $o->getValueTypical()
&& $t->getValueTypical() === $o->getValueTypical() && $t->getValueText() === $o->getValueText()
&& $t->getValueText() === $o->getValueText() && $t->getGroup() === $o->getGroup());
&& $t->getGroup() === $o->getGroup();
});
} }
/** /**

7
src/Services/EntityMergers/Mergers/PartMerger.php
View file

@ -33,6 +33,7 @@ use App\Entity\PriceInformations\Orderdetail;
* This class merges two parts together. * This class merges two parts together.
* *
* @implements EntityMergerInterface<Part> * @implements EntityMergerInterface<Part>
* @see \App\Tests\Services\EntityMergers\Mergers\PartMergerTest
*/ */
class PartMerger implements EntityMergerInterface class PartMerger implements EntityMergerInterface
{ {
@ -99,7 +100,7 @@ class PartMerger implements EntityMergerInterface
return $target; return $target;
} }
private static function comparePartAssociations(PartAssociation $t, PartAssociation $o): bool { private function comparePartAssociations(PartAssociation $t, PartAssociation $o): bool {
//We compare the translation keys, as it contains info about the type and other type info //We compare the translation keys, as it contains info about the type and other type info
return $t->getOther() === $o->getOther() return $t->getOther() === $o->getOther()
&& $t->getTypeTranslationKey() === $o->getTypeTranslationKey(); && $t->getTypeTranslationKey() === $o->getTypeTranslationKey();
@ -117,7 +118,7 @@ class PartMerger implements EntityMergerInterface
$this->mergeParameters($target, $other); $this->mergeParameters($target, $other);
//Merge the associations //Merge the associations
$this->mergeCollections($target, $other, 'associated_parts_as_owner', self::comparePartAssociations(...)); $this->mergeCollections($target, $other, 'associated_parts_as_owner', $this->comparePartAssociations(...));
//We have to recreate the associations towards the other part, as they are not created by the merger //We have to recreate the associations towards the other part, as they are not created by the merger
foreach ($other->getAssociatedPartsAsOther() as $association) { foreach ($other->getAssociatedPartsAsOther() as $association) {
@ -131,7 +132,7 @@ class PartMerger implements EntityMergerInterface
} }
//Ensure that the association is not already present //Ensure that the association is not already present
foreach ($owner->getAssociatedPartsAsOwner() as $existing_association) { foreach ($owner->getAssociatedPartsAsOwner() as $existing_association) {
if (self::comparePartAssociations($existing_association, $clone)) { if ($this->comparePartAssociations($existing_association, $clone)) {
continue 2; continue 2;
} }
} }

6
src/Services/EntityURLGenerator.php
View file

@ -360,11 +360,7 @@ class EntityURLGenerator
*/ */
protected function mapToController(array $map, string|AbstractDBElement $entity): string protected function mapToController(array $map, string|AbstractDBElement $entity): string
{ {
if (is_string($entity)) { //If a class name was already passed, then use it directly $class = is_string($entity) ? $entity : $entity::class;
$class = $entity;
} else { //Otherwise get the class name from the entity
$class = $entity::class;
}
//Check if we have an direct mapping for the given class //Check if we have an direct mapping for the given class
if (!array_key_exists($class, $map)) { if (!array_key_exists($class, $map)) {

2
src/Services/ImportExportSystem/PartKeeprImporter/PKOptionalImporter.php
View file

@ -116,7 +116,7 @@ class PKOptionalImporter
//All imported users get assigned to the "PartKeepr Users" group //All imported users get assigned to the "PartKeepr Users" group
$group_users = $this->em->find(Group::class, 3); $group_users = $this->em->find(Group::class, 3);
$group = $this->em->getRepository(Group::class)->findOneBy(['name' => 'PartKeepr Users', 'parent' => $group_users]); $group = $this->em->getRepository(Group::class)->findOneBy(['name' => 'PartKeepr Users', 'parent' => $group_users]);
if (!$group) { if ($group === null) {
$group = new Group(); $group = new Group();
$group->setName('PartKeepr Users'); $group->setName('PartKeepr Users');
$group->setParent($group_users); $group->setParent($group_users);

4
src/Services/ImportExportSystem/PartKeeprImporter/PKPartImporter.php
View file

@ -218,7 +218,7 @@ class PKPartImporter
'iso_code' => $currency_iso_code, 'iso_code' => $currency_iso_code,
]); ]);
if (!$currency) { if ($currency === null) {
$currency = new Currency(); $currency = new Currency();
$currency->setIsoCode($currency_iso_code); $currency->setIsoCode($currency_iso_code);
$currency->setName(Currencies::getName($currency_iso_code)); $currency->setName(Currencies::getName($currency_iso_code));
@ -265,7 +265,7 @@ class PKPartImporter
]); ]);
//When no orderdetail exists, create one //When no orderdetail exists, create one
if (!$orderdetail) { if ($orderdetail === null) {
$orderdetail = new Orderdetail(); $orderdetail = new Orderdetail();
$orderdetail->setSupplier($supplier); $orderdetail->setSupplier($supplier);
$orderdetail->setSupplierpartnr($spn); $orderdetail->setSupplierpartnr($spn);

1
src/Services/InfoProviderSystem/DTOs/FileDTO.php
View file

@ -26,6 +26,7 @@ namespace App\Services\InfoProviderSystem\DTOs;
/** /**
* This DTO represents a file that can be downloaded from a URL. * This DTO represents a file that can be downloaded from a URL.
* This could be a datasheet, a 3D model, a picture or similar. * This could be a datasheet, a 3D model, a picture or similar.
* @see \App\Tests\Services\InfoProviderSystem\DTOs\FileDTOTest
*/ */
class FileDTO class FileDTO
{ {

3
src/Services/InfoProviderSystem/DTOs/ParameterDTO.php
View file

@ -26,6 +26,7 @@ namespace App\Services\InfoProviderSystem\DTOs;
/** /**
* This DTO represents a parameter of a part (similar to the AbstractParameter entity). * This DTO represents a parameter of a part (similar to the AbstractParameter entity).
* This could be a voltage, a current, a temperature or similar. * This could be a voltage, a current, a temperature or similar.
* @see \App\Tests\Services\InfoProviderSystem\DTOs\ParameterDTOTest
*/ */
class ParameterDTO class ParameterDTO
{ {
@ -76,7 +77,7 @@ class ParameterDTO
$parts = preg_split('/\s*(\.{3}|~)\s*/', $value); $parts = preg_split('/\s*(\.{3}|~)\s*/', $value);
if (count($parts) === 2) { if (count($parts) === 2) {
//Try to extract number and unit from value (allow leading +) //Try to extract number and unit from value (allow leading +)
if (empty($unit)) { if ($unit === null || trim($unit) === '') {
[$number, $unit] = self::splitIntoValueAndUnit(ltrim($parts[0], " +")) ?? [$parts[0], null]; [$number, $unit] = self::splitIntoValueAndUnit(ltrim($parts[0], " +")) ?? [$parts[0], null];
} else { } else {
$number = $parts[0]; $number = $parts[0];

1
src/Services/InfoProviderSystem/DTOs/PurchaseInfoDTO.php
View file

@ -25,6 +25,7 @@ namespace App\Services\InfoProviderSystem\DTOs;
/** /**
* This DTO represents a purchase information for a part (supplier name, order number and prices). * This DTO represents a purchase information for a part (supplier name, order number and prices).
* @see \App\Tests\Services\InfoProviderSystem\DTOs\PurchaseInfoDTOTest
*/ */
class PurchaseInfoDTO class PurchaseInfoDTO
{ {

1
src/Services/InfoProviderSystem/DTOs/SearchResultDTO.php
View file

@ -27,6 +27,7 @@ use App\Entity\Parts\ManufacturingStatus;
/** /**
* This DTO represents a search result for a part. * This DTO represents a search result for a part.
* @see \App\Tests\Services\InfoProviderSystem\DTOs\SearchResultDTOTest
*/ */
class SearchResultDTO class SearchResultDTO
{ {

3
src/Services/InfoProviderSystem/DTOtoEntityConverter.php
View file

@ -45,6 +45,7 @@ use Doctrine\ORM\EntityManagerInterface;
/** /**
* This class converts DTOs to entities which can be persisted in the DB * This class converts DTOs to entities which can be persisted in the DB
* @see \App\Tests\Services\InfoProviderSystem\DTOtoEntityConverterTest
*/ */
final class DTOtoEntityConverter final class DTOtoEntityConverter
{ {
@ -127,7 +128,7 @@ final class DTOtoEntityConverter
$entity->setAttachmentType($type); $entity->setAttachmentType($type);
//If no name is given, try to extract the name from the URL //If no name is given, try to extract the name from the URL
if (empty($dto->name)) { if ($dto->name === null || $dto->name === '' || $dto->name === '0') {
$entity->setName($this->getAttachmentNameFromURL($dto->url)); $entity->setName($this->getAttachmentNameFromURL($dto->url));
} else { } else {
$entity->setName($dto->name); $entity->setName($dto->name);

1
src/Services/InfoProviderSystem/ProviderRegistry.php
View file

@ -27,6 +27,7 @@ use App\Services\InfoProviderSystem\Providers\InfoProviderInterface;
/** /**
* This class keeps track of all registered info providers and allows to find them by their key * This class keeps track of all registered info providers and allows to find them by their key
* @see \App\Tests\Services\InfoProviderSystem\ProviderRegistryTest
*/ */
final class ProviderRegistry final class ProviderRegistry
{ {

4
src/Services/InfoProviderSystem/Providers/DigikeyProvider.php
View file

@ -93,7 +93,7 @@ class DigikeyProvider implements InfoProviderInterface
public function isActive(): bool public function isActive(): bool
{ {
//The client ID has to be set and a token has to be available (user clicked connect) //The client ID has to be set and a token has to be available (user clicked connect)
return !empty($this->clientId) && $this->authTokenManager->hasToken(self::OAUTH_APP_NAME); return $this->clientId !== '' && $this->authTokenManager->hasToken(self::OAUTH_APP_NAME);
} }
public function searchByKeyword(string $keyword): array public function searchByKeyword(string $keyword): array
@ -210,7 +210,7 @@ class DigikeyProvider implements InfoProviderInterface
$footprint_name = $parameter['Value']; $footprint_name = $parameter['Value'];
} }
if (in_array(trim($parameter['Value']), array('', '-'), true)) { if (in_array(trim((string) $parameter['Value']), ['', '-'], true)) {
continue; continue;
} }

2
src/Services/InfoProviderSystem/Providers/Element14Provider.php
View file

@ -65,7 +65,7 @@ class Element14Provider implements InfoProviderInterface
public function isActive(): bool public function isActive(): bool
{ {
return !empty($this->api_key); return $this->api_key !== '';
} }
/** /**

10
src/Services/InfoProviderSystem/Providers/LCSCProvider.php
View file

@ -96,7 +96,7 @@ class LCSCProvider implements InfoProviderInterface
*/ */
private function getRealDatasheetUrl(?string $url): string private function getRealDatasheetUrl(?string $url): string
{ {
if (!empty($url) && preg_match("/^https:\/\/(datasheet\.lcsc\.com|www\.lcsc\.com\/datasheet)\/.*(C\d+)\.pdf$/", $url, $matches) > 0) { if ($url !== null && trim($url) !== '' && preg_match("/^https:\/\/(datasheet\.lcsc\.com|www\.lcsc\.com\/datasheet)\/.*(C\d+)\.pdf$/", $url, $matches) > 0) {
$response = $this->lcscClient->request('GET', $url, [ $response = $this->lcscClient->request('GET', $url, [
'headers' => [ 'headers' => [
'Referer' => 'https://www.lcsc.com/product-detail/_' . $matches[2] . '.html' 'Referer' => 'https://www.lcsc.com/product-detail/_' . $matches[2] . '.html'
@ -139,7 +139,7 @@ class LCSCProvider implements InfoProviderInterface
// LCSC does not display LCSC codes in the search, instead taking you directly to the // LCSC does not display LCSC codes in the search, instead taking you directly to the
// detailed product listing. It does so utilizing a product tip field. // detailed product listing. It does so utilizing a product tip field.
// If product tip exists and there are no products in the product list try a detail query // If product tip exists and there are no products in the product list try a detail query
if (count($products) === 0 && !($tipProductCode === null)) { if (count($products) === 0 && $tipProductCode !== null) {
$result[] = $this->queryDetail($tipProductCode); $result[] = $this->queryDetail($tipProductCode);
} }
@ -174,11 +174,11 @@ class LCSCProvider implements InfoProviderInterface
{ {
// Get product images in advance // Get product images in advance
$product_images = $this->getProductImages($product['productImages'] ?? null); $product_images = $this->getProductImages($product['productImages'] ?? null);
$product['productImageUrl'] = $product['productImageUrl'] ?? null; $product['productImageUrl'] ??= null;
// If the product does not have a product image but otherwise has attached images, use the first one. // If the product does not have a product image but otherwise has attached images, use the first one.
if (count($product_images) > 0) { if (count($product_images) > 0) {
$product['productImageUrl'] = $product['productImageUrl'] ?? $product_images[0]->url; $product['productImageUrl'] ??= $product_images[0]->url;
} }
// LCSC puts HTML in footprints and descriptions sometimes randomly // LCSC puts HTML in footprints and descriptions sometimes randomly
@ -321,7 +321,7 @@ class LCSCProvider implements InfoProviderInterface
foreach ($attributes as $attribute) { foreach ($attributes as $attribute) {
//Skip this attribute if it's empty //Skip this attribute if it's empty
if (in_array(trim($attribute['paramValueEn']), array('', '-'), true)) { if (in_array(trim((string) $attribute['paramValueEn']), ['', '-'], true)) {
continue; continue;
} }

4
src/Services/InfoProviderSystem/Providers/MouserProvider.php
View file

@ -74,7 +74,7 @@ class MouserProvider implements InfoProviderInterface
public function isActive(): bool public function isActive(): bool
{ {
return !empty($this->api_key); return $this->api_key !== '';
} }
public function searchByKeyword(string $keyword): array public function searchByKeyword(string $keyword): array
@ -247,7 +247,7 @@ class MouserProvider implements InfoProviderInterface
private function parseDataSheets(?string $sheetUrl, ?string $sheetName): ?array private function parseDataSheets(?string $sheetUrl, ?string $sheetName): ?array
{ {
if (empty($sheetUrl)) { if ($sheetUrl === null || $sheetUrl === '' || $sheetUrl === '0') {
return null; return null;
} }
$result = []; $result = [];

13
src/Services/InfoProviderSystem/Providers/OctopartProvider.php
View file

@ -183,7 +183,7 @@ class OctopartProvider implements InfoProviderInterface
{ {
//The client ID has to be set and a token has to be available (user clicked connect) //The client ID has to be set and a token has to be available (user clicked connect)
//return /*!empty($this->clientId) && */ $this->authTokenManager->hasToken(self::OAUTH_APP_NAME); //return /*!empty($this->clientId) && */ $this->authTokenManager->hasToken(self::OAUTH_APP_NAME);
return !empty($this->clientId) && !empty($this->secret); return $this->clientId !== '' && $this->secret !== '';
} }
private function mapLifeCycleStatus(?string $value): ?ManufacturingStatus private function mapLifeCycleStatus(?string $value): ?ManufacturingStatus
@ -243,11 +243,14 @@ class OctopartProvider implements InfoProviderInterface
//If we encounter the mass spec, we save it for later //If we encounter the mass spec, we save it for later
if ($spec['attribute']['shortname'] === "weight") { if ($spec['attribute']['shortname'] === "weight") {
$mass = (float) $spec['siValue']; $mass = (float) $spec['siValue'];
} else if ($spec['attribute']['shortname'] === "case_package") { //Package } elseif ($spec['attribute']['shortname'] === "case_package") {
//Package
$package = $spec['value']; $package = $spec['value'];
} else if ($spec['attribute']['shortname'] === "numberofpins") { //Pin Count } elseif ($spec['attribute']['shortname'] === "numberofpins") {
//Pin Count
$pinCount = $spec['value']; $pinCount = $spec['value'];
} else if ($spec['attribute']['shortname'] === "lifecyclestatus") { //LifeCycleStatus } elseif ($spec['attribute']['shortname'] === "lifecyclestatus") {
//LifeCycleStatus
$mStatus = $this->mapLifeCycleStatus($spec['value']); $mStatus = $this->mapLifeCycleStatus($spec['value']);
} }
@ -295,7 +298,7 @@ class OctopartProvider implements InfoProviderInterface
$category = null; $category = null;
if (!empty($part['category']['name'])) { if (!empty($part['category']['name'])) {
$category = implode(' -> ', array_map(static fn($c) => $c['name'], $part['category']['ancestors'] ?? [])); $category = implode(' -> ', array_map(static fn($c) => $c['name'], $part['category']['ancestors'] ?? []));
if (!empty($category)) { if ($category !== '' && $category !== '0') {
$category .= ' -> '; $category .= ' -> ';
} }
$category .= $part['category']['name']; $category .= $part['category']['name'];

2
src/Services/InfoProviderSystem/Providers/TMEClient.php
View file

@ -47,7 +47,7 @@ class TMEClient
public function isUsable(): bool public function isUsable(): bool
{ {
return !($this->token === '' || $this->secret === ''); return $this->token !== '' && $this->secret !== '';
} }

4
src/Services/InfoProviderSystem/Providers/TMEProvider.php
View file

@ -80,7 +80,7 @@ class TMEProvider implements InfoProviderInterface
$result[] = new SearchResultDTO( $result[] = new SearchResultDTO(
provider_key: $this->getProviderKey(), provider_key: $this->getProviderKey(),
provider_id: $product['Symbol'], provider_id: $product['Symbol'],
name: !empty($product['OriginalSymbol']) ? $product['OriginalSymbol'] : $product['Symbol'], name: empty($product['OriginalSymbol']) ? $product['Symbol'] : $product['OriginalSymbol'],
description: $product['Description'], description: $product['Description'],
category: $product['Category'], category: $product['Category'],
manufacturer: $product['Producer'], manufacturer: $product['Producer'],
@ -116,7 +116,7 @@ class TMEProvider implements InfoProviderInterface
return new PartDetailDTO( return new PartDetailDTO(
provider_key: $this->getProviderKey(), provider_key: $this->getProviderKey(),
provider_id: $product['Symbol'], provider_id: $product['Symbol'],
name: !empty($product['OriginalSymbol']) ? $product['OriginalSymbol'] : $product['Symbol'], name: empty($product['OriginalSymbol']) ? $product['Symbol'] : $product['OriginalSymbol'],
description: $product['Description'], description: $product['Description'],
category: $product['Category'], category: $product['Category'],
manufacturer: $product['Producer'], manufacturer: $product['Producer'],

3
src/Services/LabelSystem/Barcodes/BarcodeHelper.php
View file

@ -28,6 +28,7 @@ use Com\Tecnick\Barcode\Barcode;
/** /**
* This function is used to generate barcodes of various types using arbitrary (text) content. * This function is used to generate barcodes of various types using arbitrary (text) content.
* @see \App\Tests\Services\LabelSystem\Barcodes\BarcodeHelperTest
*/ */
class BarcodeHelper class BarcodeHelper
{ {
@ -66,7 +67,7 @@ class BarcodeHelper
{ {
$svg = $this->barcodeAsSVG($content, $type); $svg = $this->barcodeAsSVG($content, $type);
$base64 = $this->dataUri($svg, 'image/svg+xml'); $base64 = $this->dataUri($svg, 'image/svg+xml');
$alt_text = $alt_text ?? $content; $alt_text ??= $content;
return '<img src="'.$base64.'" width="'.$width.'" style="min-height: 25px;" alt="'.$alt_text.'"/>'; return '<img src="'.$base64.'" width="'.$width.'" style="min-height: 25px;" alt="'.$alt_text.'"/>';
} }

2
src/Services/LabelSystem/Barcodes/BarcodeScanHelper.php
View file

@ -48,7 +48,7 @@ use Doctrine\ORM\EntityManagerInterface;
use InvalidArgumentException; use InvalidArgumentException;
/** /**
* @see \App\Tests\Services\LabelSystem\Barcodes\BarcodeNormalizerTest * @see \App\Tests\Services\LabelSystem\Barcodes\BarcodeScanHelperTest
*/ */
final class BarcodeScanHelper final class BarcodeScanHelper
{ {

12
src/Services/LabelSystem/DompdfFactory.php
View file

@ -1,4 +1,7 @@
<?php <?php
declare(strict_types=1);
/* /*
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
* *
@ -17,7 +20,6 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
namespace App\Services\LabelSystem; namespace App\Services\LabelSystem;
use Dompdf\Dompdf; use Dompdf\Dompdf;
@ -36,10 +38,8 @@ class DompdfFactory implements DompdfFactoryInterface
private function createDirectoryIfNotExisting(string $path): void private function createDirectoryIfNotExisting(string $path): void
{ {
if (!is_dir($path)) { if (!is_dir($path) && (!mkdir($concurrentDirectory = $path, 0777, true) && !is_dir($concurrentDirectory))) {
if (!mkdir($concurrentDirectory = $path, 0777, true) && !is_dir($concurrentDirectory)) { throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
}
} }
} }
@ -51,4 +51,4 @@ class DompdfFactory implements DompdfFactoryInterface
'tempDir' => $this->tmpDirectory, 'tempDir' => $this->tmpDirectory,
]); ]);
} }
} }

2
src/Services/LabelSystem/LabelBarcodeGenerator.php
View file

@ -49,7 +49,7 @@ use App\Services\LabelSystem\Barcodes\BarcodeHelper;
use InvalidArgumentException; use InvalidArgumentException;
/** /**
* @see \App\Tests\Services\LabelSystem\BarcodeGeneratorTest * @see \App\Tests\Services\LabelSystem\LabelBarcodeGeneratorTest
*/ */
final class LabelBarcodeGenerator final class LabelBarcodeGenerator
{ {

Some files were not shown because too many files have changed in this diff Show more