boonkerz/calc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Thomas Peterson 2022-05-18 17:09:54 +02:00
parent 8c431e293d
commit 5bb9f562f3
7 changed files with 210 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

328
composer.lock generated
View File

@ -176,20 +176,20 @@
},
{
"name": "doctrine/common",
"version": "3.2.2",
"version": "3.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
"reference": "295082d3750987065912816a9d536c2df735f637"
"reference": "c824e95d4c83b7102d8bc60595445a6f7d540f96"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/295082d3750987065912816a9d536c2df735f637",
"reference": "295082d3750987065912816a9d536c2df735f637",
"url": "https://api.github.com/repos/doctrine/common/zipball/c824e95d4c83b7102d8bc60595445a6f7d540f96",
"reference": "c824e95d4c83b7102d8bc60595445a6f7d540f96",
"shasum": ""
},
"require": {
"doctrine/persistence": "^2.0",
"doctrine/persistence": "^2.0 || ^3.0",
"php": "^7.1 || ^8.0"
},
"require-dev": {
@ -246,7 +246,7 @@
],
"support": {
"issues": "https://github.com/doctrine/common/issues",
"source": "https://github.com/doctrine/common/tree/3.2.2"
"source": "https://github.com/doctrine/common/tree/3.3.0"
},
"funding": [
{
@ -262,26 +262,26 @@
"type": "tidelift"
}
],
"time": "2022-02-02T09:15:57+00:00"
"time": "2022-02-05T18:28:51+00:00"
},
{
"name": "doctrine/dbal",
"version": "3.3.2",
"version": "3.3.6",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "35eae239ef515d55ebb24e9d4715cad09a4f58ed"
"reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/35eae239ef515d55ebb24e9d4715cad09a4f58ed",
"reference": "35eae239ef515d55ebb24e9d4715cad09a4f58ed",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/9e7f76dd1cde81c62574fdffa5a9c655c847ad21",
"reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21",
"shasum": ""
},
"require": {
"composer-runtime-api": "^2",
"doctrine/cache": "^1.11|^2.0",
"doctrine/deprecations": "^0.5.3",
"doctrine/deprecations": "^0.5.3|^1",
"doctrine/event-manager": "^1.0",
"php": "^7.3 || ^8.0",
"psr/cache": "^1|^2|^3",
@ -289,15 +289,15 @@
},
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2021.1",
"phpstan/phpstan": "1.4.0",
"phpstan/phpstan-strict-rules": "^1.1",
"phpunit/phpunit": "9.5.11",
"jetbrains/phpstorm-stubs": "2022.1",
"phpstan/phpstan": "1.6.3",
"phpstan/phpstan-strict-rules": "^1.2",
"phpunit/phpunit": "9.5.20",
"psalm/plugin-phpunit": "0.16.1",
"squizlabs/php_codesniffer": "3.6.2",
"symfony/cache": "^5.2|^6.0",
"symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
"vimeo/psalm": "4.16.1"
"vimeo/psalm": "4.23.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@ -357,7 +357,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.3.2"
"source": "https://github.com/doctrine/dbal/tree/3.3.6"
},
"funding": [
{
@ -373,29 +373,29 @@
"type": "tidelift"
}
],
"time": "2022-02-05T16:33:45+00:00"
"time": "2022-05-02T17:21:01+00:00"
},
{
"name": "doctrine/deprecations",
"version": "v0.5.3",
"version": "v1.0.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
"reference": "9504165960a1f83cc1480e2be1dd0a0478561314"
"reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314",
"reference": "9504165960a1f83cc1480e2be1dd0a0478561314",
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
"reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
"shasum": ""
},
"require": {
"php": "^7.1|^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^6.0|^7.0|^8.0",
"phpunit/phpunit": "^7.0|^8.0|^9.0",
"psr/log": "^1.0"
"doctrine/coding-standard": "^9",
"phpunit/phpunit": "^7.5|^8.5|^9.5",
"psr/log": "^1|^2|^3"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@ -414,9 +414,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
"source": "https://github.com/doctrine/deprecations/tree/v0.5.3"
"source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
},
"time": "2021-03-21T12:59:47+00:00"
"time": "2022-05-02T15:47:09+00:00"
},
{
"name": "doctrine/event-manager",
@ -605,29 +605,30 @@
},
{
"name": "doctrine/instantiator",
"version": "1.4.0",
"version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
"reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
"reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
"reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
"reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^8.0",
"doctrine/coding-standard": "^9",
"ext-pdo": "*",
"ext-phar": "*",
"phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
"phpbench/phpbench": "^0.16 || ^1",
"phpstan/phpstan": "^1.4",
"phpstan/phpstan-phpunit": "^1",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"vimeo/psalm": "^4.22"
},
"type": "library",
"autoload": {
@ -654,7 +655,7 @@
],
"support": {
"issues": "https://github.com/doctrine/instantiator/issues",
"source": "https://github.com/doctrine/instantiator/tree/1.4.0"
"source": "https://github.com/doctrine/instantiator/tree/1.4.1"
},
"funding": [
{
@ -670,20 +671,20 @@
"type": "tidelift"
}
],
"time": "2020-11-10T18:47:58+00:00"
"time": "2022-03-03T08:28:38+00:00"
},
{
"name": "doctrine/lexer",
"version": "1.2.2",
"version": "1.2.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
"reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c"
"reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c",
"reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
"reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
"shasum": ""
},
"require": {
@ -691,7 +692,7 @@
},
"require-dev": {
"doctrine/coding-standard": "^9.0",
"phpstan/phpstan": "1.3",
"phpstan/phpstan": "^1.3",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"vimeo/psalm": "^4.11"
},
@ -730,7 +731,7 @@
],
"support": {
"issues": "https://github.com/doctrine/lexer/issues",
"source": "https://github.com/doctrine/lexer/tree/1.2.2"
"source": "https://github.com/doctrine/lexer/tree/1.2.3"
},
"funding": [
{
@ -746,20 +747,20 @@
"type": "tidelift"
}
],
"time": "2022-01-12T08:27:12+00:00"
"time": "2022-02-28T11:07:21+00:00"
},
{
"name": "doctrine/orm",
"version": "2.11.1",
"version": "2.12.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/orm.git",
"reference": "4b88ce787d3916c8366abf52f6c658a7a27ed3a6"
"reference": "8291a7f09b12d14783ed6537b4586583d155869e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/orm/zipball/4b88ce787d3916c8366abf52f6c658a7a27ed3a6",
"reference": "4b88ce787d3916c8366abf52f6c658a7a27ed3a6",
"url": "https://api.github.com/repos/doctrine/orm/zipball/8291a7f09b12d14783ed6537b4586583d155869e",
"reference": "8291a7f09b12d14783ed6537b4586583d155869e",
"shasum": ""
},
"require": {
@ -768,19 +769,18 @@
"doctrine/collections": "^1.5",
"doctrine/common": "^3.0.3",
"doctrine/dbal": "^2.13.1 || ^3.2",
"doctrine/deprecations": "^0.5.3",
"doctrine/deprecations": "^0.5.3 || ^1",
"doctrine/event-manager": "^1.1",
"doctrine/inflector": "^1.4 || ^2.0",
"doctrine/instantiator": "^1.3",
"doctrine/lexer": "^1.0",
"doctrine/persistence": "^2.2",
"doctrine/lexer": "^1.2.3",
"doctrine/persistence": "^2.4 || ^3",
"ext-ctype": "*",
"ext-pdo": "*",
"php": "^7.1 || ^8.0",
"psr/cache": "^1 || ^2 || ^3",
"symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/polyfill-php72": "^1.23",
"symfony/polyfill-php80": "^1.15"
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
"doctrine/annotations": "<1.13 || >= 2.0"
@ -789,12 +789,13 @@
"doctrine/annotations": "^1.13",
"doctrine/coding-standard": "^9.0",
"phpbench/phpbench": "^0.16.10 || ^1.0",
"phpstan/phpstan": "1.4.3",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
"phpstan/phpstan": "~1.4.10 || 1.6.3",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"psr/log": "^1 || ^2 || ^3",
"squizlabs/php_codesniffer": "3.6.2",
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"vimeo/psalm": "4.19.0"
"vimeo/psalm": "4.23.0"
},
"suggest": {
"symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0",
@ -843,51 +844,50 @@
],
"support": {
"issues": "https://github.com/doctrine/orm/issues",
"source": "https://github.com/doctrine/orm/tree/2.11.1"
"source": "https://github.com/doctrine/orm/tree/2.12.2"
},
"time": "2022-01-30T21:47:06+00:00"
"time": "2022-05-02T19:10:07+00:00"
},
{
"name": "doctrine/persistence",
"version": "2.3.0",
"version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/persistence.git",
"reference": "f8af155c1e7963f3d2b4415097d55757bbaa53d8"
"reference": "25ec98a8cbd1f850e60fdb62c0ef77c162da8704"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/persistence/zipball/f8af155c1e7963f3d2b4415097d55757bbaa53d8",
"reference": "f8af155c1e7963f3d2b4415097d55757bbaa53d8",
"url": "https://api.github.com/repos/doctrine/persistence/zipball/25ec98a8cbd1f850e60fdb62c0ef77c162da8704",
"reference": "25ec98a8cbd1f850e60fdb62c0ef77c162da8704",
"shasum": ""
},
"require": {
"doctrine/cache": "^1.11 || ^2.0",
"doctrine/collections": "^1.0",
"doctrine/deprecations": "^0.5.3",
"doctrine/event-manager": "^1.0",
"php": "^7.1 || ^8.0",
"php": "^7.2 || ^8.0",
"psr/cache": "^1.0 || ^2.0 || ^3.0"
},
"conflict": {
"doctrine/annotations": "<1.0 || >=2.0",
"doctrine/common": "<2.10@dev"
"doctrine/annotations": "<1.7 || >=2.0",
"doctrine/common": "<2.10"
},
"require-dev": {
"composer/package-versions-deprecated": "^1.11",
"doctrine/annotations": "^1.0",
"doctrine/coding-standard": "^6.0 || ^9.0",
"doctrine/annotations": "^1.7",
"doctrine/coding-standard": "^9.0",
"doctrine/common": "^3.0",
"phpstan/phpstan": "1.2.0",
"phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0",
"symfony/cache": "^4.4 || ^5.0 || ^6.0",
"vimeo/psalm": "4.13.1"
"phpstan/phpstan": "1.5.0",
"phpstan/phpstan-phpunit": "^1",
"phpstan/phpstan-strict-rules": "^1.1",
"phpunit/phpunit": "^8.5 || ^9.5",
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
"vimeo/psalm": "4.22.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Doctrine\\Common\\": "lib/Doctrine/Common",
"Doctrine\\Persistence\\": "lib/Doctrine/Persistence"
"Doctrine\\Persistence\\": "src/Persistence"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -921,7 +921,7 @@
}
],
"description": "The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.",
"homepage": "https://doctrine-project.org/projects/persistence.html",
"homepage": "https://www.doctrine-project.org/projects/persistence.html",
"keywords": [
"mapper",
"object",
@ -931,9 +931,23 @@
],
"support": {
"issues": "https://github.com/doctrine/persistence/issues",
"source": "https://github.com/doctrine/persistence/tree/2.3.0"
"source": "https://github.com/doctrine/persistence/tree/3.0.2"
},
"time": "2022-01-09T19:58:46+00:00"
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence",
"type": "tidelift"
}
],
"time": "2022-05-06T06:10:05+00:00"
},
{
"name": "psr/cache",
@ -1084,16 +1098,16 @@
},
{
"name": "symfony/console",
"version": "v4.4.38",
"version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "5a50085bf5460f0c0d60a50b58388c1249826b8a"
"reference": "0e1e62083b20ccb39c2431293de060f756af905c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/5a50085bf5460f0c0d60a50b58388c1249826b8a",
"reference": "5a50085bf5460f0c0d60a50b58388c1249826b8a",
"url": "https://api.github.com/repos/symfony/console/zipball/0e1e62083b20ccb39c2431293de060f756af905c",
"reference": "0e1e62083b20ccb39c2431293de060f756af905c",
"shasum": ""
},
"require": {
@ -1154,7 +1168,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/console/tree/v4.4.38"
"source": "https://github.com/symfony/console/tree/v4.4.41"
},
"funding": [
{
@ -1170,20 +1184,20 @@
"type": "tidelift"
}
],
"time": "2022-01-30T21:23:57+00:00"
"time": "2022-04-12T15:19:55+00:00"
},
{
"name": "symfony/deprecation-contracts",
"version": "v2.5.0",
"version": "v2.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
"reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
"reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
"reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
"shasum": ""
},
"require": {
@ -1221,7 +1235,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1"
},
"funding": [
{
@ -1237,11 +1251,11 @@
"type": "tidelift"
}
],
"time": "2021-07-12T14:48:14+00:00"
"time": "2022-01-02T09:53:40+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.24.0",
"version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
@ -1304,7 +1318,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
},
"funding": [
{
@ -1324,7 +1338,7 @@
},
{
"name": "symfony/polyfill-php72",
"version": "v1.24.0",
"version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
@ -1380,7 +1394,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0"
},
"funding": [
{
@ -1400,7 +1414,7 @@
},
{
"name": "symfony/polyfill-php73",
"version": "v1.24.0",
"version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
@ -1459,7 +1473,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0"
},
"funding": [
{
@ -1479,16 +1493,16 @@
},
{
"name": "symfony/polyfill-php80",
"version": "v1.24.0",
"version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
"reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
"reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
"reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
"reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
"shasum": ""
},
"require": {
@ -1542,7 +1556,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
},
"funding": [
{
@ -1558,26 +1572,26 @@
"type": "tidelift"
}
],
"time": "2021-09-13T13:58:33+00:00"
"time": "2022-03-04T08:16:47+00:00"
},
{
"name": "symfony/service-contracts",
"version": "v2.5.0",
"version": "v2.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
"reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
"reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
"reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"psr/container": "^1.1",
"symfony/deprecation-contracts": "^2.1"
"symfony/deprecation-contracts": "^2.1|^3"
},
"conflict": {
"ext-psr": "<1.1|>=2"
@ -1625,7 +1639,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
"source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
},
"funding": [
{
@ -1641,7 +1655,7 @@
"type": "tidelift"
}
],
"time": "2021-11-04T16:48:04+00:00"
"time": "2022-03-13T20:07:29+00:00"
}
],
"packages-dev": [
@ -1839,25 +1853,29 @@
},
{
"name": "myclabs/deep-copy",
"version": "1.10.2",
"version": "1.11.0",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
"reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
"reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
"reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
"conflict": {
"doctrine/collections": "<1.6.8",
"doctrine/common": "<2.13.3 || >=3,<3.2.2"
},
"require-dev": {
"doctrine/collections": "^1.0",
"doctrine/common": "^2.6",
"phpunit/phpunit": "^7.1"
"doctrine/collections": "^1.6.8",
"doctrine/common": "^2.13.3 || ^3.2.2",
"phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
},
"type": "library",
"autoload": {
@ -1882,7 +1900,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
"source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
"source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
},
"funding": [
{
@ -1890,7 +1908,7 @@
"type": "tidelift"
}
],
"time": "2020-11-13T09:40:50+00:00"
"time": "2022-03-03T13:19:32+00:00"
},
{
"name": "nette/bootstrap",
@ -1975,22 +1993,22 @@
},
{
"name": "nette/di",
"version": "v3.0.12",
"version": "v3.0.13",
"source": {
"type": "git",
"url": "https://github.com/nette/di.git",
"reference": "11c236b9f7bbfc5a95e7b24742ad8847936feeb5"
"reference": "9878f2958a0a804b08430dbc719a52e493022739"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/di/zipball/11c236b9f7bbfc5a95e7b24742ad8847936feeb5",
"reference": "11c236b9f7bbfc5a95e7b24742ad8847936feeb5",
"url": "https://api.github.com/repos/nette/di/zipball/9878f2958a0a804b08430dbc719a52e493022739",
"reference": "9878f2958a0a804b08430dbc719a52e493022739",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
"nette/neon": "^3.3",
"nette/php-generator": "^3.5.4",
"nette/neon": "^3.3 || ^4.0",
"nette/php-generator": "^3.5.4 || ^4.0",
"nette/robot-loader": "^3.2",
"nette/schema": "^1.1",
"nette/utils": "^3.1.6",
@ -2044,9 +2062,9 @@
],
"support": {
"issues": "https://github.com/nette/di/issues",
"source": "https://github.com/nette/di/tree/v3.0.12"
"source": "https://github.com/nette/di/tree/v3.0.13"
},
"time": "2021-12-15T21:05:11+00:00"
"time": "2022-03-10T02:43:04+00:00"
},
{
"name": "nette/finder",
@ -2117,16 +2135,16 @@
},
{
"name": "nette/neon",
"version": "v3.3.2",
"version": "v3.3.3",
"source": {
"type": "git",
"url": "https://github.com/nette/neon.git",
"reference": "54b287d8c2cdbe577b02e28ca1713e275b05ece2"
"reference": "22e384da162fab42961d48eb06c06d3ad0c11b95"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/neon/zipball/54b287d8c2cdbe577b02e28ca1713e275b05ece2",
"reference": "54b287d8c2cdbe577b02e28ca1713e275b05ece2",
"url": "https://api.github.com/repos/nette/neon/zipball/22e384da162fab42961d48eb06c06d3ad0c11b95",
"reference": "22e384da162fab42961d48eb06c06d3ad0c11b95",
"shasum": ""
},
"require": {
@ -2179,22 +2197,22 @@
],
"support": {
"issues": "https://github.com/nette/neon/issues",
"source": "https://github.com/nette/neon/tree/v3.3.2"
"source": "https://github.com/nette/neon/tree/v3.3.3"
},
"time": "2021-11-25T15:57:41+00:00"
"time": "2022-03-10T02:04:26+00:00"
},
{
"name": "nette/php-generator",
"version": "v3.6.6",
"version": "v3.6.7",
"source": {
"type": "git",
"url": "https://github.com/nette/php-generator.git",
"reference": "ad7d0a77f58260001bd263605eb2b9fbaf1d61a7"
"reference": "b9ba414c9895fd9420887f20eeb4eabde123677f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/php-generator/zipball/ad7d0a77f58260001bd263605eb2b9fbaf1d61a7",
"reference": "ad7d0a77f58260001bd263605eb2b9fbaf1d61a7",
"url": "https://api.github.com/repos/nette/php-generator/zipball/b9ba414c9895fd9420887f20eeb4eabde123677f",
"reference": "b9ba414c9895fd9420887f20eeb4eabde123677f",
"shasum": ""
},
"require": {
@ -2247,9 +2265,9 @@
],
"support": {
"issues": "https://github.com/nette/php-generator/issues",
"source": "https://github.com/nette/php-generator/tree/v3.6.6"
"source": "https://github.com/nette/php-generator/tree/v3.6.7"
},
"time": "2022-02-20T18:06:09+00:00"
"time": "2022-03-10T01:51:00+00:00"
},
{
"name": "nette/robot-loader",
@ -2633,16 +2651,16 @@
},
{
"name": "phpdocumentor/type-resolver",
"version": "1.6.0",
"version": "1.6.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
"reference": "77a32518733312af16a44300404e945338981de3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
"reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
"reference": "77a32518733312af16a44300404e945338981de3",
"shasum": ""
},
"require": {
@ -2677,9 +2695,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
},
"time": "2022-01-04T19:58:01+00:00"
"time": "2022-03-15T21:29:03+00:00"
},
{
"name": "phpspec/prophecy",
@ -3876,16 +3894,16 @@
},
{
"name": "symfony/finder",
"version": "v4.4.37",
"version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "b17d76d7ed179f017aad646e858c90a2771af15d"
"reference": "40790bdf293b462798882ef6da72bb49a4a6633a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/b17d76d7ed179f017aad646e858c90a2771af15d",
"reference": "b17d76d7ed179f017aad646e858c90a2771af15d",
"url": "https://api.github.com/repos/symfony/finder/zipball/40790bdf293b462798882ef6da72bb49a4a6633a",
"reference": "40790bdf293b462798882ef6da72bb49a4a6633a",
"shasum": ""
},
"require": {
@ -3918,7 +3936,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v4.4.37"
"source": "https://github.com/symfony/finder/tree/v4.4.41"
},
"funding": [
{
@ -3934,11 +3952,11 @@
"type": "tidelift"
}
],
"time": "2022-01-02T09:41:36+00:00"
"time": "2022-04-14T15:36:10+00:00"
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.24.0",
"version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@ -4000,7 +4018,7 @@
"portable"
],
"support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
},
"funding": [
{
@ -4151,5 +4169,5 @@
"php": ">=7.0"
},
"platform-dev": [],
"plugin-api-version": "2.2.0"
"plugin-api-version": "2.3.0"
}

