diff --git a/.github/workflows/prado.yml b/.github/workflows/prado.yml index 7001659c3..52ad1816f 100644 --- a/.github/workflows/prado.yml +++ b/.github/workflows/prado.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['7.4', '8.0', '8.1'] + php-versions: ['8.0', '8.1', '8.2'] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 29b66f89d..7bc30a159 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -14,8 +14,8 @@ ->setLineEnding("\n") ->setRules([ '@PSR12' => true, + '@PHP74Migration' => true, 'align_multiline_comment' => true, - 'array_syntax' => ['syntax' => 'short'], 'binary_operator_spaces' => true, 'blank_line_after_namespace' => true, 'blank_line_after_opening_tag' => true, @@ -26,13 +26,11 @@ 'dir_constant' => true, 'is_null' => true, 'function_typehint_space' => true, - 'list_syntax' => ['syntax' => 'short'], 'method_chaining_indentation' => true, 'modernize_types_casting' => true, 'no_alias_functions' => true, 'no_blank_lines_after_phpdoc' => true, 'no_null_property_initialization' => true, - 'no_whitespace_before_comma_in_array' => true, 'phpdoc_add_missing_param_annotation' => ['only_untyped' => false], 'phpdoc_indent' => true, 'phpdoc_no_package' => true, @@ -42,9 +40,7 @@ 'phpdoc_types_order' => true, 'psr_autoloading' => true, 'ternary_operator_spaces' => true, - 'ternary_to_null_coalescing' => true, 'trim_array_spaces' => true, - 'visibility_required' => true, 'whitespace_after_comma_in_array' => true, ]) ->setFinder($finder); diff --git a/HISTORY.md b/HISTORY.md index ecee51d50..4b6237cf0 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,12 +1,21 @@ -## Version 4.2.2 - ____ +## Version 4.2.2 - April 6, 2023 +BUG: Issue #811 - Update TSqlCriteria.php for fix phpdoc (zendre4) +BUG: Issue #814 - TSkinTemplate: ensure the full-NS class name is returned from the skin to match the one from the template (ctrlaltca) +BUG: Issue #815 - Cron trigger on first run fix, repeat running fix, and removed time zone code (belisoful) +BUG: Issue #819 - Support for OFFSET parameter without LIMIT clause in SQL query for TActiveRecord (ganiuszka) +ENH: Issue #820 - TApplicationComponent::getClassFxEvents Performance Mode should cache all (belisoful) ENH: Issue #828 - TApplication::onSetUser raised when setting user. (belisoful) +ENH: Issues #821, #822, #823, #825, #826, #834, #839, #842 - Behavior updates (belisoful) +ENH: Issues #840, #847 - TPriority updates (belisoful) +ENH: Issues #818, #846 - TCallChain updates (belisoful) ENH: Issue #866 - HTMLPurifier_Config and cache path (majuca) ENH: Issue #868 - RFC: Service detection is fragile (ctrlaltca) BUG: Issue #815 - Cron tasks delay until their proper time on first entry. Long running cron tasks no longer repeat further pending tasks. (belisoful) ENH: Issue #865 - File and dir permissions were too permissive 0777, now the file permissions are 0644 and 0755 for directory by default. (majuca) ENH: Issue #869 - Remove execute permission on all files excepted on php-cli (majuca) +ENH: Issue #875 - Make Prado::using able to autoload traits defined as prado3 namespaces (ctrlaltca) ## Version 4.2.1 - May 9, 2022 diff --git a/composer.json b/composer.json index 7418a41dc..0e5181157 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ } ], "require": { - "php": ">=7.3.0", + "php": ">=7.4.0", "ext-ctype": "*", "ext-dom": "*", "ext-intl": "*", @@ -83,8 +83,11 @@ }, "config": { "platform": { - "php": "7.3" - } + "php": "7.4" + }, + "allow-plugins": { + "phpdocumentor/shim": true + } }, "support" : { "issues" : "https://github.com/pradosoft/prado/issues", diff --git a/composer.lock b/composer.lock index 8d5a8f64c..61a2475be 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d52f25c30c3df6939ed80388d228f180", + "content-hash": "05a0a03af1d98e0463a2610badcfcd97", "packages": [ { "name": "bower-asset/clipboard", - "version": "v2.0.10", + "version": "v2.0.11", "source": { "type": "git", - "url": "https://github.com/zenorocha/clipboard.js.git", - "reference": "98d92f2a42e8efbe014c5c9465d3e3a9d7a0729e" + "url": "git@github.com:zenorocha/clipboard.js.git", + "reference": "2b2f9eef6fd1cf951612740e16e422db2848c00a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zenorocha/clipboard.js/zipball/98d92f2a42e8efbe014c5c9465d3e3a9d7a0729e", - "reference": "98d92f2a42e8efbe014c5c9465d3e3a9d7a0729e" + "url": "https://api.github.com/repos/zenorocha/clipboard.js/zipball/2b2f9eef6fd1cf951612740e16e422db2848c00a", + "reference": "2b2f9eef6fd1cf951612740e16e422db2848c00a" }, "type": "bower-asset", "license": [ @@ -47,7 +47,7 @@ "version": "v2.8.0", "source": { "type": "git", - "url": "https://github.com/wcoder/highlightjs-line-numbers.js.git", + "url": "git@github.com:wcoder/highlightjs-line-numbers.js.git", "reference": "d66b2b07c4881481b1d15aff40788b5af0f0bad5" }, "dist": { @@ -62,16 +62,16 @@ }, { "name": "bower-asset/jquery", - "version": "3.6.0", + "version": "3.6.4", "source": { "type": "git", - "url": "https://github.com/jquery/jquery-dist.git", - "reference": "e786e3d9707ffd9b0dd330ca135b66344dcef85a" + "url": "git@github.com:jquery/jquery-dist.git", + "reference": "91ef2d8836342875f2519b5815197ea0f23613cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/e786e3d9707ffd9b0dd330ca135b66344dcef85a", - "reference": "e786e3d9707ffd9b0dd330ca135b66344dcef85a" + "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/91ef2d8836342875f2519b5815197ea0f23613cf", + "reference": "91ef2d8836342875f2519b5815197ea0f23613cf" }, "type": "bower-asset", "license": [ @@ -101,16 +101,16 @@ }, { "name": "bower-asset/tinymce", - "version": "5.10.3", + "version": "5.10.7", "source": { "type": "git", "url": "git@github.com:tinymce/tinymce-dist.git", - "reference": "dadd7f25e31680f1c6bf61d2fb0b15794f425cd1" + "reference": "f078d8eb7de81f20d34b2ae4326870d20e22d4ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/dadd7f25e31680f1c6bf61d2fb0b15794f425cd1", - "reference": "dadd7f25e31680f1c6bf61d2fb0b15794f425cd1" + "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/f078d8eb7de81f20d34b2ae4326870d20e22d4ff", + "reference": "f078d8eb7de81f20d34b2ae4326870d20e22d4ff" }, "type": "bower-asset", "license": [ @@ -169,20 +169,30 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.14.0", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75" + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", "shasum": "" }, "require": { - "php": ">=5.2" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + }, + "require-dev": { + "cerdic/css-tidy": "^1.7 || ^2.0", + "simpletest/simpletest": "dev-master" + }, + "suggest": { + "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.", + "ext-bcmath": "Used for unit conversion and imagecrash protection", + "ext-iconv": "Converts text to and from non-UTF-8 encodings", + "ext-tidy": "Used for pretty-printing HTML" }, "type": "library", "autoload": { @@ -214,9 +224,9 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.14.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" }, - "time": "2021-12-25T01:21:49+00:00" + "time": "2022-09-18T07:06:19+00:00" }, { "name": "firephp/firephp-core", @@ -267,16 +277,16 @@ }, { "name": "mrclay/jsmin-php", - "version": "2.4.1", + "version": "2.4.3", "source": { "type": "git", "url": "https://github.com/mrclay/jsmin-php.git", - "reference": "208e4122f8a273314e81c6b3bee897b5f3c1dc70" + "reference": "49feaa85933458c15bb62ae65644bf22d60b7610" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mrclay/jsmin-php/zipball/208e4122f8a273314e81c6b3bee897b5f3c1dc70", - "reference": "208e4122f8a273314e81c6b3bee897b5f3c1dc70", + "url": "https://api.github.com/repos/mrclay/jsmin-php/zipball/49feaa85933458c15bb62ae65644bf22d60b7610", + "reference": "49feaa85933458c15bb62ae65644bf22d60b7610", "shasum": "" }, "require": { @@ -284,7 +294,7 @@ "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "4.2" + "phpunit/phpunit": "^4.8.36|^9.5.26" }, "type": "library", "autoload": { @@ -318,22 +328,22 @@ "support": { "email": "minify@googlegroups.com", "issues": "https://github.com/mrclay/jsmin-php/issues", - "source": "https://github.com/mrclay/jsmin-php/tree/2.4.1" + "source": "https://github.com/mrclay/jsmin-php/tree/2.4.3" }, - "time": "2022-03-26T14:41:59+00:00" + "time": "2022-12-13T20:15:15+00:00" }, { "name": "nikic/php-parser", - "version": "v4.13.2", + "version": "v4.15.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077" + "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", "shasum": "" }, "require": { @@ -374,9 +384,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" }, - "time": "2021-11-30T19:35:32+00:00" + "time": "2023-03-05T19:49:14+00:00" }, { "name": "pradosoft/prado-tinymce3", @@ -392,9 +402,6 @@ "reference": "1b069e2252be9eb546256e9271d87886530942f4", "shasum": "" }, - "provide": { - "pradosoft/prado-tinymce3": "3.5.12.2" - }, "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -505,20 +512,20 @@ }, { "name": "psr/container", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.4.0" }, "type": "library", "autoload": { @@ -547,22 +554,22 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { "name": "psy/psysh", - "version": "v0.11.4", + "version": "v0.11.14", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "05c544b339b112226ad14803e1e5b09a61957454" + "reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/05c544b339b112226ad14803e1e5b09a61957454", - "reference": "05c544b339b112226ad14803e1e5b09a61957454", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/8c2e264def7a8263a68ef6f0b55ce90b77d41e17", + "reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17", "shasum": "" }, "require": { @@ -623,22 +630,22 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.4" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.14" }, - "time": "2022-05-06T12:49:14+00:00" + "time": "2023-03-28T03:41:01+00:00" }, { "name": "symfony/console", - "version": "v5.4.8", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b" + "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b", - "reference": "ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b", + "url": "https://api.github.com/repos/symfony/console/zipball/3cd51fd2e6c461ca678f84d419461281bd87a0a8", + "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8", "shasum": "" }, "require": { @@ -703,12 +710,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.8" + "source": "https://github.com/symfony/console/tree/v5.4.22" }, "funding": [ { @@ -724,11 +731,11 @@ "type": "tidelift" } ], - "time": "2022-04-12T16:02:29+00:00" + "time": "2023-03-25T09:27:28+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -775,7 +782,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" }, "funding": [ { @@ -795,16 +802,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { @@ -819,7 +826,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -857,7 +864,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -873,20 +880,20 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + "reference": "511a08c03c1960e08a883f4cffcacd219b758354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354", "shasum": "" }, "require": { @@ -898,7 +905,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -938,7 +945,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" }, "funding": [ { @@ -954,20 +961,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T21:10:46+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -979,7 +986,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1022,7 +1029,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" }, "funding": [ { @@ -1038,20 +1045,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -1066,7 +1073,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1105,7 +1112,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -1121,20 +1128,20 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", - "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { @@ -1143,7 +1150,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1184,7 +1191,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -1200,20 +1207,20 @@ "type": "tidelift" } ], - "time": "2021-06-05T21:20:04+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -1222,7 +1229,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1267,7 +1274,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -1283,20 +1290,20 @@ "type": "tidelift" } ], - "time": "2022-03-04T08:16:47+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", "shasum": "" }, "require": { @@ -1350,7 +1357,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" }, "funding": [ { @@ -1366,20 +1373,20 @@ "type": "tidelift" } ], - "time": "2022-03-13T20:07:29+00:00" + "time": "2022-05-30T19:17:29+00:00" }, { "name": "symfony/string", - "version": "v5.4.8", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8" + "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", - "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", + "url": "https://api.github.com/repos/symfony/string/zipball/8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", + "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", "shasum": "" }, "require": { @@ -1436,7 +1443,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.8" + "source": "https://github.com/symfony/string/tree/v5.4.22" }, "funding": [ { @@ -1452,20 +1459,20 @@ "type": "tidelift" } ], - "time": "2022-04-19T10:40:37+00:00" + "time": "2023-03-14T06:11:53+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.4.8", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "cdcadd343d31ad16fc5e006b0de81ea307435053" + "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cdcadd343d31ad16fc5e006b0de81ea307435053", - "reference": "cdcadd343d31ad16fc5e006b0de81ea307435053", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", + "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", "shasum": "" }, "require": { @@ -1525,7 +1532,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.8" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.22" }, "funding": [ { @@ -1541,36 +1548,36 @@ "type": "tidelift" } ], - "time": "2022-04-26T13:19:20+00:00" + "time": "2023-03-25T09:27:28+00:00" } ], "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^0.16 || ^1", "phpstan/phpstan": "^1.4", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -1597,7 +1604,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -1613,20 +1620,20 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { @@ -1664,7 +1671,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" }, "funding": [ { @@ -1672,7 +1679,7 @@ "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "phar-io/composer-distributor", @@ -1999,116 +2006,6 @@ }, "time": "2022-02-21T01:04:05+00:00" }, - { - "name": "phpdocumentor/reflection-common", - "version": "2.2.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" - }, - "time": "2020-06-27T09:03:43+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", - "shasum": "" - }, - "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" - }, - "time": "2021-10-19T17:43:47+00:00" - }, { "name": "phpdocumentor/shim", "version": "v3.3.1", @@ -2145,142 +2042,25 @@ }, "time": "2022-03-25T16:05:14+00:00" }, - { - "name": "phpdocumentor/type-resolver", - "version": "1.6.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" - }, - "require-dev": { - "ext-tokenizer": "*", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" - }, - "time": "2022-03-15T21:29:03+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "v1.15.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" - }, - "time": "2021-12-08T12:19:24+00:00" - }, { "name": "phpunit/php-code-coverage", - "version": "9.2.15", + "version": "9.2.26", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f" + "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.13.0", + "nikic/php-parser": "^4.15", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -2295,8 +2075,8 @@ "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { @@ -2329,7 +2109,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" }, "funding": [ { @@ -2337,7 +2117,7 @@ "type": "github" } ], - "time": "2022-03-07T09:28:20+00:00" + "time": "2023-03-06T12:58:08+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2582,20 +2362,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.20", + "version": "9.6.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba" + "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b65d59a059d3004a040c16a82e07bbdf6cfdd115", + "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -2606,7 +2386,6 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpspec/prophecy": "^1.12.1", "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", @@ -2614,23 +2393,19 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.0", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, - "require-dev": { - "ext-pdo": "*", - "phpspec/prophecy-phpunit": "^2.0.1" - }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -2638,7 +2413,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { @@ -2669,7 +2444,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20" + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.6" }, "funding": [ { @@ -2679,9 +2455,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-04-01T12:37:26+00:00" + "time": "2023-03-27T11:43:46+00:00" }, { "name": "phpunit/phpunit-selenium", @@ -2689,12 +2469,12 @@ "source": { "type": "git", "url": "https://github.com/giorgiosironi/phpunit-selenium.git", - "reference": "790187189ce8a56f95202f35528589a01a70ed3c" + "reference": "b40dc292627e5de5bd8d32570627a6d55b2b846c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giorgiosironi/phpunit-selenium/zipball/790187189ce8a56f95202f35528589a01a70ed3c", - "reference": "790187189ce8a56f95202f35528589a01a70ed3c", + "url": "https://api.github.com/repos/giorgiosironi/phpunit-selenium/zipball/b40dc292627e5de5bd8d32570627a6d55b2b846c", + "reference": "b40dc292627e5de5bd8d32570627a6d55b2b846c", "shasum": "" }, "require": { @@ -2760,7 +2540,7 @@ "issues": "https://github.com/giorgiosironi/phpunit-selenium/issues", "source": "https://github.com/giorgiosironi/phpunit-selenium/tree/master" }, - "time": "2022-04-04T11:54:46+00:00" + "time": "2022-06-01T21:12:08+00:00" }, { "name": "pradosoft/prado-phpdoc-template", @@ -2965,16 +2745,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { @@ -3027,7 +2807,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -3035,7 +2815,7 @@ "type": "github" } ], - "time": "2020-10-26T15:49:45+00:00" + "time": "2022-09-14T12:41:17+00:00" }, { "name": "sebastian/complexity", @@ -3162,16 +2942,16 @@ }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -3213,7 +2993,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -3221,20 +3001,20 @@ "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -3290,7 +3070,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -3298,7 +3078,7 @@ "type": "github" } ], - "time": "2021-11-11T14:18:36+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", @@ -3535,16 +3315,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -3583,10 +3363,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -3594,7 +3374,7 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", @@ -3653,16 +3433,16 @@ }, { "name": "sebastian/type", - "version": "3.0.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { @@ -3674,7 +3454,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -3697,7 +3477,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.0.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -3705,7 +3485,7 @@ "type": "github" } ], - "time": "2022-03-15T09:54:48+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", @@ -3809,64 +3589,6 @@ } ], "time": "2021-07-28T10:34:58+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.10.0", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" - }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "support": { - "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" - }, - "time": "2021-03-09T10:59:23+00:00" } ], "aliases": [], @@ -3877,7 +3599,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.3.0", + "php": ">=7.4.0", "ext-ctype": "*", "ext-dom": "*", "ext-intl": "*", @@ -3887,7 +3609,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.3" + "php": "7.4" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.3.0" } diff --git a/framework/Caching/TMemCache.php b/framework/Caching/TMemCache.php index 7ffcb71fe..15e2ef19e 100644 --- a/framework/Caching/TMemCache.php +++ b/framework/Caching/TMemCache.php @@ -188,7 +188,7 @@ private function loadConfig($xml) } $server = ['Host' => $host, 'Port' => $port, 'Weight' => 1]; $checks = [ - 'Weight' => 'memcache_serverweight_invalid' + 'Weight' => 'memcache_serverweight_invalid', ]; foreach ($checks as $property => $exception) { $value = $properties->remove($property); diff --git a/framework/Data/Common/Mssql/TMssqlMetaData.php b/framework/Data/Common/Mssql/TMssqlMetaData.php index 3e81fa16d..f4a143471 100644 --- a/framework/Data/Common/Mssql/TMssqlMetaData.php +++ b/framework/Data/Common/Mssql/TMssqlMetaData.php @@ -73,15 +73,19 @@ protected function createTableInfo($table) { [$catalogName, $schemaName, $tableName] = $this->getCatalogSchemaTableName($table); $this->getDbConnection()->setActive(true); - $sql = <<getDbConnection()->createCommand($sql); $command->bindValue(':table', $col['TABLE_NAME']); $primary = []; @@ -224,31 +231,34 @@ protected function getConstraintKeys($col) protected function getForeignConstraints($col) { //From http://msdn2.microsoft.com/en-us/library/aa175805(SQL.80).aspx - $sql = <<getDbConnection()->createCommand($sql); $command->bindValue(':table', $col['TABLE_NAME']); $fkeys = []; @@ -284,10 +294,12 @@ protected function isForeignKeyColumn($columnId, $tableInfo) public function findTableNames($schema = 'dbo') { $condition = "TABLE_TYPE='BASE TABLE'"; - $sql = <<getDbConnection()->createCommand($sql); $command->bindParameter(":schema", $schema); $rows = $command->query(); diff --git a/framework/Data/Common/Mysql/TMysqlMetaData.php b/framework/Data/Common/Mysql/TMysqlMetaData.php index e4e6e0535..df17ead1e 100644 --- a/framework/Data/Common/Mysql/TMysqlMetaData.php +++ b/framework/Data/Common/Mysql/TMysqlMetaData.php @@ -313,20 +313,21 @@ protected function getConstraintKeys($schemaName, $tableName) protected function getForeignConstraints($schemaName, $tableName) { $andSchema = $schemaName !== null ? 'AND TABLE_SCHEMA LIKE :schema' : 'AND TABLE_SCHEMA LIKE DATABASE()'; - $sql = <<getDbConnection()->createCommand($sql); $command->bindValue(':table', $tableName); if ($schemaName !== null) { diff --git a/framework/Data/Common/Mysql/TMysqlTableColumn.php b/framework/Data/Common/Mysql/TMysqlTableColumn.php index 85642c138..3183179cd 100644 --- a/framework/Data/Common/Mysql/TMysqlTableColumn.php +++ b/framework/Data/Common/Mysql/TMysqlTableColumn.php @@ -26,7 +26,7 @@ class TMysqlTableColumn extends TDbTableColumn private static $types = [ 'integer' => ['bit', 'tinyint', 'smallint', 'mediumint', 'int', 'integer', 'bigint'], 'boolean' => ['boolean', 'bool'], - 'float' => ['float', 'double', 'double precision', 'decimal', 'dec', 'numeric', 'fixed'] + 'float' => ['float', 'double', 'double precision', 'decimal', 'dec', 'numeric', 'fixed'], ]; /** diff --git a/framework/Data/Common/Oracle/TOracleMetaData.php b/framework/Data/Common/Oracle/TOracleMetaData.php index 9045289b4..f63288274 100644 --- a/framework/Data/Common/Oracle/TOracleMetaData.php +++ b/framework/Data/Common/Oracle/TOracleMetaData.php @@ -79,22 +79,22 @@ protected function createTableInfo($table) // sequence on the field. $sql = <<getDbConnection()->setActive(true); $this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); $command = $this->getDbConnection()->createCommand($sql); @@ -154,11 +154,11 @@ protected function getIsView($schemaName, $tableName) $this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); $sql = <<getDbConnection()->setActive(true); $command = $this->getDbConnection()->createCommand($sql); //$command->bindValue(':schema',$schemaName); @@ -260,17 +260,20 @@ protected function isPrecisionType($type) protected function getConstraintKeys($schemaName, $tableName) { $this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); -// select decode( a.CONSTRAINT_TYPE, 'P', 'PRIMARY KEY (', 'FOREIGN KEY (' )||b.COLUMN_NAME||')' as consrc, + // select decode( a.CONSTRAINT_TYPE, 'P', 'PRIMARY KEY (', 'FOREIGN KEY (' )||b.COLUMN_NAME||')' as consrc, $sql = <<getDbConnection()->setActive(true); $command = $this->getDbConnection()->createCommand($sql); //$command->bindValue(':table', $tableName); @@ -359,15 +362,19 @@ protected function isForeignKeyColumn($columnId, $tableInfo) public function findTableNames($schema = '') { if ($schema === '') { - $sql = <<getDbConnection()->createCommand($sql); } else { - $sql = <<getDbConnection()->createCommand($sql); $command->bindParameter(':schema', $schema); } diff --git a/framework/Data/Common/Oracle/TOracleTableColumn.php b/framework/Data/Common/Oracle/TOracleTableColumn.php index 2f8cc68cb..ce16417c7 100644 --- a/framework/Data/Common/Oracle/TOracleTableColumn.php +++ b/framework/Data/Common/Oracle/TOracleTableColumn.php @@ -24,7 +24,7 @@ class TOracleTableColumn extends TDbTableColumn { private static $types = [ - 'numeric' => ['numeric'] + 'numeric' => ['numeric'], // 'integer' => array('bit', 'bit varying', 'real', 'serial', 'int', 'integer'), // 'boolean' => array('boolean'), // 'float' => array('bigint', 'bigserial', 'double precision', 'money', 'numeric') diff --git a/framework/Data/Common/Pgsql/TPgsqlMetaData.php b/framework/Data/Common/Pgsql/TPgsqlMetaData.php index d1b4b48d3..e46070f72 100644 --- a/framework/Data/Common/Pgsql/TPgsqlMetaData.php +++ b/framework/Data/Common/Pgsql/TPgsqlMetaData.php @@ -107,34 +107,34 @@ protected function createTableInfo($table) // sequence on the field. $sql = << 0 AND NOT a.attisdropped - ORDER BY a.attnum -EOD; + FROM + pg_catalog.pg_attribute a LEFT JOIN pg_catalog.pg_attrdef adef + ON a.attrelid=adef.adrelid + AND a.attnum=adef.adnum + LEFT JOIN pg_catalog.pg_type t ON a.atttypid=t.oid + WHERE + a.attrelid = (SELECT oid FROM pg_catalog.pg_class WHERE relname=:table + AND relnamespace = (SELECT oid FROM pg_catalog.pg_namespace WHERE + nspname = :schema)) + AND a.attnum > 0 AND NOT a.attisdropped + ORDER BY a.attnum + EOD; $this->getDbConnection()->setActive(true); $command = $this->getDbConnection()->createCommand($sql); $command->bindValue(':table', $tableName); @@ -191,10 +191,10 @@ protected function getIsView($schemaName, $tableName) { $sql = <<getDbConnection()->setActive(true); $command = $this->getDbConnection()->createCommand($sql); $command->bindValue(':schema', $schemaName); @@ -292,46 +292,45 @@ protected function getConstraintKeys($schemaName, $tableName) $sql = <<getDbConnection()->setActive(true); $command = $this->getDbConnection()->createCommand($sql); $command->bindValue(':table', $tableName); @@ -365,18 +364,23 @@ protected function getPrimaryKeys($tableName, $schemaName, $columnIndex) $index = implode(', ', explode(' ', $columnIndex)); $sql = <<getDbConnection()->createCommand($sql); $command->bindValue(':table', $tableName); $command->bindValue(':schema', $schemaName); -// $command->bindValue(':columnIndex', join(', ', explode(' ', $columnIndex))); + // $command->bindValue(':columnIndex', join(', ', explode(' ', $columnIndex))); $primary = []; foreach ($command->query() as $row) { $primary[] = $row['attname']; @@ -432,10 +436,12 @@ public function findTableNames($schema = 'public') if ($schema === '') { $schema = $this->_defaultSchema; } - $sql = <<getDbConnection()->createCommand($sql); $command->bindParameter(':schema', $schema); $rows = $command->query(); diff --git a/framework/Data/Common/Pgsql/TPgsqlTableColumn.php b/framework/Data/Common/Pgsql/TPgsqlTableColumn.php index bd1528f23..afd0743ba 100644 --- a/framework/Data/Common/Pgsql/TPgsqlTableColumn.php +++ b/framework/Data/Common/Pgsql/TPgsqlTableColumn.php @@ -26,7 +26,7 @@ class TPgsqlTableColumn extends TDbTableColumn private static $types = [ 'integer' => ['bit', 'bit varying', 'real', 'serial', 'int', 'integer'], 'boolean' => ['boolean'], - 'float' => ['bigint', 'bigserial', 'double precision', 'money', 'numeric'] + 'float' => ['bigint', 'bigserial', 'double precision', 'money', 'numeric'], ]; /** diff --git a/framework/Data/Common/TDbMetaData.php b/framework/Data/Common/TDbMetaData.php index 1203b1a04..86c9eafc2 100644 --- a/framework/Data/Common/TDbMetaData.php +++ b/framework/Data/Common/TDbMetaData.php @@ -77,8 +77,6 @@ public static function getInstance($conn) return new TMssqlMetaData($conn); case 'oci': return new TOracleMetaData($conn); -// case 'ibm': -// return new TIbmDb2MetaData($conn); default: throw new TDbException('ar_invalid_database_driver', $driver); } diff --git a/framework/Data/DataGateway/TSqlCriteria.php b/framework/Data/DataGateway/TSqlCriteria.php index 5aa05f850..6b35dfbaa 100644 --- a/framework/Data/DataGateway/TSqlCriteria.php +++ b/framework/Data/DataGateway/TSqlCriteria.php @@ -272,14 +272,14 @@ public function __toString() } $params = []; foreach ($this->getParameters() as $k => $v) { - $params[] = "{$k} => ${v}"; + $params[] = "{$k} => {$v}"; } if (count($params) > 0) { $str .= ', "' . implode(', ', $params) . '"'; } $orders = []; foreach ($this->getOrdersBy() as $k => $v) { - $orders[] = "{$k} => ${v}"; + $orders[] = "{$k} => {$v}"; } if (count($orders) > 0) { $str .= ', "' . implode(', ', $orders) . '"'; diff --git a/framework/Data/SqlMap/Statements/TMappedStatement.php b/framework/Data/SqlMap/Statements/TMappedStatement.php index b0238abb1..8eb2bf32e 100644 --- a/framework/Data/SqlMap/Statements/TMappedStatement.php +++ b/framework/Data/SqlMap/Statements/TMappedStatement.php @@ -370,7 +370,6 @@ public function executeInsert($connection, $parameter) $generatedKey = $this->getPreGeneratedSelectKey($connection, $parameter); $command = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter); -// var_dump($command,$parameter); $result = $command->execute(); if ($generatedKey === null) { diff --git a/framework/Data/TDbConnection.php b/framework/Data/TDbConnection.php index 0ebddad00..273ceac3e 100644 --- a/framework/Data/TDbConnection.php +++ b/framework/Data/TDbConnection.php @@ -137,7 +137,11 @@ public function __construct($dsn = '', $username = '', $password = '', $charset */ public function __sleep() { -// $this->close(); - DO NOT CLOSE the current connection as serializing doesn't neccessarily mean we don't this connection anymore in the current session + /* + * $this->close(); + * DO NOT CLOSE the current connection as serializing doesn't necessarily mean + * we don't this connection anymore in the current session + */ return array_diff(parent::__sleep(), ["\0Prado\Data\TDbConnection\0_pdo", "\0Prado\Data\TDbConnection\0_active"]); } diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php index 1b1abb085..c1d0061cd 100644 --- a/framework/Exceptions/TErrorHandler.php +++ b/framework/Exceptions/TErrorHandler.php @@ -214,7 +214,7 @@ protected function handleExternalError($statusCode, $exception) '%%ErrorMessage%%' => htmlspecialchars($errorMessage), '%%ServerAdmin%%' => $serverAdmin, '%%Version%%' => $version, - '%%Time%%' => @strftime('%Y-%m-%d %H:%M', time()) + '%%Time%%' => @strftime('%Y-%m-%d %H:%M', time()), ]; $this->getApplication()->getResponse()->setStatusCode($statusCode, $isDebug ? $exception->getMessage() : null); @@ -304,7 +304,7 @@ protected function displayException($exception) '%%SourceCode%%' => $source, '%%StackTrace%%' => htmlspecialchars($this->getExactTraceAsString($exception)), '%%Version%%' => $version, - '%%Time%%' => @strftime('%Y-%m-%d %H:%M', time()) + '%%Time%%' => @strftime('%Y-%m-%d %H:%M', time()), ]; $content = $this->getExceptionTemplate($exception); diff --git a/framework/Exceptions/TPhpErrorException.php b/framework/Exceptions/TPhpErrorException.php index b7bbe1c3b..2a680e306 100644 --- a/framework/Exceptions/TPhpErrorException.php +++ b/framework/Exceptions/TPhpErrorException.php @@ -41,7 +41,7 @@ public function __construct($errno, $errstr, $errfile, $errline) E_USER_ERROR => "User Error", E_USER_WARNING => "User Warning", E_USER_NOTICE => "User Notice", - E_STRICT => "Runtime Notice" + E_STRICT => "Runtime Notice", ]; $errorType = $errorTypes[$errno] ?? 'Unknown Error'; parent::__construct("[$errorType] $errstr (@line $errline in file $errfile)."); diff --git a/framework/I18N/core/Gettext/TGettext_MO.php b/framework/I18N/core/Gettext/TGettext_MO.php index 6f337745c..137cc55d6 100644 --- a/framework/I18N/core/Gettext/TGettext_MO.php +++ b/framework/I18N/core/Gettext/TGettext_MO.php @@ -219,7 +219,7 @@ public function load($file = null) for ($i = 0; $i < $count; $i++) { $original[$i] = [ 'length' => $this->_readInt($be), - 'offset' => $this->_readInt($be) + 'offset' => $this->_readInt($be), ]; } @@ -230,7 +230,7 @@ public function load($file = null) for ($i = 0; $i < $count; $i++) { $translat[$i] = [ 'length' => $this->_readInt($be), - 'offset' => $this->_readInt($be) + 'offset' => $this->_readInt($be), ]; } diff --git a/framework/I18N/core/MessageCache.php b/framework/I18N/core/MessageCache.php index 587b82dff..a5918f8e8 100644 --- a/framework/I18N/core/MessageCache.php +++ b/framework/I18N/core/MessageCache.php @@ -56,7 +56,7 @@ public function __construct($cacheDir) $options = [ 'cacheDir' => $cacheDir, 'lifeTime' => $this->getLifeTime(), - 'automaticSerialization' => true + 'automaticSerialization' => true, ]; $this->cache = new TCache_Lite($options); diff --git a/framework/I18N/core/MessageSource_PHP.php b/framework/I18N/core/MessageSource_PHP.php index 983f8df68..04068d732 100644 --- a/framework/I18N/core/MessageSource_PHP.php +++ b/framework/I18N/core/MessageSource_PHP.php @@ -404,19 +404,20 @@ protected function createMessageTemplate($catalogue) protected function getTemplate($catalogue) { $date = @date('Y-m-d\TH:i:s\Z'); - $php = << array( - 'source-language' => 'EN', - 'target-language' => '{$this->culture}', - 'original' => '$catalogue', - 'date' => '$date' - ), - 'trans-unit' => array( - ) -); -EOD; + $php = +<< array( + 'source-language' => 'EN', + 'target-language' => '{$this->culture}', + 'original' => '$catalogue', + 'date' => '$date' + ), + 'trans-unit' => array( + ) + ); + EOD; return $php; } } diff --git a/framework/I18N/core/MessageSource_XLIFF.php b/framework/I18N/core/MessageSource_XLIFF.php index 5a4944d8d..7555a221a 100644 --- a/framework/I18N/core/MessageSource_XLIFF.php +++ b/framework/I18N/core/MessageSource_XLIFF.php @@ -508,15 +508,16 @@ protected function createMessageTemplate($catalogue) protected function getTemplate($catalogue) { $date = @date('c'); - $xml = << - - - - - - -EOD; + $xml = +<< + + + + + + + EOD; return $xml; } } diff --git a/framework/Prado.php b/framework/Prado.php index be29b4b61..24b7d7b06 100644 --- a/framework/Prado.php +++ b/framework/Prado.php @@ -73,13 +73,13 @@ class Prado */ private static $_aliases = [ 'Prado' => PRADO_DIR, - 'Vendor' => PRADO_VENDORDIR + 'Vendor' => PRADO_VENDORDIR, ]; /** * @var array list of namespaces currently in use */ private static $_usings = [ - 'Prado' => PRADO_DIR + 'Prado' => PRADO_DIR, ]; /** * @var array list of namespaces currently in use @@ -102,7 +102,7 @@ class Prado */ public static function getVersion(): string { - return '4.2.1'; + return '4.2.2'; } /** diff --git a/framework/Security/Permissions/TPermissionsManager.php b/framework/Security/Permissions/TPermissionsManager.php index e63baeb19..183d38a4c 100644 --- a/framework/Security/Permissions/TPermissionsManager.php +++ b/framework/Security/Permissions/TPermissionsManager.php @@ -227,7 +227,7 @@ public function getPermissions($manager) return [ new TPermissionEvent(static::PERM_PERMISSIONS_SHELL, 'Activates permissions shell commands.', 'dyRegisterShellAction'), new TPermissionEvent(static::PERM_PERMISSIONS_MANAGE_ROLES, 'Manages Db Permissions Role Children.', ['dyAddRoleChildren', 'dyRemoveRoleChildren']), - new TPermissionEvent(static::PERM_PERMISSIONS_MANAGE_RULES, 'Manages Db Permissions Rules.', ['dyAddPermissionRule', 'dyRemovePermissionRule']) + new TPermissionEvent(static::PERM_PERMISSIONS_MANAGE_RULES, 'Manages Db Permissions Rules.', ['dyAddPermissionRule', 'dyRemovePermissionRule']), ]; } @@ -573,7 +573,7 @@ public function addRoleChildren($role, $children) $this->_hierarchy[$role] = array_merge($this->_hierarchy[$role] ?? [], $children); $runtimeData = $this->_dbParameter->get($this->_parameter) ?? []; - $runtimeData['roles'] = $runtimeData['roles'] ?? []; + $runtimeData['roles'] ??= []; $runtimeData['roles'][$role] = array_unique(array_merge($runtimeData['roles'][$role] ?? [], $children)); $this->_dbParameter->set($this->_parameter, $runtimeData); @@ -630,7 +630,7 @@ public function addPermissionRule($permission, $rule) $this->addPermissionRuleInternal($permission, $rule); $runtimeData = $this->_dbParameter->get($this->_parameter) ?? []; - $runtimeData['permissionrules'] = $runtimeData['permissionrules'] ?? []; + $runtimeData['permissionrules'] ??= []; $runtimeData['permissionrules'][$permission][] = $rule; $this->_dbParameter->set($this->_parameter, $runtimeData); @@ -654,7 +654,7 @@ public function removePermissionRule($permission, $rule) $this->removePermissionRuleInternal($permission, $rule); $runtimeData = $this->_dbParameter->get($this->_parameter) ?? []; - $runtimeData['permissionrules'] = $runtimeData['permissionrules'] ?? []; + $runtimeData['permissionrules'] ??= []; if (($index = array_search($rule, $runtimeData['permissionrules'][$permission] ?? [], true)) === false) { return false; diff --git a/framework/Shell/Actions/TActiveRecordAction.php b/framework/Shell/Actions/TActiveRecordAction.php index babfb890b..e8c73b9bf 100644 --- a/framework/Shell/Actions/TActiveRecordAction.php +++ b/framework/Shell/Actions/TActiveRecordAction.php @@ -34,7 +34,7 @@ class TActiveRecordAction extends TShellAction protected $description = [ 'Provides Active Record skeleton generation.', 'Generate Active Record skeleton for to . May also generate [soap] properties.', - "Generate Active Record skeleton for all Tables to . May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Suffix]. [Overwrite] is used to overwrite existing Files." + "Generate Active Record skeleton for all Tables to . May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Suffix]. [Overwrite] is used to overwrite existing Files.", ]; private $_soap = false; private $_overwrite = false; @@ -81,7 +81,7 @@ public function actionGenerateAll($args) case 'sqlsrv': // sqlsrv driver on windows hosts case 'dblib': // dblib drivers on linux (and maybe others os) hosts case 'oci': -// case 'ibm': + // case 'ibm': default: $this->_outWriter->writeError("Sorry, generateAll is not implemented for " . $con->getDriverName() . "."); } @@ -223,12 +223,12 @@ protected function generateProperty($field, $column) if ($this->_soap) { $prop .= << !$class->hasMethod('set' . $name), 'protected' => $method->isProtected(), 'class' => $method->getDeclaringClass()->getName(), - 'comments' => $method->getDocComment() + 'comments' => $method->getDocComment(), ]; $reserved['get' . strtolower($name)] = 1; $reserved['set' . strtolower($name)] = 1; @@ -112,7 +112,7 @@ private function reflect() $this->_events[$name] = [ 'class' => $method->getDeclaringClass()->getName(), 'protected' => $method->isProtected(), - 'comments' => $method->getDocComment() + 'comments' => $method->getDocComment(), ]; $reserved[strtolower($name)] = 1; } @@ -123,7 +123,7 @@ private function reflect() 'class' => $method->getDeclaringClass()->getName(), 'protected' => $method->isProtected(), 'static' => $method->isStatic(), - 'comments' => $method->getDocComment() + 'comments' => $method->getDocComment(), ]; } } diff --git a/framework/Util/Cron/TCronModule.php b/framework/Util/Cron/TCronModule.php index fd9834e0c..9bd084799 100644 --- a/framework/Util/Cron/TCronModule.php +++ b/framework/Util/Cron/TCronModule.php @@ -186,7 +186,7 @@ public function init($config) public function getPermissions($manager) { return [ - new TPermissionEvent(static::PERM_CRON_SHELL, 'Activates cron shell commands.', 'dyRegisterShellAction') + new TPermissionEvent(static::PERM_CRON_SHELL, 'Activates cron shell commands.', 'dyRegisterShellAction'), ]; } diff --git a/framework/Util/Cron/TDbCronModule.php b/framework/Util/Cron/TDbCronModule.php index 9bfd52e5e..b9e749b29 100644 --- a/framework/Util/Cron/TDbCronModule.php +++ b/framework/Util/Cron/TDbCronModule.php @@ -139,7 +139,7 @@ public function getPermissions($manager) new TPermissionEvent(static::PERM_CRON_LOG_DELETE, 'Cron delete Db log.', ['dyClearCronLog', 'dyRemoveCronLogItem']), new TPermissionEvent(static::PERM_CRON_ADD_TASK, 'Cron add Db Task.', ['dyAddTask']), new TPermissionEvent(static::PERM_CRON_UPDATE_TASK, 'Cron update Db task.', ['dyUpdateTask'], $userIsOwnerAllowedRule), - new TPermissionEvent(static::PERM_CRON_REMOVE_TASK, 'Cron remove Db task.', ['dyRemoveTask'], $userIsOwnerAllowedRule) + new TPermissionEvent(static::PERM_CRON_REMOVE_TASK, 'Cron remove Db task.', ['dyRemoveTask'], $userIsOwnerAllowedRule), ], parent::getPermissions($manager)); } @@ -812,7 +812,7 @@ public function getCronLog($name, $pageSize, $offset, $sortingDesc = null) } else { $limit = " LIMIT {$pageSize}"; } - $sortingDesc = $sortingDesc ?? true; + $sortingDesc ??= true; } if ($sortingDesc !== null) { $sortingDesc = TPropertyValue::ensureBoolean($sortingDesc) ? "DESC" : "ASC"; diff --git a/framework/Util/Cron/TShellCronAction.php b/framework/Util/Cron/TShellCronAction.php index 00a81afbe..e56beb866 100644 --- a/framework/Util/Cron/TShellCronAction.php +++ b/framework/Util/Cron/TShellCronAction.php @@ -35,7 +35,7 @@ class TShellCronAction extends TShellAction protected $description = ['Manages Cron time-based services', 'Runs the Cron Pending Tasks.', 'Displays the Cron tasks configured in the application.', - 'Displays the registered Cron tasks information.' + 'Displays the registered Cron tasks information.', ]; private $_cron = false; @@ -183,7 +183,7 @@ public function actionIndex($args) foreach ($infos as $taskinfo) { $rows[] = [ $this->_outWriter->format($taskinfo->getName(), [TShellWriter::BLUE, TShellWriter::BOLD]), - $taskinfo->getTask(), $taskinfo->getModuleId(), $taskinfo->getTitle() + $taskinfo->getTask(), $taskinfo->getModuleId(), $taskinfo->getTitle(), ]; $rows[] = ['span' => $this->_outWriter->format(' ' . $taskinfo->getDescription(), TShellWriter::DARK_GRAY)]; } diff --git a/framework/Util/Cron/TShellDbCronAction.php b/framework/Util/Cron/TShellDbCronAction.php index 060784fd4..b748f8035 100644 --- a/framework/Util/Cron/TShellDbCronAction.php +++ b/framework/Util/Cron/TShellDbCronAction.php @@ -38,7 +38,7 @@ class TShellDbCronAction extends TShellCronAction 'Displays the registered Cron tasks information.', 'Adds a Cron task to the database.', 'Updates a Cron task in the database.', - 'Removes a Cron task from the database.' + 'Removes a Cron task from the database.', ]; /** diff --git a/framework/Util/Cron/TTimeScheduler.php b/framework/Util/Cron/TTimeScheduler.php index e2a7a5ca6..6a237067b 100644 --- a/framework/Util/Cron/TTimeScheduler.php +++ b/framework/Util/Cron/TTimeScheduler.php @@ -98,7 +98,7 @@ class TTimeScheduler extends \Prado\TComponent '@weekly' => '0 0 ? * 0', '@midnight' => '0 0 * * ?', '@daily' => '0 0 * * ?', - '@hourly' => '0 * * * ?' + '@hourly' => '0 * * * ?', ]; private static $_keywords = [ self::MONTH_OF_YEAR => [ @@ -114,7 +114,7 @@ class TTimeScheduler extends \Prado\TComponent 9 => '(?:september|septiembre|septembre|settembre|sep|sept|sett|Сентябрь|Сен|सितम्बर|سبتمبر)', 10 => '(?:october|oktober|octubre|octobre|ottobre|okt|oct|ott|Октябрь|Окт|अक्टूबर|أكتوبر)', 11 => '(?:november|noviembre|novembre|nov|Ноябрь|Ноя|नवम्बर|نوفمبر)', - 12 => '(?:december|dezember|diciembre|décembre|dicembre|dec|dez|déc|dic|Декабрь|Дек|दिसम्बर|ديسمبر)' + 12 => '(?:december|dezember|diciembre|décembre|dicembre|dec|dez|déc|dic|Декабрь|Дек|दिसम्बर|ديسمبر)', ], self::DAY_OF_WEEK => [ //no Arabic as those are just numbered days of the week 0 => '(?:sunday|sonntag|sun|son|su|so|domingo|do|d|dimanche|dim|domenica|dom|Воскресенье|Вск|Вс|रविवार|रवि)', @@ -123,8 +123,8 @@ class TTimeScheduler extends \Prado\TComponent 3 => '(?:wednesday|mittwoch|mit|wed|we|mi|miércoles|x|mercredi|mer|mercoledì|me|Среда|Сре|Ср|बुधवार|बुध)', 4 => '(?:thursday|donnerstag|don|thu|th|do|jueves|ju|j|jeudi|jeu|giovedì|gio|gi|Четверг|Чтв|Чт|गुरुवार|गुरु)', 5 => '(?:friday|freitag|fre|fri|fr|viernes|vi|v|vendredi|ven|venerdì|ve|Пятница|Птн|Пт|शुक्रवार|शुक्र)', - 6 => '(?:saturday|samstag|sam|sat|sa|sábado|s|samedi|sabato|sab|Суббота|Сбт|Сб|शनिवार|शनि)' - ] + 6 => '(?:saturday|samstag|sam|sat|sa|sábado|s|samedi|sabato|sab|Суббота|Сбт|Сб|शनिवार|शनि)', + ], ]; /** validation is computed only once */ @@ -231,7 +231,7 @@ public function setSchedule($schedule) 'mo' => $monthValidator, 'dow' => $dowValidator, 'y' => $yearValidator, - 'f' => $fullValidator + 'f' => $fullValidator, ]; } @@ -347,7 +347,7 @@ public function setSchedule($schedule) } $this->_attr[self::YEAR] = []; - $matches[7] = $matches[7] ?? '*'; + $matches[7] ??= '*'; foreach (explode(',', $matches[7]) as $match) { if (preg_match($yearValidator, $match, $m2)) { if ($m2[1] === '*') { diff --git a/framework/Util/TBrowserLogRoute.php b/framework/Util/TBrowserLogRoute.php index 10ad68853..16a49abb6 100644 --- a/framework/Util/TBrowserLogRoute.php +++ b/framework/Util/TBrowserLogRoute.php @@ -73,29 +73,31 @@ protected function renderHeader() { $string = ''; if ($className = $this->getCssClass()) { - $string = << - - - - - - -EOD; + $string = +<< + + + + + + + EOD; } else { - $string = << - - - - - - -EOD; + $string = +<< + + + + + + + EOD; } return $string; } @@ -116,26 +118,26 @@ protected function renderMessage($log, $info) $colorCssClass = $log[1]; $messageCssClass = $info['even'] ? 'even' : 'odd'; $string = << - - - - - - -EOD; + + + + + + + + EOD; } else { $bgcolor = $info['even'] ? "#fff" : "#eee"; $color = $this->getColorLevel($log[1]); $string = << - - - - - - -EOD; + + + + + + + + EOD; } return $string; } diff --git a/framework/Util/TDbParameterModule.php b/framework/Util/TDbParameterModule.php index 0da7b3e32..b9358f2ab 100644 --- a/framework/Util/TDbParameterModule.php +++ b/framework/Util/TDbParameterModule.php @@ -192,7 +192,7 @@ public function init($config) public function getPermissions($manager) { return [ - new TPermissionEvent(static::PERM_PARAM_SHELL, 'Activates parameter shell commands.', 'dyRegisterShellAction') + new TPermissionEvent(static::PERM_PARAM_SHELL, 'Activates parameter shell commands.', 'dyRegisterShellAction'), ]; } diff --git a/framework/Util/TFirebugLogRoute.php b/framework/Util/TFirebugLogRoute.php index dd0881d7d..5bccc7a99 100644 --- a/framework/Util/TFirebugLogRoute.php +++ b/framework/Util/TFirebugLogRoute.php @@ -69,19 +69,20 @@ protected function renderHeader() { $page = $this->getService()->getRequestedPage(); if ($page->getIsCallback()) { - return << -/* + /* + } + -EOD; + EOD; return $string; } diff --git a/framework/Util/TJsonRpcClient.php b/framework/Util/TJsonRpcClient.php index 8be9fd9c9..477a3dac4 100644 --- a/framework/Util/TJsonRpcClient.php +++ b/framework/Util/TJsonRpcClient.php @@ -73,7 +73,7 @@ public function encodeRequest($method, $parameters) return json_encode([ 'method' => $method, 'params' => $parameters, - 'id' => $this->getIsNotification() ? null : $_requestId + 'id' => $this->getIsNotification() ? null : $_requestId, ]); } diff --git a/framework/Util/TLogRoute.php b/framework/Util/TLogRoute.php index 99218130d..b29eca9a5 100644 --- a/framework/Util/TLogRoute.php +++ b/framework/Util/TLogRoute.php @@ -41,7 +41,7 @@ abstract class TLogRoute extends \Prado\TApplicationComponent TLogger::WARNING => 'Warning', TLogger::ERROR => 'Error', TLogger::ALERT => 'Alert', - TLogger::FATAL => 'Fatal' + TLogger::FATAL => 'Fatal', ]; /** * @var array lookup table for level values @@ -53,7 +53,7 @@ abstract class TLogRoute extends \Prado\TApplicationComponent 'warning' => TLogger::WARNING, 'error' => TLogger::ERROR, 'alert' => TLogger::ALERT, - 'fatal' => TLogger::FATAL + 'fatal' => TLogger::FATAL, ]; /** * @var int log level filter (bits) diff --git a/framework/Util/TRpcClient.php b/framework/Util/TRpcClient.php index 82210017d..c12acf270 100644 --- a/framework/Util/TRpcClient.php +++ b/framework/Util/TRpcClient.php @@ -99,8 +99,8 @@ protected function createStreamContext($content, $contentType) 'http' => [ 'method' => 'POST', 'header' => "Content-Type: {$contentType}", - 'content' => $content - ] + 'content' => $content, + ], ]); } diff --git a/framework/Web/Javascripts/css-packages.php b/framework/Web/Javascripts/css-packages.php index 00a3a31f0..3dc77fc2a 100644 --- a/framework/Web/Javascripts/css-packages.php +++ b/framework/Web/Javascripts/css-packages.php @@ -59,7 +59,7 @@ //highlightjs 'highlightjs' => [ - 'highlightjs/styles/default.css' + 'highlightjs/styles/default.css', ], ]; diff --git a/framework/Web/Javascripts/packages.php b/framework/Web/Javascripts/packages.php index 78f1f41ba..d5440c1eb 100644 --- a/framework/Web/Javascripts/packages.php +++ b/framework/Web/Javascripts/packages.php @@ -102,7 +102,7 @@ //clipboard 'clipboard' => [ 'clipboard/clipboard.js', - ] + ], ]; //package names and their dependencies diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js index a523a85ee..1db340a95 100644 --- a/framework/Web/Javascripts/source/prado/prado.js +++ b/framework/Web/Javascripts/source/prado/prado.js @@ -273,7 +273,7 @@ var Prado = * Version of Prado clientscripts * @var Version */ - Version: '4.2.1', + Version: '4.2.2', /** * Registry for Prado components diff --git a/framework/Web/Services/TJsonRpcProtocol.php b/framework/Web/Services/TJsonRpcProtocol.php index d48011290..1c806e248 100644 --- a/framework/Web/Services/TJsonRpcProtocol.php +++ b/framework/Web/Services/TJsonRpcProtocol.php @@ -75,7 +75,7 @@ public function callMethod($requestPayload) return $this->encode([ 'id' => $this->_id, 'result' => $this->callApiMethod($_request['method'], $_request['params']), - 'error' => null + 'error' => null, ]); } } @@ -104,7 +104,7 @@ public function createErrorResponse(TRpcException $exception) 'code' => $exception->getCode(), 'message' => $exception->getMessage(), 'data' => null, - ] + ], ]); } else { return $this->encode([ @@ -113,7 +113,7 @@ public function createErrorResponse(TRpcException $exception) 'code' => $exception->getCode(), 'message' => $exception->getMessage(), 'data' => null, - ] + ], ]); } } diff --git a/framework/Web/Services/TRpcService.php b/framework/Web/Services/TRpcService.php index 026397fb5..b18ffcd34 100644 --- a/framework/Web/Services/TRpcService.php +++ b/framework/Web/Services/TRpcService.php @@ -72,7 +72,7 @@ class TRpcService extends \Prado\TService */ protected $protocolHandlers = [ 'application/json' => 'TJsonRpcProtocol', - 'text/xml' => 'TXmlRpcProtocol' + 'text/xml' => 'TXmlRpcProtocol', ]; /** diff --git a/framework/Web/Services/TXmlRpcProtocol.php b/framework/Web/Services/TXmlRpcProtocol.php index 00e91f201..a0c2fff08 100644 --- a/framework/Web/Services/TXmlRpcProtocol.php +++ b/framework/Web/Services/TXmlRpcProtocol.php @@ -87,7 +87,7 @@ public function createErrorResponse(TRpcException $exception) { return $this->encode([ 'faultCode' => $exception->getCode(), - 'faultString' => $exception->getMessage() + 'faultString' => $exception->getMessage(), ]); } diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php index c57c9b44c..c5ad2dd95 100644 --- a/framework/Web/THttpResponse.php +++ b/framework/Web/THttpResponse.php @@ -74,7 +74,7 @@ class THttpResponse extends \Prado\TModule implements \Prado\IO\ITextWriter 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Time-out', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Large', 415 => 'Unsupported Media Type', 416 => 'Requested range not satisfiable', 417 => 'Expectation Failed', - 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Time-out', 505 => 'HTTP Version not supported' + 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Time-out', 505 => 'HTTP Version not supported', ]; /** diff --git a/framework/Web/TUri.php b/framework/Web/TUri.php index 978638e75..75c27c36c 100644 --- a/framework/Web/TUri.php +++ b/framework/Web/TUri.php @@ -42,7 +42,7 @@ class TUri extends \Prado\TComponent 'news' => 119, 'nntp' => 119, 'wais' => 210, - 'telnet' => 23 + 'telnet' => 23, ]; /** * @var string scheme of the URI diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php index 18a7015d3..30c3e7f4b 100644 --- a/framework/Web/UI/TPage.php +++ b/framework/Web/UI/TPage.php @@ -53,7 +53,7 @@ class TPage extends TTemplateControl 'PRADO_LASTFOCUS' => true, 'PRADO_PAGESTATE' => true, 'PRADO_CALLBACK_TARGET' => true, - 'PRADO_CALLBACK_PARAMETER' => true + 'PRADO_CALLBACK_PARAMETER' => true, ]; /** * @var TForm form instance diff --git a/framework/Web/UI/WebControls/TFileUploadItem.php b/framework/Web/UI/WebControls/TFileUploadItem.php index ac39dafdc..ddf4611a3 100644 --- a/framework/Web/UI/WebControls/TFileUploadItem.php +++ b/framework/Web/UI/WebControls/TFileUploadItem.php @@ -155,7 +155,7 @@ public function toArray() 'fileSize' => $this->_fileSize, 'fileType' => $this->_fileType, 'errorCode' => $this->_errorCode, - 'localName' => $this->_localName + 'localName' => $this->_localName, ]; } } diff --git a/framework/Web/UI/WebControls/TFlushOutput.php b/framework/Web/UI/WebControls/TFlushOutput.php index 14ef91b8a..14863ff96 100644 --- a/framework/Web/UI/WebControls/TFlushOutput.php +++ b/framework/Web/UI/WebControls/TFlushOutput.php @@ -72,12 +72,10 @@ public function setContinueBuffering($value) */ public function render($writer) { - //$writer->write(''); // ajax responses can't be parsed by the client side before loaded and returned completely, // so don't bother with flushing output somewhere mid-page if refreshing in a callback if (!$this->getPage()->getIsCallback()) { $this->getPage()->flushWriter(); -// $this->Application->flushOutput($this->ContinueBuffering); } } } diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php index f2cad0f53..da97acd6a 100644 --- a/framework/Web/UI/WebControls/THtmlArea.php +++ b/framework/Web/UI/WebControls/THtmlArea.php @@ -182,7 +182,7 @@ class THtmlArea extends TTextBox 'visualchars', 'wordc', 'wordcount', - 'xhtmlxtras' + 'xhtmlxtras', ]; /** @@ -190,7 +190,7 @@ class THtmlArea extends TTextBox */ private static $_themes = [ 'simple', - 'advanced' + 'advanced', ]; /** @@ -353,7 +353,7 @@ protected function registerEditorClientScript($writer) $this->loadJavascriptLibrary(); $scripts = $this->getPage()->getClientScript(); $options = [ - 'EditorOptions' => $this->getEditorOptions() + 'EditorOptions' => $this->getEditorOptions(), ]; $options = TJavaScript::encode($options, true, true); diff --git a/framework/Web/UI/WebControls/THtmlArea5.php b/framework/Web/UI/WebControls/THtmlArea5.php index e9d32e359..0b670c985 100644 --- a/framework/Web/UI/WebControls/THtmlArea5.php +++ b/framework/Web/UI/WebControls/THtmlArea5.php @@ -298,7 +298,7 @@ protected function registerEditorClientScript($writer) $scripts = $this->getPage()->getClientScript(); $options = [ 'ID' => $this->getClientID(), - 'EditorOptions' => $this->getEditorOptions() + 'EditorOptions' => $this->getEditorOptions(), ]; $options = TJavaScript::encode($options, true, true); diff --git a/framework/Web/UI/WebControls/TReCaptcha.php b/framework/Web/UI/WebControls/TReCaptcha.php index eac5035b4..cf9391809 100644 --- a/framework/Web/UI/WebControls/TReCaptcha.php +++ b/framework/Web/UI/WebControls/TReCaptcha.php @@ -379,7 +379,7 @@ private function recaptcha_check_answer($privkey, $remoteip, $challenge, $respon 'privatekey' => $privkey, 'remoteip' => $remoteip, 'challenge' => $challenge, - 'response' => $response + 'response' => $response, ] + $extra_params ); diff --git a/framework/Web/UI/WebControls/TValidationSummary.php b/framework/Web/UI/WebControls/TValidationSummary.php index aedd8af6f..594f5597c 100644 --- a/framework/Web/UI/WebControls/TValidationSummary.php +++ b/framework/Web/UI/WebControls/TValidationSummary.php @@ -347,7 +347,6 @@ public function renderContents($writer) { $this->renderJsSummary(); if ($this->getShowSummary()) { -// $this->setStyle('display:block'); switch ($this->getDisplayMode()) { case TValidationSummaryDisplayMode::SimpleList: $this->renderList($writer); diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php index ce0a998a5..dc99fbd23 100644 --- a/framework/Web/UI/WebControls/TWizard.php +++ b/framework/Web/UI/WebControls/TWizard.php @@ -1047,7 +1047,6 @@ public function createChildControls() $this->createHeader(); $this->createStepContent(); $this->createNavigation(); -// $this->clearChildState(); } /** diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml index fbd5bb689..7bcee6ebc 100644 --- a/phpdoc.dist.xml +++ b/phpdoc.dist.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://www.phpdoc.org" > - Prado 4.2.1 API Manual + Prado 4.2.2 API Manual build/docs build/cache diff --git a/phpstan.neon.dist b/phpstan.neon.dist index d33d4d108..92bb0e92b 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,5 +1,5 @@ parameters: - phpVersion: 70400 # PHP 7.4 + phpVersion: 80100 # PHP 8.1 level: 2 paths: - framework
- Application Log -
 CategoryMessageTime Spent (s)Cumulated Time Spent (s)
+ Application Log +
 CategoryMessageTime Spent (s)Cumulated Time Spent (s)
- Application Log -
 CategoryMessageTime Spent (s)Cumulated Time Spent (s)
+ Application Log +
 CategoryMessageTime Spent (s)Cumulated Time Spent (s)
 {$log[2]}{$msg}{$delta}{$total}
 {$log[2]}{$msg}{$delta}{$total}
 {$log[2]}{$msg}{$delta}{$total}
 {$log[2]}{$msg}{$delta}{$total}