diff --git a/composer.lock b/composer.lock index 0f35232f..9eff0658 100644 --- a/composer.lock +++ b/composer.lock @@ -9,26 +9,26 @@ "packages-dev": [ { "name": "composer/pcre", - "version": "3.2.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90" + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90", - "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90", + "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, "conflict": { - "phpstan/phpstan": "<1.11.8" + "phpstan/phpstan": "<1.11.10" }, "require-dev": { - "phpstan/phpstan": "^1.11.8", + "phpstan/phpstan": "^1.11.10", "phpstan/phpstan-strict-rules": "^1.1", "phpunit/phpunit": "^8 || ^9" }, @@ -68,7 +68,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.2.0" + "source": "https://github.com/composer/pcre/tree/3.3.1" }, "funding": [ { @@ -84,7 +84,7 @@ "type": "tidelift" } ], - "time": "2024-07-25T09:36:02+00:00" + "time": "2024-08-27T18:44:43+00:00" }, { "name": "composer/semver", @@ -611,16 +611,16 @@ }, { "name": "phan/phan", - "version": "5.4.4", + "version": "5.4.5", "source": { "type": "git", "url": "https://github.com/phan/phan.git", - "reference": "a87bbadc95a5b57353f911fdbd227404f3b47c22" + "reference": "2b15302175931a0629a85c57d0c1f91d68b26a4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phan/phan/zipball/a87bbadc95a5b57353f911fdbd227404f3b47c22", - "reference": "a87bbadc95a5b57353f911fdbd227404f3b47c22", + "url": "https://api.github.com/repos/phan/phan/zipball/2b15302175931a0629a85c57d0c1f91d68b26a4d", + "reference": "2b15302175931a0629a85c57d0c1f91d68b26a4d", "shasum": "" }, "require": { @@ -685,9 +685,9 @@ ], "support": { "issues": "https://github.com/phan/phan/issues", - "source": "https://github.com/phan/phan/tree/5.4.4" + "source": "https://github.com/phan/phan/tree/5.4.5" }, - "time": "2024-07-25T20:34:20+00:00" + "time": "2024-08-13T21:41:35+00:00" }, { "name": "phar-io/manifest", @@ -984,16 +984,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.29.1", + "version": "1.30.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4" + "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4", - "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/5ceb0e384997db59f38774bf79c2a6134252c08f", + "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f", "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.29.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.0" }, - "time": "2024-05-31T08:52:43+00:00" + "time": "2024-08-29T09:54:52+00:00" }, { "name": "phpstan/phpstan", - "version": "1.11.9", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "e370bcddadaede0c1716338b262346f40d296f82" + "reference": "384af967d35b2162f69526c7276acadce534d0e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e370bcddadaede0c1716338b262346f40d296f82", - "reference": "e370bcddadaede0c1716338b262346f40d296f82", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/384af967d35b2162f69526c7276acadce534d0e1", + "reference": "384af967d35b2162f69526c7276acadce534d0e1", "shasum": "" }, "require": { @@ -1085,39 +1085,39 @@ "type": "github" } ], - "time": "2024-08-01T16:25:18+00:00" + "time": "2024-08-27T09:18:05+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.31", + "version": "9.2.32", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", - "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", + "nikic/php-parser": "^4.19.1 || ^5.1.0", "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -1126,7 +1126,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "9.2.x-dev" } }, "autoload": { @@ -1155,7 +1155,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" }, "funding": [ { @@ -1163,7 +1163,7 @@ "type": "github" } ], - "time": "2024-03-02T06:37:42+00:00" + "time": "2024-08-22T04:23:01+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1564,16 +1564,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "79dff0b268932c640297f5208d6298f71855c03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", + "reference": "79dff0b268932c640297f5208d6298f71855c03e", "shasum": "" }, "require": { @@ -1608,29 +1608,29 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.1" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-08-21T13:31:24+00:00" }, { "name": "sabre/event", - "version": "5.1.6", + "version": "5.1.7", "source": { "type": "git", "url": "https://github.com/sabre-io/event.git", - "reference": "e0e1ccbff1965083de9a6530182b8b70819e1347" + "reference": "86d57e305c272898ba3c28e9bd3d65d5464587c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/event/zipball/e0e1ccbff1965083de9a6530182b8b70819e1347", - "reference": "e0e1ccbff1965083de9a6530182b8b70819e1347", + "url": "https://api.github.com/repos/sabre-io/event/zipball/86d57e305c272898ba3c28e9bd3d65d5464587c2", + "reference": "86d57e305c272898ba3c28e9bd3d65d5464587c2", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.17.1", + "friendsofphp/php-cs-fixer": "~2.17.1||^3.63", "phpstan/phpstan": "^0.12", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" }, @@ -1676,7 +1676,7 @@ "issues": "https://github.com/sabre-io/event/issues", "source": "https://github.com/fruux/sabre-event" }, - "time": "2024-07-26T05:09:47+00:00" + "time": "2024-08-27T11:23:05+00:00" }, { "name": "sebastian/cli-parser", @@ -2643,16 +2643,16 @@ }, { "name": "symfony/console", - "version": "v7.1.3", + "version": "v7.1.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9" + "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9", - "reference": "cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9", + "url": "https://api.github.com/repos/symfony/console/zipball/1eed7af6961d763e7832e874d7f9b21c3ea9c111", + "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111", "shasum": "" }, "require": { @@ -2716,7 +2716,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.3" + "source": "https://github.com/symfony/console/tree/v7.1.4" }, "funding": [ { @@ -2732,7 +2732,7 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:41:01+00:00" + "time": "2024-08-15T22:48:53+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3284,16 +3284,16 @@ }, { "name": "symfony/string", - "version": "v7.1.3", + "version": "v7.1.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "ea272a882be7f20cad58d5d78c215001617b7f07" + "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/ea272a882be7f20cad58d5d78c215001617b7f07", - "reference": "ea272a882be7f20cad58d5d78c215001617b7f07", + "url": "https://api.github.com/repos/symfony/string/zipball/6cd670a6d968eaeb1c77c2e76091c45c56bc367b", + "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b", "shasum": "" }, "require": { @@ -3351,7 +3351,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.1.3" + "source": "https://github.com/symfony/string/tree/v7.1.4" }, "funding": [ { @@ -3367,7 +3367,7 @@ "type": "tidelift" } ], - "time": "2024-07-22T10:25:37+00:00" + "time": "2024-08-12T09:59:40+00:00" }, { "name": "theseer/tokenizer", diff --git a/www/composer.lock b/www/composer.lock index a9b6e6e1..c190fcca 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": "3eb122959045f8de10f9dd35e6632199021752b8" + "reference": "51fef30364605215cbe2919457bb5c5eb6a13a96" }, "require": { "php": ">=8.2", @@ -76,16 +76,16 @@ }, { "name": "gullevek/dotenv", - "version": "v2.0.8", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/gullevek/dotEnv.git", - "reference": "e29f9fcd8853a09bb89b0eb8ee555b754ecee36e" + "reference": "b9feacaded4e48effff9da7d1173752aef3dc27f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gullevek/dotEnv/zipball/e29f9fcd8853a09bb89b0eb8ee555b754ecee36e", - "reference": "e29f9fcd8853a09bb89b0eb8ee555b754ecee36e", + "url": "https://api.github.com/repos/gullevek/dotEnv/zipball/b9feacaded4e48effff9da7d1173752aef3dc27f", + "reference": "b9feacaded4e48effff9da7d1173752aef3dc27f", "shasum": "" }, "require": { @@ -124,22 +124,22 @@ ], "support": { "issues": "https://github.com/gullevek/dotEnv/issues", - "source": "https://github.com/gullevek/dotEnv/tree/v2.0.8" + "source": "https://github.com/gullevek/dotEnv/tree/v2.1.0" }, - "time": "2023-03-03T00:32:02+00:00" + "time": "2024-08-21T02:41:15+00:00" }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "79dff0b268932c640297f5208d6298f71855c03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", + "reference": "79dff0b268932c640297f5208d6298f71855c03e", "shasum": "" }, "require": { @@ -174,9 +174,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.1" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-08-21T13:31:24+00:00" } ], "packages-dev": [], diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index 02488f4b..df56dade 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": "3eb122959045f8de10f9dd35e6632199021752b8" + "reference": "51fef30364605215cbe2919457bb5c5eb6a13a96" }, "require": { "php": ">=8.2", @@ -76,17 +76,17 @@ }, { "name": "gullevek/dotenv", - "version": "v2.0.8", - "version_normalized": "2.0.8.0", + "version": "v2.1.0", + "version_normalized": "2.1.0.0", "source": { "type": "git", "url": "https://github.com/gullevek/dotEnv.git", - "reference": "e29f9fcd8853a09bb89b0eb8ee555b754ecee36e" + "reference": "b9feacaded4e48effff9da7d1173752aef3dc27f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gullevek/dotEnv/zipball/e29f9fcd8853a09bb89b0eb8ee555b754ecee36e", - "reference": "e29f9fcd8853a09bb89b0eb8ee555b754ecee36e", + "url": "https://api.github.com/repos/gullevek/dotEnv/zipball/b9feacaded4e48effff9da7d1173752aef3dc27f", + "reference": "b9feacaded4e48effff9da7d1173752aef3dc27f", "shasum": "" }, "require": { @@ -97,7 +97,7 @@ "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9" }, - "time": "2023-03-03T00:32:02+00:00", + "time": "2024-08-21T02:41:15+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -127,29 +127,29 @@ ], "support": { "issues": "https://github.com/gullevek/dotEnv/issues", - "source": "https://github.com/gullevek/dotEnv/tree/v2.0.8" + "source": "https://github.com/gullevek/dotEnv/tree/v2.1.0" }, "install-path": "../gullevek/dotenv" }, { "name": "psr/log", - "version": "3.0.0", - "version_normalized": "3.0.0.0", + "version": "3.0.1", + "version_normalized": "3.0.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "79dff0b268932c640297f5208d6298f71855c03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", + "reference": "79dff0b268932c640297f5208d6298f71855c03e", "shasum": "" }, "require": { "php": ">=8.0.0" }, - "time": "2021-07-14T16:46:02+00:00", + "time": "2024-08-21T13:31:24+00:00", "type": "library", "extra": { "branch-alias": { @@ -180,7 +180,7 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.1" }, "install-path": "../psr/log" } diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index d4be8e36..1a31da8a 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' => '3eb122959045f8de10f9dd35e6632199021752b8', + 'reference' => '51fef30364605215cbe2919457bb5c5eb6a13a96', 'type' => 'library', 'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all', 'aliases' => array(), @@ -38,18 +38,18 @@ 'dev_requirement' => false, ), 'gullevek/dotenv' => array( - 'pretty_version' => 'v2.0.8', - 'version' => '2.0.8.0', - 'reference' => 'e29f9fcd8853a09bb89b0eb8ee555b754ecee36e', + 'pretty_version' => 'v2.1.0', + 'version' => '2.1.0.0', + 'reference' => 'b9feacaded4e48effff9da7d1173752aef3dc27f', 'type' => 'library', 'install_path' => __DIR__ . '/../gullevek/dotenv', 'aliases' => array(), 'dev_requirement' => false, ), 'psr/log' => array( - 'pretty_version' => '3.0.0', - 'version' => '3.0.0.0', - 'reference' => 'fe5ea303b0887d5caefd3d431c3e61ad47037001', + 'pretty_version' => '3.0.1', + 'version' => '3.0.1.0', + 'reference' => '79dff0b268932c640297f5208d6298f71855c03e', '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 17920796..7961dfd4 100644 --- a/www/vendor/egrajp/corelibs-composer-all/publish/last.published +++ b/www/vendor/egrajp/corelibs-composer-all/publish/last.published @@ -1 +1 @@ -9.13.2 +9.14.0 diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Convert/Strings.php b/www/vendor/egrajp/corelibs-composer-all/src/Convert/Strings.php index 2935e26d..81632392 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Convert/Strings.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Convert/Strings.php @@ -134,6 +134,18 @@ class Strings $path ) ?? $path; } + + /** + * Remove UTF8 BOM Byte string from line + * Note: this is often found in CSV files exported from Excel at the first row, first element + * + * @param string $text + * @return string + */ + public static function stripUTF8BomBytes(string $text): string + { + return trim($text, pack('H*', 'EFBBBF')); + } } // __END__ 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 a6d7ad63..c28471ee 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php @@ -2402,7 +2402,7 @@ class IO // flag if we have cache data stored at the moment 'cached' => false, // when fetch array or cache read returns false - // in loop read that means dbReturn retuns false without erro + // in loop read that means dbReturn retuns false without error 'finished' => false, // read from cache/db (pos == rows) 'read_finished' => false, diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Get/System.php b/www/vendor/egrajp/corelibs-composer-all/src/Get/System.php index 690b43b8..3a2bd2b1 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Get/System.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Get/System.php @@ -116,6 +116,29 @@ class System 3 ) === 'cli' ? true : false; } + + /** + * Collect all IP addresses + * REMOTE_ADDR, HTTP_X_FORWARD_FOR, CLIENT_IP + * and retuns them in an array with index of io source + * if address source has addresses with "," will add "-array" with these as array block + * + * @return array> + */ + public static function getIpAddresses(): array + { + $ip_addr = []; + foreach (['REMOTE_ADDR', 'HTTP_X_FORWARDED_FOR', 'CLIENT_IP'] as $_ip_source) { + if (!empty($_SERVER[$_ip_source])) { + $ip_addr[$_ip_source] = $_SERVER[$_ip_source]; + // same level as ARRAY IF there is a , inside + if (strstr($_SERVER[$_ip_source], ',') !== false) { + $ip_addr[$_ip_source . '-array'] = explode(',', $_SERVER[$_ip_source]); + } + } + } + return $ip_addr; + } } // __END__ diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Template/HtmlBuilder/Block.php b/www/vendor/egrajp/corelibs-composer-all/src/Template/HtmlBuilder/Block.php index 2015280e..ec8b9e38 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Template/HtmlBuilder/Block.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Template/HtmlBuilder/Block.php @@ -19,7 +19,7 @@ use CoreLibs\Template\HtmlBuilder\General\HtmlBuilderExcpetion; class Block { /** - * Undocumented function + * Create Element * * @param string $tag * @param string $id @@ -86,7 +86,7 @@ class Block } /** - * Undocumented function + * Add multiple elements to the base element * * @param array{tag:string,id:string,name:string,content:string,css:array,options:array,sub:array} $base * @param array{tag:string,id:string,name:string,content:string,css:array,options:array,sub:array} ...$attach @@ -101,7 +101,7 @@ class Block } /** - * Undocumented function + * Add multiple sub elements to the base element * * @param array{tag:string,id:string,name:string,content:string,css:array,options:array,sub:array} $element * @param array{tag:string,id:string,name:string,content:string,css:array,options:array,sub:array} $sub @@ -117,7 +117,7 @@ class Block } /** - * Undocumented function + * Remove all sub element entries * * @param array{tag:string,id:string,name:string,content:string,css:array,options:array,sub:array} $element * @return array{tag:string,id:string,name:string,content:string,css:array,options:array,sub:array} @@ -131,7 +131,7 @@ class Block // CSS Elements /** - * Undocumented function + * Add css entry to the css entries * * @param array{tag:string,id:string,name:string,content:string,css:array,options:array,sub:array} $element * @param string ...$css @@ -144,7 +144,7 @@ class Block } /** - * Undocumented function + * Remove a css entry entry from the css array * * @param array{tag:string,id:string,name:string,content:string,css:array,options:array,sub:array} $element * @param string ...$css @@ -157,7 +157,7 @@ class Block } /** - * Undocumented function + * Switch CSS entries * scssel (switch) is not supported * use rcssel -> acssel * @@ -175,7 +175,7 @@ class Block } /** - * Undocumented function + * Build HTML from the content tree * alias phfo * * @param array{tag:string,id:string,name:string,content:string,css:array,options:array,sub:array} $tree @@ -231,7 +231,19 @@ class Block } /** - * Undocumented function + * Alias for phfo + * + * @param array{tag:string,id:string,name:string,content:string,css:array,options:array,sub:array} $tree + * @param bool $add_nl [default=false] + * @return string + */ + public static function phfo(array $tree, bool $add_nl = false): string + { + return self::buildHtml($tree, $add_nl); + } + + /** + * Build HTML elements from an array of elements * alias phfa * * @param array,options:array,sub:array}> $list @@ -248,8 +260,7 @@ class Block } /** - * Undocumented function - * wrapper for buildHtmlFromList + * alias for buildHtmlFromList * * @param array,options:array,sub:array}> $list array of Elements to build string from * @param bool $add_nl [default=false] Optional output string line break diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Template/SmartyExtend.php b/www/vendor/egrajp/corelibs-composer-all/src/Template/SmartyExtend.php index 94870661..e9b906d6 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Template/SmartyExtend.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Template/SmartyExtend.php @@ -203,7 +203,8 @@ class SmartyExtend extends \Smarty _bind_textdomain_codeset($this->domain, $this->encoding); // register smarty variable - $this->registerPlugin('modifier', 'getvar', [&$this, 'getTemplateVars']); + // $this->registerPlugin(\Smarty\Smarty::PLUGIN_MODIFIER, 'getvar', [&$this, 'getTemplateVars']); + $this->registerPlugin(self::PLUGIN_MODIFIER, 'getvar', [&$this, 'getTemplateVars']); $this->page_name = \CoreLibs\Get\System::getPageName(); diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Convert/CoreLibsConvertStringsTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Convert/CoreLibsConvertStringsTest.php index 0b2f79a5..c6c92251 100644 --- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Convert/CoreLibsConvertStringsTest.php +++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Convert/CoreLibsConvertStringsTest.php @@ -13,6 +13,8 @@ use PHPUnit\Framework\TestCase; */ final class CoreLibsConvertStringsTest extends TestCase { + private const DATA_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR; + /** * Undocumented function * @@ -330,6 +332,52 @@ final class CoreLibsConvertStringsTest extends TestCase \CoreLibs\Convert\Strings::stripMultiplePathSlashes($input) ); } + + /** + * Undocumented function + * + * @return array + */ + public function providerStripUTF8BomBytes(): array + { + return [ + "utf8-bom" => [ + "file" => "UTF8BOM.csv", + "expect" => "Asset Type,Epic,File Name\n", + ], + "utf8" => [ + "file" => "UTF8.csv", + "expect" => "Asset Type,Epic,File Name\n", + ], + ]; + } + + /** + * test utf8 bom remove + * + * @covers ::stripUTF8BomBytes + * @dataProvider providerStripUTF8BomBytes + * @testdox stripUTF8BomBytes $file will be $expected [$_dataName] + * + * @param string $file + * @param string $expected + * @return void + */ + public function testStripUTF8BomBytes(string $file, string $expected): void + { + // load sample file + if (!is_file(self::DATA_FOLDER . $file)) { + $this->markTestSkipped('File: ' . $file . ' could not be opened'); + } + $file = file_get_contents(self::DATA_FOLDER . $file); + if ($file === false) { + $this->markTestSkipped('File: ' . $file . ' could not be read'); + } + $this->assertEquals( + $expected, + \CoreLibs\Convert\Strings::stripUTF8BomBytes($file) + ); + } } // __END__ diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Get/CoreLibsGetSystemTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Get/CoreLibsGetSystemTest.php index a73e91fc..9017a6d8 100644 --- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Get/CoreLibsGetSystemTest.php +++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Get/CoreLibsGetSystemTest.php @@ -216,6 +216,29 @@ final class CoreLibsGetSystemTest extends TestCase ); } } + + /** + * Undocumented function + * + * @covers ::getIpAddresses + * @testdox getIpAddresses check + * + * @return void + */ + public function testGetIpAddresses() + { + // response must have "REMOTE_ADDR" entry, others are optional + // NOTE: we have no IP addresses on command line + $this->assertTrue( + true, + "We do not have REMOTE_ADDR on command line" + ); + // $this->assertContains( + // 'REMOTE_ADDR', + // array_keys(\CoreLibs\Get\System::getIpAddresses()), + // 'failed REMOTE_ADDR assert' + // ); + } } // __END__ diff --git a/www/vendor/gullevek/dotenv/Readme.md b/www/vendor/gullevek/dotenv/Readme.md index 56a498f6..a3ca819d 100644 --- a/www/vendor/gullevek/dotenv/Readme.md +++ b/www/vendor/gullevek/dotenv/Readme.md @@ -61,6 +61,29 @@ DOUBLE="I will be used" DOUBLE="This will be ignored" ``` +A prefix name can be set with `[PrefixName]`. Tne name rules are like for variables, but spaces +are allowed, but will be converted to "_". +The prefix is valid from the time set until the next prefix block appears or the file ends. + +Example + +```ini +FOO="bar" +FOOBAR="bar bar" +[SecitonA] +FOO="other bar" +FOOBAR="other bar bar" +``` + +Will have environmen variables as + +```php +$_ENV["FOO"]; +$_ENV["FOOBAR"]; +$_ENV["SecitonA.FOO"]; +$_ENV["SecitonA.FOOBAR"]; +``` + ## Development ### Phan diff --git a/www/vendor/gullevek/dotenv/src/DotEnv.php b/www/vendor/gullevek/dotenv/src/DotEnv.php index 6dd878ca..01868f82 100644 --- a/www/vendor/gullevek/dotenv/src/DotEnv.php +++ b/www/vendor/gullevek/dotenv/src/DotEnv.php @@ -22,6 +22,9 @@ class DotEnv * if there are two variables with the same name only the first is used * variables are case sensitive * + * [] Grouping Block Name as prefix until next or end if set, + * space replaced by _, all other var rules apply + * * @param string $path Folder to file, default is __DIR__ * @param string $env_file What file to load, default is .env * @return int -1 other error @@ -56,10 +59,14 @@ class DotEnv $status = 1; $block = false; $var = ''; + $prefix_name = ''; while ($line = fgets($fp)) { - // main match for variable = value part - if (preg_match("/^\s*([\w_.]+)\s*=\s*((\"?).*)/", $line, $matches)) { - $var = $matches[1]; + // [] block must be a single line, or it will be ignored + if (preg_match("/^\s*\[([\w_.\s]+)\]/", $line, $matches)) { + $prefix_name = preg_replace("/\s+/", "_", $matches[1]) . "."; + } elseif (preg_match("/^\s*([\w_.]+)\s*=\s*((\"?).*)/", $line, $matches)) { + // main match for variable = value part + $var = $prefix_name . $matches[1]; $value = $matches[2]; $quotes = $matches[3]; // write only if env is not set yet, and write only the first time diff --git a/www/vendor/psr/log/src/LoggerAwareInterface.php b/www/vendor/psr/log/src/LoggerAwareInterface.php index cc46a951..06218705 100644 --- a/www/vendor/psr/log/src/LoggerAwareInterface.php +++ b/www/vendor/psr/log/src/LoggerAwareInterface.php @@ -9,10 +9,6 @@ interface LoggerAwareInterface { /** * Sets a logger instance on the object. - * - * @param LoggerInterface $logger - * - * @return void */ public function setLogger(LoggerInterface $logger): void; } diff --git a/www/vendor/psr/log/src/LoggerAwareTrait.php b/www/vendor/psr/log/src/LoggerAwareTrait.php index 4fb57a29..85104dbc 100644 --- a/www/vendor/psr/log/src/LoggerAwareTrait.php +++ b/www/vendor/psr/log/src/LoggerAwareTrait.php @@ -9,15 +9,11 @@ trait LoggerAwareTrait { /** * The logger instance. - * - * @var LoggerInterface|null */ protected ?LoggerInterface $logger = null; /** * Sets a logger. - * - * @param LoggerInterface $logger */ public function setLogger(LoggerInterface $logger): void { diff --git a/www/vendor/psr/log/src/LoggerInterface.php b/www/vendor/psr/log/src/LoggerInterface.php index b3a24b5f..8afabc90 100644 --- a/www/vendor/psr/log/src/LoggerInterface.php +++ b/www/vendor/psr/log/src/LoggerInterface.php @@ -22,10 +22,7 @@ interface LoggerInterface /** * System is unusable. * - * @param string|\Stringable $message * @param mixed[] $context - * - * @return void */ public function emergency(string|\Stringable $message, array $context = []): void; @@ -35,10 +32,7 @@ interface LoggerInterface * Example: Entire website down, database unavailable, etc. This should * trigger the SMS alerts and wake you up. * - * @param string|\Stringable $message * @param mixed[] $context - * - * @return void */ public function alert(string|\Stringable $message, array $context = []): void; @@ -47,10 +41,7 @@ interface LoggerInterface * * Example: Application component unavailable, unexpected exception. * - * @param string|\Stringable $message * @param mixed[] $context - * - * @return void */ public function critical(string|\Stringable $message, array $context = []): void; @@ -58,10 +49,7 @@ interface LoggerInterface * Runtime errors that do not require immediate action but should typically * be logged and monitored. * - * @param string|\Stringable $message * @param mixed[] $context - * - * @return void */ public function error(string|\Stringable $message, array $context = []): void; @@ -71,20 +59,14 @@ interface LoggerInterface * Example: Use of deprecated APIs, poor use of an API, undesirable things * that are not necessarily wrong. * - * @param string|\Stringable $message * @param mixed[] $context - * - * @return void */ public function warning(string|\Stringable $message, array $context = []): void; /** * Normal but significant events. * - * @param string|\Stringable $message * @param mixed[] $context - * - * @return void */ public function notice(string|\Stringable $message, array $context = []): void; @@ -93,32 +75,22 @@ interface LoggerInterface * * Example: User logs in, SQL logs. * - * @param string|\Stringable $message * @param mixed[] $context - * - * @return void */ public function info(string|\Stringable $message, array $context = []): void; /** * Detailed debug information. * - * @param string|\Stringable $message * @param mixed[] $context - * - * @return void */ public function debug(string|\Stringable $message, array $context = []): void; /** * Logs with an arbitrary level. * - * @param mixed $level - * @param string|\Stringable $message * @param mixed[] $context * - * @return void - * * @throws \Psr\Log\InvalidArgumentException */ public function log($level, string|\Stringable $message, array $context = []): void; diff --git a/www/vendor/psr/log/src/LoggerTrait.php b/www/vendor/psr/log/src/LoggerTrait.php index 9c8733f9..a5d9980b 100644 --- a/www/vendor/psr/log/src/LoggerTrait.php +++ b/www/vendor/psr/log/src/LoggerTrait.php @@ -14,11 +14,6 @@ trait LoggerTrait { /** * System is unusable. - * - * @param string|\Stringable $message - * @param array $context - * - * @return void */ public function emergency(string|\Stringable $message, array $context = []): void { @@ -30,11 +25,6 @@ trait LoggerTrait * * Example: Entire website down, database unavailable, etc. This should * trigger the SMS alerts and wake you up. - * - * @param string|\Stringable $message - * @param array $context - * - * @return void */ public function alert(string|\Stringable $message, array $context = []): void { @@ -45,11 +35,6 @@ trait LoggerTrait * Critical conditions. * * Example: Application component unavailable, unexpected exception. - * - * @param string|\Stringable $message - * @param array $context - * - * @return void */ public function critical(string|\Stringable $message, array $context = []): void { @@ -59,11 +44,6 @@ trait LoggerTrait /** * Runtime errors that do not require immediate action but should typically * be logged and monitored. - * - * @param string|\Stringable $message - * @param array $context - * - * @return void */ public function error(string|\Stringable $message, array $context = []): void { @@ -75,11 +55,6 @@ trait LoggerTrait * * Example: Use of deprecated APIs, poor use of an API, undesirable things * that are not necessarily wrong. - * - * @param string|\Stringable $message - * @param array $context - * - * @return void */ public function warning(string|\Stringable $message, array $context = []): void { @@ -88,11 +63,6 @@ trait LoggerTrait /** * Normal but significant events. - * - * @param string|\Stringable $message - * @param array $context - * - * @return void */ public function notice(string|\Stringable $message, array $context = []): void { @@ -103,11 +73,6 @@ trait LoggerTrait * Interesting events. * * Example: User logs in, SQL logs. - * - * @param string|\Stringable $message - * @param array $context - * - * @return void */ public function info(string|\Stringable $message, array $context = []): void { @@ -116,11 +81,6 @@ trait LoggerTrait /** * Detailed debug information. - * - * @param string|\Stringable $message - * @param array $context - * - * @return void */ public function debug(string|\Stringable $message, array $context = []): void { @@ -130,11 +90,7 @@ trait LoggerTrait /** * Logs with an arbitrary level. * - * @param mixed $level - * @param string|\Stringable $message - * @param array $context - * - * @return void + * @param mixed $level * * @throws \Psr\Log\InvalidArgumentException */ diff --git a/www/vendor/psr/log/src/NullLogger.php b/www/vendor/psr/log/src/NullLogger.php index c1cc3c06..de0561e2 100644 --- a/www/vendor/psr/log/src/NullLogger.php +++ b/www/vendor/psr/log/src/NullLogger.php @@ -15,11 +15,7 @@ class NullLogger extends AbstractLogger /** * Logs with an arbitrary level. * - * @param mixed $level - * @param string|\Stringable $message - * @param array $context - * - * @return void + * @param mixed[] $context * * @throws \Psr\Log\InvalidArgumentException */