webcron
/
webcron
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 6 Wiki Activity

BUGFIX: several fixes

This commit is contained in:
Jeroen De Meerleer 2022-03-21 11:30:30 +01:00
parent ed57dfaa88
commit e08152a641
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
6 changed files with 1141 additions and 1920 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -22,6 +22,7 @@
"twig/intl-extra": "~3.3.0", "twig/intl-extra": "~3.3.0",
"twig/twig": "~3.3.0", "twig/twig": "~3.3.0",
"ext-pcntl": "*", "ext-pcntl": "*",
"ext-intl": "*",
"ext-openssl": "*" "ext-openssl": "*"
}, },
"autoload": { "autoload": {

339
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": "ace6bb953533ec83134b578e4d386a8c", "content-hash": "349799d3f07502307a012c48b5c3d994",
"packages": [ "packages": [
{ {
"name": "composer/package-versions-deprecated", "name": "composer/package-versions-deprecated",
@ -428,16 +428,16 @@
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
"version": "1.2.2", "version": "1.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/lexer.git", "url": "https://github.com/doctrine/lexer.git",
"reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c" "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
"reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -445,7 +445,7 @@
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^9.0", "doctrine/coding-standard": "^9.0",
"phpstan/phpstan": "1.3", "phpstan/phpstan": "^1.3",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"vimeo/psalm": "^4.11" "vimeo/psalm": "^4.11"
}, },
@ -484,7 +484,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/lexer/issues", "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": [ "funding": [
{ {
@ -500,7 +500,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-12T08:27:12+00:00" "time": "2022-02-28T11:07:21+00:00"
}, },
{ {
"name": "egulias/email-validator", "name": "egulias/email-validator",
@ -572,16 +572,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "7.4.1", "version": "7.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4",
"reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -676,7 +676,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/guzzle/issues", "issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.4.1" "source": "https://github.com/guzzle/guzzle/tree/7.4.2"
}, },
"funding": [ "funding": [
{ {
@ -692,7 +692,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-12-06T18:43:05+00:00" "time": "2022-03-20T14:16:28+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
@ -721,12 +721,12 @@
} }
}, },
"autoload": { "autoload": {
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
},
"files": [ "files": [
"src/functions_include.php" "src/functions_include.php"
] ],
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
}
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -780,16 +780,16 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.1.0", "version": "2.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", "url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2",
"reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -813,7 +813,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1-dev" "dev-master": "2.2-dev"
} }
}, },
"autoload": { "autoload": {
@ -875,7 +875,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.1.0" "source": "https://github.com/guzzle/psr7/tree/2.2.1"
}, },
"funding": [ "funding": [
{ {
@ -891,7 +891,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-10-06T17:43:30+00:00" "time": "2022-03-20T21:55:58+00:00"
}, },
{ {
"name": "mehrkanal/twig-encore-extension", "name": "mehrkanal/twig-encore-extension",
@ -1062,16 +1062,16 @@
}, },
{ {
"name": "phpseclib/phpseclib", "name": "phpseclib/phpseclib",
"version": "3.0.13", "version": "3.0.14",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpseclib/phpseclib.git", "url": "https://github.com/phpseclib/phpseclib.git",
"reference": "1443ab79364eea48665fa8c09ac67f37d1025f7e" "reference": "2f0b7af658cbea265cbb4a791d6c29a6613f98ef"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/1443ab79364eea48665fa8c09ac67f37d1025f7e", "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/2f0b7af658cbea265cbb4a791d6c29a6613f98ef",
"reference": "1443ab79364eea48665fa8c09ac67f37d1025f7e", "reference": "2f0b7af658cbea265cbb4a791d6c29a6613f98ef",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1080,9 +1080,7 @@
"php": ">=5.6.1" "php": ">=5.6.1"
}, },
"require-dev": { "require-dev": {
"phing/phing": "~2.7", "phpunit/phpunit": "*"
"phpunit/phpunit": "^5.7|^6.0|^9.4",
"squizlabs/php_codesniffer": "~2.0"
}, },
"suggest": { "suggest": {
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
@ -1153,7 +1151,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/phpseclib/phpseclib/issues", "issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.13" "source": "https://github.com/phpseclib/phpseclib/tree/3.0.14"
}, },
"funding": [ "funding": [
{ {
@ -1169,7 +1167,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-30T08:50:05+00:00" "time": "2022-04-04T05:15:45+00:00"
}, },
{ {
"name": "psr/cache", "name": "psr/cache",
@ -1579,16 +1577,16 @@
}, },
{ {
"name": "symfony/asset", "name": "symfony/asset",
"version": "v6.0.3", "version": "v6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/asset.git", "url": "https://github.com/symfony/asset.git",
"reference": "a926033206f3644b1289f4eb09dc0989c7080c21" "reference": "ccbcf5cdc864929e64f2ca138a61bb6afb0fb710"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/asset/zipball/a926033206f3644b1289f4eb09dc0989c7080c21", "url": "https://api.github.com/repos/symfony/asset/zipball/ccbcf5cdc864929e64f2ca138a61bb6afb0fb710",
"reference": "a926033206f3644b1289f4eb09dc0989c7080c21", "reference": "ccbcf5cdc864929e64f2ca138a61bb6afb0fb710",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1631,7 +1629,7 @@
"description": "Manages URL generation and versioning of web assets such as CSS stylesheets, JavaScript files and image files", "description": "Manages URL generation and versioning of web assets such as CSS stylesheets, JavaScript files and image files",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/asset/tree/v6.0.3" "source": "https://github.com/symfony/asset/tree/v6.0.7"
}, },
"funding": [ "funding": [
{ {
@ -1647,20 +1645,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:55:41+00:00" "time": "2022-03-18T16:06:28+00:00"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
"version": "v6.0.3", "version": "v6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/config.git", "url": "https://github.com/symfony/config.git",
"reference": "c14f32ae4cd2a3c29d8825c5093463ac08ade7d8" "reference": "22850bfdd2b6090568ad05dece6843c859d933b7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/c14f32ae4cd2a3c29d8825c5093463ac08ade7d8", "url": "https://api.github.com/repos/symfony/config/zipball/22850bfdd2b6090568ad05dece6843c859d933b7",
"reference": "c14f32ae4cd2a3c29d8825c5093463ac08ade7d8", "reference": "22850bfdd2b6090568ad05dece6843c859d933b7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1709,7 +1707,7 @@
"description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/config/tree/v6.0.3" "source": "https://github.com/symfony/config/tree/v6.0.7"
}, },
"funding": [ "funding": [
{ {
@ -1725,20 +1723,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-03T09:53:43+00:00" "time": "2022-03-22T16:12:04+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v6.0.3", "version": "v6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "22e8efd019c3270c4f79376234a3f8752cd25490" "reference": "70dcf7b2ca2ea08ad6ebcc475f104a024fb5632e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/22e8efd019c3270c4f79376234a3f8752cd25490", "url": "https://api.github.com/repos/symfony/console/zipball/70dcf7b2ca2ea08ad6ebcc475f104a024fb5632e",
"reference": "22e8efd019c3270c4f79376234a3f8752cd25490", "reference": "70dcf7b2ca2ea08ad6ebcc475f104a024fb5632e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1804,7 +1802,7 @@
"terminal" "terminal"
], ],
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v6.0.3" "source": "https://github.com/symfony/console/tree/v6.0.7"
}, },
"funding": [ "funding": [
{ {
@ -1820,20 +1818,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-26T17:23:29+00:00" "time": "2022-03-31T17:18:25+00:00"
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",
"version": "v6.0.3", "version": "v6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dependency-injection.git", "url": "https://github.com/symfony/dependency-injection.git",
"reference": "bf53dbf6e8f3eec14f44c53fa4c3b4905ab19ee4" "reference": "3e8a405fcc2eaf4eadb25b5e259ad9bf90499848"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/bf53dbf6e8f3eec14f44c53fa4c3b4905ab19ee4", "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3e8a405fcc2eaf4eadb25b5e259ad9bf90499848",
"reference": "bf53dbf6e8f3eec14f44c53fa4c3b4905ab19ee4", "reference": "3e8a405fcc2eaf4eadb25b5e259ad9bf90499848",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1892,7 +1890,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application", "description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/dependency-injection/tree/v6.0.3" "source": "https://github.com/symfony/dependency-injection/tree/v6.0.7"
}, },
"funding": [ "funding": [
{ {
@ -1908,20 +1906,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-26T17:23:29+00:00" "time": "2022-03-08T15:43:52+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
"version": "v3.0.0", "version": "v3.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git", "url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced" "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
"reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1959,7 +1957,7 @@
"description": "A generic function and convention to trigger deprecation notices", "description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0" "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.1"
}, },
"funding": [ "funding": [
{ {
@ -1975,20 +1973,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-11-01T23:48:49+00:00" "time": "2022-01-02T09:55:41+00:00"
}, },
{ {
"name": "symfony/dotenv", "name": "symfony/dotenv",
"version": "v6.0.3", "version": "v6.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dotenv.git", "url": "https://github.com/symfony/dotenv.git",
"reference": "45c47b67cc92fbcf9b1d40f08e970a136f75559f" "reference": "1c2288fdfd0787288cd04b9868f879f2212159c4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dotenv/zipball/45c47b67cc92fbcf9b1d40f08e970a136f75559f", "url": "https://api.github.com/repos/symfony/dotenv/zipball/1c2288fdfd0787288cd04b9868f879f2212159c4",
"reference": "45c47b67cc92fbcf9b1d40f08e970a136f75559f", "reference": "1c2288fdfd0787288cd04b9868f879f2212159c4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2029,7 +2027,7 @@
"environment" "environment"
], ],
"support": { "support": {
"source": "https://github.com/symfony/dotenv/tree/v6.0.3" "source": "https://github.com/symfony/dotenv/tree/v6.0.5"
}, },
"funding": [ "funding": [
{ {
@ -2045,20 +2043,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-26T17:23:29+00:00" "time": "2022-02-21T17:15:17+00:00"
}, },
{ {
"name": "symfony/error-handler", "name": "symfony/error-handler",
"version": "v6.0.3", "version": "v6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/error-handler.git", "url": "https://github.com/symfony/error-handler.git",
"reference": "20343b3bad7ebafa38138ddcb97290a24722b57b" "reference": "e600c54e5b30555eecea3ffe4314e58f832e78ee"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/20343b3bad7ebafa38138ddcb97290a24722b57b", "url": "https://api.github.com/repos/symfony/error-handler/zipball/e600c54e5b30555eecea3ffe4314e58f832e78ee",
"reference": "20343b3bad7ebafa38138ddcb97290a24722b57b", "reference": "e600c54e5b30555eecea3ffe4314e58f832e78ee",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2100,7 +2098,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code", "description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/error-handler/tree/v6.0.3" "source": "https://github.com/symfony/error-handler/tree/v6.0.7"
}, },
"funding": [ "funding": [
{ {
@ -2116,7 +2114,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:55:41+00:00" "time": "2022-03-18T16:21:55+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
@ -2203,16 +2201,16 @@
}, },
{ {
"name": "symfony/event-dispatcher-contracts", "name": "symfony/event-dispatcher-contracts",
"version": "v3.0.0", "version": "v3.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git", "url": "https://github.com/symfony/event-dispatcher-contracts.git",
"reference": "aa5422287b75594b90ee9cd807caf8f0df491385" "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/aa5422287b75594b90ee9cd807caf8f0df491385", "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
"reference": "aa5422287b75594b90ee9cd807caf8f0df491385", "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2262,7 +2260,7 @@
"standards" "standards"
], ],
"support": { "support": {
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.0" "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.1"
}, },
"funding": [ "funding": [
{ {
@ -2278,20 +2276,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-07-15T12:33:35+00:00" "time": "2022-01-02T09:55:41+00:00"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v6.0.3", "version": "v6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "6ae49c4fda17322171a2b8dc5f70bc6edbc498e1" "reference": "6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/6ae49c4fda17322171a2b8dc5f70bc6edbc498e1", "url": "https://api.github.com/repos/symfony/filesystem/zipball/6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff",
"reference": "6ae49c4fda17322171a2b8dc5f70bc6edbc498e1", "reference": "6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2325,7 +2323,7 @@
"description": "Provides basic utilities for the filesystem", "description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/filesystem/tree/v6.0.3" "source": "https://github.com/symfony/filesystem/tree/v6.0.7"
}, },
"funding": [ "funding": [
{ {
@ -2341,20 +2339,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:55:41+00:00" "time": "2022-04-01T12:54:51+00:00"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v6.0.3", "version": "v6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "ad157299ced81a637fade1efcadd688d6deba5c1" "reference": "c816b26f03b6902dba79b352c84a17f53d815f0d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/ad157299ced81a637fade1efcadd688d6deba5c1", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c816b26f03b6902dba79b352c84a17f53d815f0d",
"reference": "ad157299ced81a637fade1efcadd688d6deba5c1", "reference": "c816b26f03b6902dba79b352c84a17f53d815f0d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2397,7 +2395,7 @@
"description": "Defines an object-oriented layer for the HTTP specification", "description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-foundation/tree/v6.0.3" "source": "https://github.com/symfony/http-foundation/tree/v6.0.7"
}, },
"funding": [ "funding": [
{ {
@ -2413,20 +2411,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:55:41+00:00" "time": "2022-03-24T14:13:59+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v6.0.4", "version": "v6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "9dce179ce52b0f4f669c07fd5e465e5d809a5d3b" "reference": "9c03dab07a6aa336ffaadc15352b1d14f4ce01f5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/9dce179ce52b0f4f669c07fd5e465e5d809a5d3b", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9c03dab07a6aa336ffaadc15352b1d14f4ce01f5",
"reference": "9dce179ce52b0f4f669c07fd5e465e5d809a5d3b", "reference": "9c03dab07a6aa336ffaadc15352b1d14f4ce01f5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2506,7 +2504,7 @@
"description": "Provides a structured process for converting a Request into a Response", "description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-kernel/tree/v6.0.4" "source": "https://github.com/symfony/http-kernel/tree/v6.0.7"
}, },
"funding": [ "funding": [
{ {
@ -2522,20 +2520,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-29T18:12:46+00:00" "time": "2022-04-02T06:35:11+00:00"
}, },
{ {
"name": "symfony/intl", "name": "symfony/intl",
"version": "v6.0.3", "version": "v6.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/intl.git", "url": "https://github.com/symfony/intl.git",
"reference": "eeddf6ca4cb4767e554c82182d1ddd5a7ff94f4d" "reference": "aa9dd5a6b4b75a4b3dcd002ae588f9792f33defe"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/intl/zipball/eeddf6ca4cb4767e554c82182d1ddd5a7ff94f4d", "url": "https://api.github.com/repos/symfony/intl/zipball/aa9dd5a6b4b75a4b3dcd002ae588f9792f33defe",
"reference": "eeddf6ca4cb4767e554c82182d1ddd5a7ff94f4d", "reference": "aa9dd5a6b4b75a4b3dcd002ae588f9792f33defe",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2586,7 +2584,7 @@
"localization" "localization"
], ],
"support": { "support": {
"source": "https://github.com/symfony/intl/tree/v6.0.3" "source": "https://github.com/symfony/intl/tree/v6.0.5"
}, },
"funding": [ "funding": [
{ {
@ -2602,20 +2600,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:55:41+00:00" "time": "2022-02-27T08:47:28+00:00"
}, },
{ {
"name": "symfony/mailer", "name": "symfony/mailer",
"version": "v6.0.3", "version": "v6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mailer.git", "url": "https://github.com/symfony/mailer.git",
"reference": "d958befe7dbee9d2b2157ef6dfa9b103efa94f82" "reference": "f7343f94e7afecca2ad840b078f9d80200e1bd27"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mailer/zipball/d958befe7dbee9d2b2157ef6dfa9b103efa94f82", "url": "https://api.github.com/repos/symfony/mailer/zipball/f7343f94e7afecca2ad840b078f9d80200e1bd27",
"reference": "d958befe7dbee9d2b2157ef6dfa9b103efa94f82", "reference": "f7343f94e7afecca2ad840b078f9d80200e1bd27",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2660,7 +2658,7 @@
"description": "Helps sending emails", "description": "Helps sending emails",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/mailer/tree/v6.0.3" "source": "https://github.com/symfony/mailer/tree/v6.0.7"
}, },
"funding": [ "funding": [
{ {
@ -2676,20 +2674,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:55:41+00:00" "time": "2022-03-18T16:06:28+00:00"
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
"version": "v6.0.3", "version": "v6.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mime.git", "url": "https://github.com/symfony/mime.git",
"reference": "2cd9601efd040e56f43360daa68f3c6b0534923a" "reference": "74266e396f812a2301536397a6360b6e6913c0d8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/2cd9601efd040e56f43360daa68f3c6b0534923a", "url": "https://api.github.com/repos/symfony/mime/zipball/74266e396f812a2301536397a6360b6e6913c0d8",
"reference": "2cd9601efd040e56f43360daa68f3c6b0534923a", "reference": "74266e396f812a2301536397a6360b6e6913c0d8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2741,7 +2739,7 @@
"mime-type" "mime-type"
], ],
"support": { "support": {
"source": "https://github.com/symfony/mime/tree/v6.0.3" "source": "https://github.com/symfony/mime/tree/v6.0.7"
}, },
"funding": [ "funding": [
{ {
@ -2757,11 +2755,11 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:55:41+00:00" "time": "2022-03-13T20:10:05+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.24.0", "version": "v1.25.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
@ -2793,12 +2791,12 @@
} }
}, },
"autoload": { "autoload": {
"psr-4": {
"Symfony\\Polyfill\\Ctype\\": ""
},
"files": [ "files": [
"bootstrap.php" "bootstrap.php"
] ],
"psr-4": {
"Symfony\\Polyfill\\Ctype\\": ""
}
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -2823,7 +2821,7 @@
"portable" "portable"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
}, },
"funding": [ "funding": [
{ {
@ -2843,7 +2841,7 @@
}, },
{ {
"name": "symfony/polyfill-intl-grapheme", "name": "symfony/polyfill-intl-grapheme",
"version": "v1.24.0", "version": "v1.25.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",
@ -2904,7 +2902,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0" "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0"
}, },
"funding": [ "funding": [
{ {
@ -2924,7 +2922,7 @@
}, },
{ {
"name": "symfony/polyfill-intl-idn", "name": "symfony/polyfill-intl-idn",
"version": "v1.24.0", "version": "v1.25.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",
@ -2991,7 +2989,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0" "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.25.0"
}, },
"funding": [ "funding": [
{ {
@ -3011,7 +3009,7 @@
}, },
{ {
"name": "symfony/polyfill-intl-normalizer", "name": "symfony/polyfill-intl-normalizer",
"version": "v1.24.0", "version": "v1.25.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",
@ -3075,7 +3073,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0"
}, },
"funding": [ "funding": [
{ {
@ -3095,7 +3093,7 @@
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.24.0", "version": "v1.25.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
@ -3158,7 +3156,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
}, },
"funding": [ "funding": [
{ {
@ -3178,7 +3176,7 @@
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
"version": "v1.24.0", "version": "v1.25.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php72.git", "url": "https://github.com/symfony/polyfill-php72.git",
@ -3234,7 +3232,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0" "source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0"
}, },
"funding": [ "funding": [
{ {
@ -3254,7 +3252,7 @@
}, },
{ {
"name": "symfony/polyfill-php81", "name": "symfony/polyfill-php81",
"version": "v1.24.0", "version": "v1.25.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php81.git", "url": "https://github.com/symfony/polyfill-php81.git",
@ -3313,7 +3311,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0" "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0"
}, },
"funding": [ "funding": [
{ {
@ -3333,16 +3331,16 @@
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v6.0.3", "version": "v6.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "b1debdf7a40e6bc7eee0f363ab9dd667fe04f099" "reference": "a738b152426ac7fcb94bdab8188264652238bef1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/b1debdf7a40e6bc7eee0f363ab9dd667fe04f099", "url": "https://api.github.com/repos/symfony/routing/zipball/a738b152426ac7fcb94bdab8188264652238bef1",
"reference": "b1debdf7a40e6bc7eee0f363ab9dd667fe04f099", "reference": "a738b152426ac7fcb94bdab8188264652238bef1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3401,7 +3399,7 @@
"url" "url"
], ],
"support": { "support": {
"source": "https://github.com/symfony/routing/tree/v6.0.3" "source": "https://github.com/symfony/routing/tree/v6.0.5"
}, },
"funding": [ "funding": [
{ {
@ -3417,20 +3415,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:55:41+00:00" "time": "2022-01-31T19:46:53+00:00"
}, },
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",
"version": "v3.0.0", "version": "v3.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/service-contracts.git", "url": "https://github.com/symfony/service-contracts.git",
"reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603" "reference": "e517458f278c2131ca9f262f8fbaf01410f2c65c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/36715ebf9fb9db73db0cb24263c79077c6fe8603", "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e517458f278c2131ca9f262f8fbaf01410f2c65c",
"reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603", "reference": "e517458f278c2131ca9f262f8fbaf01410f2c65c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3483,7 +3481,7 @@
"standards" "standards"
], ],
"support": { "support": {
"source": "https://github.com/symfony/service-contracts/tree/v3.0.0" "source": "https://github.com/symfony/service-contracts/tree/v3.0.1"
}, },
"funding": [ "funding": [
{ {
@ -3499,7 +3497,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-11-04T17:53:12+00:00" "time": "2022-03-13T20:10:05+00:00"
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
@ -3533,12 +3531,12 @@
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": {
"Symfony\\Component\\String\\": ""
},
"files": [ "files": [
"Resources/functions.php" "Resources/functions.php"
], ],
"psr-4": {
"Symfony\\Component\\String\\": ""
},
"exclude-from-classmap": [ "exclude-from-classmap": [
"/Tests/" "/Tests/"
] ]
@ -3588,16 +3586,16 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v6.0.3", "version": "v6.0.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "7b701676fc64f9ef11f9b4870f16b48f66be4834" "reference": "38358405ae948963c50a3aae3dfea598223ba15e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/7b701676fc64f9ef11f9b4870f16b48f66be4834", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/38358405ae948963c50a3aae3dfea598223ba15e",
"reference": "7b701676fc64f9ef11f9b4870f16b48f66be4834", "reference": "38358405ae948963c50a3aae3dfea598223ba15e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3656,7 +3654,7 @@
"dump" "dump"
], ],
"support": { "support": {
"source": "https://github.com/symfony/var-dumper/tree/v6.0.3" "source": "https://github.com/symfony/var-dumper/tree/v6.0.6"
}, },
"funding": [ "funding": [
{ {
@ -3672,20 +3670,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-17T16:30:44+00:00" "time": "2022-03-02T12:58:14+00:00"
}, },
{ {
"name": "symfony/webpack-encore-bundle", "name": "symfony/webpack-encore-bundle",
"version": "v1.13.2", "version": "v1.14.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/webpack-encore-bundle.git", "url": "https://github.com/symfony/webpack-encore-bundle.git",
"reference": "509cad50878e838c879743225e0e921b3b64a3f2" "reference": "1729c314574f32e49f9660a0cee870f7e603864f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/webpack-encore-bundle/zipball/509cad50878e838c879743225e0e921b3b64a3f2", "url": "https://api.github.com/repos/symfony/webpack-encore-bundle/zipball/1729c314574f32e49f9660a0cee870f7e603864f",
"reference": "509cad50878e838c879743225e0e921b3b64a3f2", "reference": "1729c314574f32e49f9660a0cee870f7e603864f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3727,7 +3725,7 @@
"description": "Integration with your Symfony app & Webpack Encore!", "description": "Integration with your Symfony app & Webpack Encore!",
"support": { "support": {
"issues": "https://github.com/symfony/webpack-encore-bundle/issues", "issues": "https://github.com/symfony/webpack-encore-bundle/issues",
"source": "https://github.com/symfony/webpack-encore-bundle/tree/v1.13.2" "source": "https://github.com/symfony/webpack-encore-bundle/tree/v1.14.0"
}, },
"funding": [ "funding": [
{ {
@ -3743,7 +3741,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-12-02T19:45:55+00:00" "time": "2022-02-14T15:06:55+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
@ -3890,16 +3888,16 @@
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v3.3.8", "version": "v3.3.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "972d8604a92b7054828b539f2febb0211dd5945c" "reference": "8442df056c51b706793adf80a9fd363406dd3674"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/972d8604a92b7054828b539f2febb0211dd5945c", "url": "https://api.github.com/repos/twigphp/Twig/zipball/8442df056c51b706793adf80a9fd363406dd3674",
"reference": "972d8604a92b7054828b539f2febb0211dd5945c", "reference": "8442df056c51b706793adf80a9fd363406dd3674",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3950,7 +3948,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/twigphp/Twig/issues", "issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v3.3.8" "source": "https://github.com/twigphp/Twig/tree/v3.3.10"
}, },
"funding": [ "funding": [
{ {
@ -3962,7 +3960,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-02-04T06:59:48+00:00" "time": "2022-04-06T06:47:41+00:00"
} }
], ],
"packages-dev": [], "packages-dev": [],
@ -3973,8 +3971,9 @@
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"ext-pcntl": "*", "ext-pcntl": "*",
"ext-intl": "*",
"ext-openssl": "*" "ext-openssl": "*"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.1.0" "plugin-api-version": "2.2.0"
} }

13
lib/Framework/Kernel.php
View File

@ -22,6 +22,7 @@ class Kernel
private string $templateDir; private string $templateDir;
private string $cacheDir; private string $cacheDir;
private Router $router; private Router $router;
private ?Connection $dbCon = NULL;
/** /**
* @return string * @return string
@ -123,8 +124,18 @@ class Kernel
return $request; return $request;
} }
public function getNewDbCon(): Connection {
if(!is_null($this->dbCon)) {
$this->dbCon->close();
$this->dbCon = null;
}
$this->dbCon = DriverManager::getConnection(['url' => $_ENV['DATABASE']]);
return $this->dbCon;
}
public function getDbCon(): Connection public function getDbCon(): Connection
{ {
return DriverManager::getConnection(['url' => $_ENV['DATABASE']]); if(is_null($this->dbCon)) $this->dbCon = DriverManager::getConnection(['url' => $_ENV['DATABASE']]);
return $this->dbCon;
} }
} }

2690
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
src/Command/DaemonCommand.php
View File

@ -68,18 +68,16 @@ class DaemonCommand extends Command
declare(ticks = 1); declare(ticks = 1);
pcntl_signal(SIGCHLD, SIG_IGN); pcntl_signal(SIGCHLD, SIG_IGN);
$pid = pcntl_fork(); $pid = pcntl_fork();
$jobRepo = NULL;
$jobRepo = new Job($this->kernel->getNewDbCon());
if($pid == -1) { if($pid == -1) {
$jobRepo->RunJob($job['id'], $job['running'] == 2); $jobRepo->RunJob($job['id'], $job['running'] == 2);
$jobRepo->setJobRunning($job['id'], false); $jobRepo->setJobRunning($job['id'], false);
} elseif ($pid == 0) { } elseif ($pid == 0) {
$dbcon = $this->kernel->getDbCon();
$dbcon->close();
$dbcon->connect();
$jobRepo->RunJob($job['id'], $job['running'] == 2); $jobRepo->RunJob($job['id'], $job['running'] == 2);
$jobRepo->setJobRunning($job['id'], false); $jobRepo->setJobRunning($job['id'], false);
exit; exit;
} }
} }
} }
} }

12
src/Repository/Job.php
View File

@ -137,7 +137,7 @@ class Job extends Repository
AND running IN (0,2) AND running IN (0,2)
) )
OR (running NOT IN (0,1,2) AND running < :timestamprun) OR (running NOT IN (0,1,2) AND running < :timestamprun)
OR (running == 2)"; OR (running = 2)";
$jobsStmt = $this->dbcon->prepare($jobsSql); $jobsStmt = $this->dbcon->prepare($jobsSql);
$jobsRslt = $jobsStmt->executeQuery([':timestamp' => time(), ':timestamplastrun' => time(), ':timestamprun' => time()]); $jobsRslt = $jobsStmt->executeQuery([':timestamp' => time(), ':timestamplastrun' => time(), ':timestamprun' => time()]);
$jobs = $jobsRslt->fetchAllAssociative(); $jobs = $jobsRslt->fetchAllAssociative();
@ -501,7 +501,7 @@ class Job extends Repository
$data = $this->prepareJob($values); $data = $this->prepareJob($values);
$data['data'] = json_encode($data['data']); $data['data'] = json_encode($data['data']);
$addJobSql = "INSERT INTO job(name, data, interval, nextrun, lastrun, running) VALUES (:name, :data, :interval, :nextrun, :lastrun, :running)"; $addJobSql = "INSERT INTO job(name, data, `interval`, nextrun, lastrun, running) VALUES (:name, :data, :interval, :nextrun, :lastrun, :running)";
$addJobStmt = $this->dbcon->prepare($addJobSql); $addJobStmt = $this->dbcon->prepare($addJobSql);
$addJobStmt->executeQuery([':name' => $data['name'], ':data' => $data['data'], ':interval' => $data['interval'], ':nextrun' => $data['nextrun'], ':lastrun' => $data['lastrun'], ':running' => 0]); $addJobStmt->executeQuery([':name' => $data['name'], ':data' => $data['data'], ':interval' => $data['interval'], ':nextrun' => $data['nextrun'], ':lastrun' => $data['lastrun'], ':running' => 0]);
@ -520,7 +520,7 @@ class Job extends Repository
} }
$data = $this->prepareJob($values); $data = $this->prepareJob($values);
$data['data'] = json_encode($data['data']); $data['data'] = json_encode($data['data']);
$editJobSql = "UPDATE job SET name = :name, data = :data, interval = :interval, nextrun = :nextrun, lastrun = :lastrun WHERE id = :id"; $editJobSql = "UPDATE job SET name = :name, data = :data, `interval` = :interval, nextrun = :nextrun, lastrun = :lastrun WHERE id = :id";
$editJobStmt = $this->dbcon->prepare($editJobSql); $editJobStmt = $this->dbcon->prepare($editJobSql);
$editJobStmt->executeQuery([':name' => $data['name'], ':data' => $data['data'], ':interval' => $data['interval'], ':nextrun' => $data['nextrun'], ':lastrun' => $data['lastrun'],':id' => $id ]); $editJobStmt->executeQuery([':name' => $data['name'], ':data' => $data['data'], ':interval' => $data['interval'], ':nextrun' => $data['nextrun'], ':lastrun' => $data['lastrun'],':id' => $id ]);
@ -559,7 +559,7 @@ class Job extends Repository
$values['data']['getservices-command'] = $values['getservices-command']; $values['data']['getservices-command'] = $values['getservices-command'];
$values['data']['getservices-response'] = explode(',',$values['getservices-response']); $values['data']['getservices-response'] = explode(',',$values['getservices-response']);
$values['data']['reboot-duration'] = $values['reboot-duration']; $values['data']['reboot-duration'] = $values['reboot-duration'];
if(!empty($values['reboot-delay'])) { if(!empty($values['reboot-delay']) || $values['reboot-delay'] == 0) {
$newsecretkey = count($values['var-value']); $newsecretkey = count($values['var-value']);
$values['var-id'][$newsecretkey] = 'reboot-delay'; $values['var-id'][$newsecretkey] = 'reboot-delay';
$values['var-issecret'][$newsecretkey] = false; $values['var-issecret'][$newsecretkey] = false;
@ -638,8 +638,8 @@ class Job extends Repository
} }
if(!empty($values['var-value'])) { if(!empty($values['var-value'])) {
foreach($values['var-value'] as $key => $name) { foreach($values['var-value'] as $key => $value) {
if(!empty($name)) { if(!empty($value) || $value == 0) {
if(isset($values['var-issecret'][$key]) && $values['var-issecret'][$key] != false) { if(isset($values['var-issecret'][$key]) && $values['var-issecret'][$key] != false) {
$values['data']['vars'][$values['var-id'][$key]]['issecret'] = true; $values['data']['vars'][$values['var-id'][$key]]['issecret'] = true;
$values['data']['vars'][$values['var-id'][$key]]['value'] = base64_encode(Secret::encrypt($values['var-value'][$key])); $values['data']['vars'][$values['var-id'][$key]]['value'] = base64_encode(Secret::encrypt($values['var-value'][$key]));