2
src/Calc/Calc.php
View File

@ -131,7 +131,9 @@ class Calc
try {
eval('@$p = ' . $formel . ';');
$this->engine->addDebugCalcFormel($edge->getFormel(), $formel . ' = ' . $p);
}catch (\Throwable $e) {
$this->engine->addDebugCalcFormel($edge->getFormel(), $formel . ' = error');
$p = 0;
}
//echo $option->getId(). ' / '.$formel . ' / '.$p.' / '.PHP_EOL.PHP_EOL;

2
src/Calc/CalcValues.php
View File

@ -117,7 +117,9 @@ class CalcValues
$cv = $this->formelCalc->parse($edge->getCalcValue());
try {
eval('@$cv = ' . $cv . ';');
$this->engine->addDebugCalcVariables($id, $edge->getCalcValue(), $cv . ' = ' . $cv);
}catch (\Throwable $e) {
$this->engine->addDebugCalcVariables($id, $edge->getCalcValue(), $cv . ' = ERROR');
$cv = 0;
}

25
src/Engine.php
View File

@ -44,6 +44,12 @@ class Engine
/** @var array */
protected $displayVariables = array();
/** @var array */
protected $debugCalcFormel = array();
/** @var array */
protected $debugCalcVariables = array();
/** @var float */
protected $price = 0;
@ -326,6 +332,25 @@ class Engine
$this->price = $price;
}
public function addDebugCalcVariables($id, $orgVar, $var)
{
$this->debugCalcVariables[$id] = [$orgVar, $var];
}
public function getDebugCalcVariables()
{
return $this->debugCalcVariables;
}
public function addDebugCalcFormel($orgFormel, $formel)
{
$this->debugCalcFormel[] = [$orgFormel, $formel];
}
public function getDebugCalcFormel()
{
return $this->debugCalcFormel;
}
/**
* @return array
*/

6
tests/Customer/C/CalcTest.php
View File

@ -43,12 +43,14 @@ class CalcTest extends \PHPUnit_Framework_TestCase
public function testVariant1()
{
$this->engine->setVariable('seiten_umschlag', 0);
$this->assertEquals(356.46 , $this->engine->getPrice());
$price = $this->engine->getPrice();
$this->assertEquals(356.46 , $price);
}
public function testVariant2()
{
$this->engine->setVariable('seiten_umschlag', 0);
$this->engine->setVariable('aufschlag', 50);
$this->assertEquals(406.46 , $this->engine->getPrice());
$price = $this->engine->getPrice();
$this->assertEquals(406.46 , $price);
}
}