From 0c4c018ffa94fa882952ccfbb08e06af0c58b771 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 20 Sep 2024 13:39:21 +0900 Subject: [PATCH] Composer update --- composer.lock | 158 +++++++++--------- www/composer.lock | 14 +- www/vendor/composer/installed.json | 16 +- www/vendor/composer/installed.php | 8 +- .../publish/last.published | 2 +- .../src/Admin/Backend.php | 6 +- .../corelibs-composer-all/src/Basic.php | 2 +- .../src/Convert/Extends/SetVarTypeMain.php | 6 +- .../src/Convert/SetVarTypeNull.php | 6 +- .../corelibs-composer-all/src/DB/IO.php | 24 ++- .../src/Language/GetLocale.php | 4 +- .../src/Logging/Logger/MessageLevel.php | 2 + .../src/Output/Form/Elements.php | 12 +- .../src/Template/HtmlBuilder/Element.php | 4 +- .../CoreLibsLoggingErrorMessagesTest.php | 5 + www/vendor/psr/log/src/LoggerInterface.php | 1 + 16 files changed, 145 insertions(+), 125 deletions(-) diff --git a/composer.lock b/composer.lock index 9eff0658..6cabd593 100644 --- a/composer.lock +++ b/composer.lock @@ -88,24 +88,24 @@ }, { "name": "composer/semver", - "version": "3.4.2", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6" + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6", - "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6", + "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" }, "type": "library", "extra": { @@ -149,7 +149,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.2" + "source": "https://github.com/composer/semver/tree/3.4.3" }, "funding": [ { @@ -165,7 +165,7 @@ "type": "tidelift" } ], - "time": "2024-07-12T11:35:52+00:00" + "time": "2024-09-19T14:15:21+00:00" }, { "name": "composer/xdebug-handler", @@ -502,16 +502,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.4.1", + "version": "v4.5.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0" + "reference": "8e76efb98ee8b6afc54687045e1b8dba55ac76e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0", - "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8e76efb98ee8b6afc54687045e1b8dba55ac76e5", + "reference": "8e76efb98ee8b6afc54687045e1b8dba55ac76e5", "shasum": "" }, "require": { @@ -547,22 +547,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.5.0" }, - "time": "2024-01-31T06:18:54+00:00" + "time": "2024-09-08T10:13:13+00:00" }, { "name": "nikic/php-parser", - "version": "v5.1.0", + "version": "v5.2.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1" + "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1", - "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", + "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", "shasum": "" }, "require": { @@ -605,9 +605,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0" }, - "time": "2024-07-01T20:03:41+00:00" + "time": "2024-09-15T16:40:33+00:00" }, { "name": "phan/phan", @@ -984,16 +984,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.30.0", + "version": "1.30.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f" + "reference": "51b95ec8670af41009e2b2b56873bad96682413e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/5ceb0e384997db59f38774bf79c2a6134252c08f", - "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/51b95ec8670af41009e2b2b56873bad96682413e", + "reference": "51b95ec8670af41009e2b2b56873bad96682413e", "shasum": "" }, "require": { @@ -1025,22 +1025,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.1" }, - "time": "2024-08-29T09:54:52+00:00" + "time": "2024-09-07T20:13:05+00:00" }, { "name": "phpstan/phpstan", - "version": "1.12.0", + "version": "1.12.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "384af967d35b2162f69526c7276acadce534d0e1" + "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/384af967d35b2162f69526c7276acadce534d0e1", - "reference": "384af967d35b2162f69526c7276acadce534d0e1", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ffa517cb918591b93acc9b95c0bebdcd0e4538bd", + "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd", "shasum": "" }, "require": { @@ -1085,7 +1085,7 @@ "type": "github" } ], - "time": "2024-08-27T09:18:05+00:00" + "time": "2024-09-19T07:58:01+00:00" }, { "name": "phpunit/php-code-coverage", @@ -1408,16 +1408,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.20", + "version": "9.6.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "49d7820565836236411f5dc002d16dd689cde42f" + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/49d7820565836236411f5dc002d16dd689cde42f", - "reference": "49d7820565836236411f5dc002d16dd689cde42f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", "shasum": "" }, "require": { @@ -1432,7 +1432,7 @@ "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.31", + "phpunit/php-code-coverage": "^9.2.32", "phpunit/php-file-iterator": "^3.0.6", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.4", @@ -1491,7 +1491,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" }, "funding": [ { @@ -1507,7 +1507,7 @@ "type": "tidelift" } ], - "time": "2024-07-10T11:45:39+00:00" + "time": "2024-09-19T10:50:18+00:00" }, { "name": "psr/container", @@ -1564,16 +1564,16 @@ }, { "name": "psr/log", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "79dff0b268932c640297f5208d6298f71855c03e" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", - "reference": "79dff0b268932c640297f5208d6298f71855c03e", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { @@ -1608,9 +1608,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.1" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2024-08-21T13:31:24+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { "name": "sabre/event", @@ -2803,20 +2803,20 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -2862,7 +2862,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -2878,24 +2878,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -2940,7 +2940,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -2956,24 +2956,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -3021,7 +3021,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -3037,24 +3037,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -3101,7 +3101,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -3117,24 +3117,24 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -3181,7 +3181,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -3197,7 +3197,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/service-contracts", diff --git a/www/composer.lock b/www/composer.lock index c190fcca..e422dce0 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "51fef30364605215cbe2919457bb5c5eb6a13a96" + "reference": "e7fe4655d1c9e8ae444ff07f1d8d71c205260e72" }, "require": { "php": ">=8.2", @@ -130,16 +130,16 @@ }, { "name": "psr/log", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "79dff0b268932c640297f5208d6298f71855c03e" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", - "reference": "79dff0b268932c640297f5208d6298f71855c03e", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { @@ -174,9 +174,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.1" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2024-08-21T13:31:24+00:00" + "time": "2024-09-11T13:17:53+00:00" } ], "packages-dev": [], diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index df56dade..86c4324a 100644 --- a/www/vendor/composer/installed.json +++ b/www/vendor/composer/installed.json @@ -7,7 +7,7 @@ "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "51fef30364605215cbe2919457bb5c5eb6a13a96" + "reference": "e7fe4655d1c9e8ae444ff07f1d8d71c205260e72" }, "require": { "php": ">=8.2", @@ -133,23 +133,23 @@ }, { "name": "psr/log", - "version": "3.0.1", - "version_normalized": "3.0.1.0", + "version": "3.0.2", + "version_normalized": "3.0.2.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "79dff0b268932c640297f5208d6298f71855c03e" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", - "reference": "79dff0b268932c640297f5208d6298f71855c03e", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { "php": ">=8.0.0" }, - "time": "2024-08-21T13:31:24+00:00", + "time": "2024-09-11T13:17:53+00:00", "type": "library", "extra": { "branch-alias": { @@ -180,7 +180,7 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.1" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, "install-path": "../psr/log" } diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index 1a31da8a..abd7f316 100644 --- a/www/vendor/composer/installed.php +++ b/www/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'egrajp/corelibs-composer-all' => array( 'pretty_version' => 'dev-development', 'version' => 'dev-development', - 'reference' => '51fef30364605215cbe2919457bb5c5eb6a13a96', + 'reference' => 'e7fe4655d1c9e8ae444ff07f1d8d71c205260e72', 'type' => 'library', 'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all', 'aliases' => array(), @@ -47,9 +47,9 @@ 'dev_requirement' => false, ), 'psr/log' => array( - 'pretty_version' => '3.0.1', - 'version' => '3.0.1.0', - 'reference' => '79dff0b268932c640297f5208d6298f71855c03e', + 'pretty_version' => '3.0.2', + 'version' => '3.0.2.0', + 'reference' => 'f16e1d5863e37f8d8c2a01719f5b34baa2b714d3', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/log', 'aliases' => array(), diff --git a/www/vendor/egrajp/corelibs-composer-all/publish/last.published b/www/vendor/egrajp/corelibs-composer-all/publish/last.published index 7961dfd4..a4fac8e3 100644 --- a/www/vendor/egrajp/corelibs-composer-all/publish/last.published +++ b/www/vendor/egrajp/corelibs-composer-all/publish/last.published @@ -1 +1 @@ -9.14.0 +9.15.0 diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Admin/Backend.php b/www/vendor/egrajp/corelibs-composer-all/src/Admin/Backend.php index f06b7860..44b771d2 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Admin/Backend.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Admin/Backend.php @@ -504,9 +504,9 @@ class Backend string $data, string $key_name, string $key_value, - string $associate = null, - string $file = null, - string $db_schema = null, + ?string $associate = null, + ?string $file = null, + ?string $db_schema = null, ): void { /** @var string $DB_SCHEMA check schema */ $DB_SCHEMA = 'public'; diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Basic.php b/www/vendor/egrajp/corelibs-composer-all/src/Basic.php index d0694868..065ec63e 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Basic.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Basic.php @@ -90,7 +90,7 @@ class Basic * @deprecated DO NOT USE Class\Basic anymore. Use dedicated logger and sub classes */ public function __construct( - \CoreLibs\Logging\Logging $log = null, + ?\CoreLibs\Logging\Logging $log = null, ?string $session_name = null ) { trigger_error('Class \CoreLibs\Basic is deprected', E_USER_DEPRECATED); diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Convert/Extends/SetVarTypeMain.php b/www/vendor/egrajp/corelibs-composer-all/src/Convert/Extends/SetVarTypeMain.php index d32e416e..7d4601c6 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Convert/Extends/SetVarTypeMain.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Convert/Extends/SetVarTypeMain.php @@ -52,7 +52,7 @@ class SetVarTypeMain */ protected static function makeStrMain( mixed $val, - string $default = null, + ?string $default = null, bool $to_null = false ): ?string { // int/float/string/bool/null, everything else is ignored @@ -113,7 +113,7 @@ class SetVarTypeMain */ protected static function makeIntMain( mixed $val, - int $default = null, + ?int $default = null, bool $to_null = false ): ?int { // if we can filter it to a valid int, we can convert it @@ -167,7 +167,7 @@ class SetVarTypeMain */ protected static function makeFloatMain( mixed $val, - float $default = null, + ?float $default = null, bool $to_null = false ): ?float { if ( diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Convert/SetVarTypeNull.php b/www/vendor/egrajp/corelibs-composer-all/src/Convert/SetVarTypeNull.php index 6d2c1618..12d22e47 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Convert/SetVarTypeNull.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Convert/SetVarTypeNull.php @@ -35,7 +35,7 @@ class SetVarTypeNull extends Extends\SetVarTypeMain * @param string|null $default Default override value * @return string|null Input value as string or default as string/null */ - public static function makeStr(mixed $val, string $default = null): ?string + public static function makeStr(mixed $val, ?string $default = null): ?string { return SetVarTypeMain::makeStrMain($val, $default, true); } @@ -60,7 +60,7 @@ class SetVarTypeNull extends Extends\SetVarTypeMain * @param int|null $default Default override value * @return int|null Input value as int or default as int/null */ - public static function makeInt(mixed $val, int $default = null): ?int + public static function makeInt(mixed $val, ?int $default = null): ?int { return SetVarTypeMain::makeIntMain($val, $default, true); } @@ -84,7 +84,7 @@ class SetVarTypeNull extends Extends\SetVarTypeMain * @param float|null $default Default override value * @return float|null Input value as float or default as float/null */ - public static function makeFloat(mixed $val, float $default = null): ?float + public static function makeFloat(mixed $val, ?float $default = null): ?float { return SetVarTypeMain::makeFloatMain($val, $default, true); } diff --git a/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php b/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php index c28471ee..a006b1a6 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php @@ -1896,7 +1896,12 @@ class IO $matches = []; // compare has =, >, < prefix, and gets stripped // if the rest is not X.Y format then error - preg_match("/^([<>=]{1,})(\d{1,})\.(\d{1,})/", $compare, $matches); + if (!preg_match("/^([<>=]{1,})(\d{1,})\.(\d{1,})/", $compare, $matches)) { + $this->log->error('Could not regex match compare version string', [ + "compare" => $compare + ]); + return false; + } $compare = $matches[1]; $to_master = $matches[2]; $to_minor = $matches[3]; @@ -1908,11 +1913,18 @@ class IO } // db_version can return X.Y.Z // we only compare the first two - preg_match( - "/^(\d{1,})\.(\d{1,})\.?(\d{1,})?/", - $this->dbVersion(), - $matches - ); + if ( + !preg_match( + "/^(\d{1,})\.(\d{1,})\.?(\d{1,})?/", + $this->dbVersion(), + $matches + ) + ) { + $this->log->error('Could not regex match dbVersion string', [ + "dbVersion" => $this->dbVersion() + ]); + return false; + } $master = $matches[1]; $minor = $matches[2]; $version = $master . ($minor < 10 ? '0' : '') . $minor; diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Language/GetLocale.php b/www/vendor/egrajp/corelibs-composer-all/src/Language/GetLocale.php index 1f7842fc..d0e6f9e1 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Language/GetLocale.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Language/GetLocale.php @@ -128,7 +128,7 @@ class GetLocale $matches ) ) { - $lang = ($matches['lang'] ?? 'en') + $lang = $matches['lang'] // add country only if set . (!empty($matches['country']) ? '_' . $matches['country'] : ''); } else { @@ -235,7 +235,7 @@ class GetLocale $matches ) ) { - $lang = ($matches['lang'] ?? 'en') + $lang = $matches['lang'] // add country only if set . (!empty($matches['country']) ? '_' . $matches['country'] : ''); } else { diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logger/MessageLevel.php b/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logger/MessageLevel.php index 8efc8bca..c03033e1 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logger/MessageLevel.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logger/MessageLevel.php @@ -14,6 +14,7 @@ namespace CoreLibs\Logging\Logger; enum MessageLevel: int { case ok = 100; + case success = 110; // special for file uploads case info = 200; case notice = 250; case warn = 300; @@ -30,6 +31,7 @@ enum MessageLevel: int { return match (strtolower($name)) { 'ok' => self::ok, + 'success' => self::success, 'info' => self::info, 'notice' => self::notice, 'warn', 'warning' => self::warn, diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Elements.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Elements.php index b6ee9d8b..6fbd38ed 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Elements.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Elements.php @@ -194,13 +194,13 @@ class Elements "/(mailto:)?(\>)?\b([\w\.-]+)@([\w\.\-]+)\.([a-zA-Z]{2,4})\b(\|([^\||^#]+)(#([^\|]+))?\|)?/", function ($matches) { return self::createEmail( - $matches[1] ?? '', - $matches[2] ?? '', - $matches[3] ?? '', - $matches[4] ?? '', - $matches[5] ?? '', + $matches[1], + $matches[2], + $matches[3], + $matches[4], + $matches[5], $matches[7] ?? '', - $matches[9] ?? '' + $matches[9] ?? '', ); }, $output diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Template/HtmlBuilder/Element.php b/www/vendor/egrajp/corelibs-composer-all/src/Template/HtmlBuilder/Element.php index 85d58745..d9c2cc1c 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Template/HtmlBuilder/Element.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Template/HtmlBuilder/Element.php @@ -401,7 +401,7 @@ class Element * @param bool $add_nl [default=false] Optional output string line breaks * @return string HTML as string */ - public function buildHtml(Element $tree = null, bool $add_nl = false): string + public function buildHtml(?Element $tree = null, bool $add_nl = false): string { // print "D01: " . microtime(true) . "
"; if ($tree === null) { @@ -533,7 +533,7 @@ class Element * @return string build html as string * @deprecated Do not use, use Element->buildHtml() instead */ - public static function printHtmlFromObject(Element $tree = null, bool $add_nl = false): string + public static function printHtmlFromObject(?Element $tree = null, bool $add_nl = false): string { // nothing ->bad if ($tree === null) { diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingErrorMessagesTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingErrorMessagesTest.php index 7e1729cc..a92b4445 100644 --- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingErrorMessagesTest.php +++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingErrorMessagesTest.php @@ -39,6 +39,11 @@ final class CoreLibsLoggingErrorMessagesTest extends TestCase 'str' => 'OK', 'expected' => 'ok', ], + 'success' => [ + 'level' => 'success', + 'str' => 'SUCCESS', + 'expected' => 'success', + ], 'info' => [ 'level' => 'info', 'str' => 'INFO', diff --git a/www/vendor/psr/log/src/LoggerInterface.php b/www/vendor/psr/log/src/LoggerInterface.php index 8afabc90..cb4cf648 100644 --- a/www/vendor/psr/log/src/LoggerInterface.php +++ b/www/vendor/psr/log/src/LoggerInterface.php @@ -89,6 +89,7 @@ interface LoggerInterface /** * Logs with an arbitrary level. * + * @param mixed $level * @param mixed[] $context * * @throws \Psr\Log\InvalidArgumentException