diff --git a/site/composer.lock b/site/composer.lock index b8576359b..5a5f3e630 100644 --- a/site/composer.lock +++ b/site/composer.lock @@ -490,21 +490,21 @@ }, { "name": "nette/component-model", - "version": "v3.1.0", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/nette/component-model.git", - "reference": "4e0946a788b4ac42ea903b761c693ec7dd083a69" + "reference": "fb7608fd5f1c378ef9ef8ddc459c6ef0b63e9d77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/component-model/zipball/4e0946a788b4ac42ea903b761c693ec7dd083a69", - "reference": "4e0946a788b4ac42ea903b761c693ec7dd083a69", + "url": "https://api.github.com/repos/nette/component-model/zipball/fb7608fd5f1c378ef9ef8ddc459c6ef0b63e9d77", + "reference": "fb7608fd5f1c378ef9ef8ddc459c6ef0b63e9d77", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { "nette/tester": "^2.5", @@ -546,9 +546,9 @@ ], "support": { "issues": "https://github.com/nette/component-model/issues", - "source": "https://github.com/nette/component-model/tree/v3.1.0" + "source": "https://github.com/nette/component-model/tree/v3.1.1" }, - "time": "2024-02-08T20:25:40+00:00" + "time": "2024-08-07T00:35:59+00:00" }, { "name": "nette/database", @@ -627,27 +627,27 @@ }, { "name": "nette/di", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/nette/di.git", - "reference": "50beb3271322a7c9a7b9f76d991476c9ae5c82d6" + "reference": "9b9bfb43dac31c7804b2c8900217046cc0ca3307" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/50beb3271322a7c9a7b9f76d991476c9ae5c82d6", - "reference": "50beb3271322a7c9a7b9f76d991476c9ae5c82d6", + "url": "https://api.github.com/repos/nette/di/zipball/9b9bfb43dac31c7804b2c8900217046cc0ca3307", + "reference": "9b9bfb43dac31c7804b2c8900217046cc0ca3307", "shasum": "" }, "require": { "ext-ctype": "*", "ext-tokenizer": "*", "nette/neon": "^3.3 || ^4.0", - "nette/php-generator": "^4.1.3", + "nette/php-generator": "^4.1.6", "nette/robot-loader": "^4.0", "nette/schema": "^1.2.5", "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { "nette/tester": "^2.5.2", @@ -694,9 +694,9 @@ ], "support": { "issues": "https://github.com/nette/di/issues", - "source": "https://github.com/nette/di/tree/v3.2.2" + "source": "https://github.com/nette/di/tree/v3.2.3" }, - "time": "2024-05-16T13:30:24+00:00" + "time": "2024-10-05T03:14:33+00:00" }, { "name": "nette/forms", @@ -858,22 +858,22 @@ }, { "name": "nette/mail", - "version": "v4.0.2", + "version": "v4.0.3", "source": { "type": "git", "url": "https://github.com/nette/mail.git", - "reference": "c0b81124284bee573ee968de98fe3dcf2c2a9b5e" + "reference": "d99839701c48031d6f35e3be95bdd9418f66ad2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/mail/zipball/c0b81124284bee573ee968de98fe3dcf2c2a9b5e", - "reference": "c0b81124284bee573ee968de98fe3dcf2c2a9b5e", + "url": "https://api.github.com/repos/nette/mail/zipball/d99839701c48031d6f35e3be95bdd9418f66ad2d", + "reference": "d99839701c48031d6f35e3be95bdd9418f66ad2d", "shasum": "" }, "require": { "ext-iconv": "*", "nette/utils": "^4.0", - "php": "8.0 - 8.3" + "php": "8.0 - 8.4" }, "require-dev": { "nette/di": "^3.1 || ^4.0", @@ -912,7 +912,7 @@ "homepage": "https://nette.org/contributors" } ], - "description": "📧 Nette Mail: handy email creation and transfer library for PHP with both text and MIME-compliant support.", + "description": "📧 Nette Mail: A handy library for creating and sending emails in PHP.", "homepage": "https://nette.org", "keywords": [ "mail", @@ -923,27 +923,27 @@ ], "support": { "issues": "https://github.com/nette/mail/issues", - "source": "https://github.com/nette/mail/tree/v4.0.2" + "source": "https://github.com/nette/mail/tree/v4.0.3" }, - "time": "2023-10-02T20:59:33+00:00" + "time": "2024-10-05T03:15:12+00:00" }, { "name": "nette/neon", - "version": "v3.4.3", + "version": "v3.4.4", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "c8481c104431c8d94cc88424a1e21f47f8c93280" + "reference": "3411aa86b104e2d5b7e760da4600865ead963c3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/c8481c104431c8d94cc88424a1e21f47f8c93280", - "reference": "c8481c104431c8d94cc88424a1e21f47f8c93280", + "url": "https://api.github.com/repos/nette/neon/zipball/3411aa86b104e2d5b7e760da4600865ead963c3c", + "reference": "3411aa86b104e2d5b7e760da4600865ead963c3c", "shasum": "" }, "require": { "ext-json": "*", - "php": "8.0 - 8.3" + "php": "8.0 - 8.4" }, "require-dev": { "nette/tester": "^2.4", @@ -991,9 +991,9 @@ ], "support": { "issues": "https://github.com/nette/neon/issues", - "source": "https://github.com/nette/neon/tree/v3.4.3" + "source": "https://github.com/nette/neon/tree/v3.4.4" }, - "time": "2024-06-26T14:53:59+00:00" + "time": "2024-10-04T22:00:08+00:00" }, { "name": "nette/php-generator", @@ -1194,24 +1194,24 @@ }, { "name": "nette/schema", - "version": "v1.3.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188" + "reference": "9522dad6211c4d995a01a9ac529da88d0b0ba7b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", - "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", + "url": "https://api.github.com/repos/nette/schema/zipball/9522dad6211c4d995a01a9ac529da88d0b0ba7b5", + "reference": "9522dad6211c4d995a01a9ac529da88d0b0ba7b5", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { - "nette/tester": "^2.4", + "nette/tester": "^2.5.2", "phpstan/phpstan-nette": "^1.0", "tracy/tracy": "^2.8" }, @@ -1250,9 +1250,9 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.3.0" + "source": "https://github.com/nette/schema/tree/v1.3.1" }, - "time": "2023-12-11T11:54:22+00:00" + "time": "2024-10-05T03:01:50+00:00" }, { "name": "nette/security", @@ -2944,20 +2944,20 @@ }, { "name": "texy/texy", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/dg/texy.git", - "reference": "cd1068e6abef89808f969347076aaaace9215bd5" + "reference": "a441883938f1ab79f4e22c949e6a1169a119a078" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dg/texy/zipball/cd1068e6abef89808f969347076aaaace9215bd5", - "reference": "cd1068e6abef89808f969347076aaaace9215bd5", + "url": "https://api.github.com/repos/dg/texy/zipball/a441883938f1ab79f4e22c949e6a1169a119a078", + "reference": "a441883938f1ab79f4e22c949e6a1169a119a078", "shasum": "" }, "require": { - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "conflict": { "latte/latte": ">=3.0.0 <3.0.14" @@ -3007,9 +3007,9 @@ "wiki" ], "support": { - "source": "https://github.com/dg/texy/tree/v3.2.2" + "source": "https://github.com/dg/texy/tree/v3.2.3" }, - "time": "2024-05-27T12:24:38+00:00" + "time": "2024-10-05T15:06:56+00:00" }, { "name": "tracy/tracy", @@ -3686,12 +3686,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "5bd374d4b964c449fc99b871b6d9f139d0b41502" + "reference": "c90faeb954dbf0e3bb0657496199afeb99e2d4dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/5bd374d4b964c449fc99b871b6d9f139d0b41502", - "reference": "5bd374d4b964c449fc99b871b6d9f139d0b41502", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/c90faeb954dbf0e3bb0657496199afeb99e2d4dd", + "reference": "c90faeb954dbf0e3bb0657496199afeb99e2d4dd", "shasum": "" }, "conflict": { @@ -3792,7 +3792,7 @@ "concrete5/core": "<8.5.8|>=9,<9.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/comments-bundle": ">=2,<4.13.40|>=5.0.0.0-RC1-dev,<5.3.4", - "contao/contao": ">=3,<3.5.37|>=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4", + "contao/contao": "<=5.4.1", "contao/core": "<3.5.39", "contao/core-bundle": "<4.13.49|>=5,<5.3.15|>=5.4,<5.4.3", "contao/listing-bundle": ">=3,<=3.5.30|>=4,<4.4.8", @@ -3815,6 +3815,7 @@ "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3", "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4", "desperado/xml-bundle": "<=0.1.7", + "dev-lancer/minecraft-motd-parser": "<=1.0.5", "devgroup/dotplant": "<2020.09.14-dev", "directmailteam/direct-mail": "<6.0.3|>=7,<7.0.3|>=8,<9.5.2", "doctrine/annotations": "<1.2.7", @@ -3829,9 +3830,9 @@ "dolibarr/dolibarr": "<19.0.2", "dompdf/dompdf": "<2.0.4", "doublethreedigital/guest-entries": "<3.1.2", - "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<=11.0.4", - "drupal/core-recommended": ">=8,<=11.0.4", - "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<=11.0.4", + "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.3.6|>=11,<11.0.5", + "drupal/core-recommended": ">=8,<10.3.6|>=11,<11.0.5", + "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<10.3.6|>=11,<11.0.5", "duncanmcclean/guest-entries": "<3.1.2", "dweeves/magmi": "<=0.7.24", "ec-cube/ec-cube": "<2.4.4|>=2.11,<=2.17.1|>=3,<=3.0.18.0-patch4|>=4,<=4.1.2", @@ -4033,7 +4034,7 @@ "magneto/core": "<1.9.4.4-dev", "maikuolan/phpmussel": ">=1,<1.6", "mainwp/mainwp": "<=4.4.3.3", - "mantisbt/mantisbt": "<2.26.2", + "mantisbt/mantisbt": "<=2.26.3", "marcwillmann/turn": "<0.3.3", "matyhtf/framework": "<3.0.6", "mautic/core": "<4.4.13|>=5,<5.1.1", @@ -4095,7 +4096,7 @@ "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", "october/backend": "<1.1.2", "october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1", - "october/october": "<=3.4.4", + "october/october": "<=3.6.4", "october/rain": "<1.0.472|>=1.1,<1.1.2", "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.15", "omeka/omeka-s": "<4.0.3", @@ -4267,6 +4268,7 @@ "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", "ssddanbrown/bookstack": "<24.05.1", + "starcitizentools/citizen-skin": ">=2.6.3,<2.31", "statamic/cms": "<4.46|>=5.3,<5.6.2", "stormpath/sdk": "<9.9.99", "studio-42/elfinder": "<=2.1.64", @@ -4274,7 +4276,7 @@ "subhh/libconnect": "<7.0.8|>=8,<8.1", "sukohi/surpass": "<1", "sulu/form-bundle": ">=2,<2.5.3", - "sulu/sulu": "<1.6.44|>=2,<2.4.17|>=2.5,<2.5.13", + "sulu/sulu": "<1.6.44|>=2,<2.6.5", "sumocoders/framework-user-bundle": "<1.4", "superbig/craft-audit": "<3.0.2", "swag/paypal": "<5.4.4", @@ -4346,7 +4348,7 @@ "topthink/thinkphp": "<=3.2.3", "torrentpier/torrentpier": "<=2.4.3", "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2", - "tribalsystems/zenario": "<9.5.60602", + "tribalsystems/zenario": "<=9.7.61188", "truckersmp/phpwhois": "<=4.3.1", "ttskch/pagination-service-provider": "<1", "twbs/bootstrap": "<=3.4.1|>=4,<=4.6.2", @@ -4505,7 +4507,7 @@ "type": "tidelift" } ], - "time": "2024-09-27T21:04:39+00:00" + "time": "2024-10-04T19:04:42+00:00" }, { "name": "shipmonk/composer-dependency-analyser", diff --git a/site/vendor/composer/autoload_classmap.php b/site/vendor/composer/autoload_classmap.php index af483c74f..81847c54b 100644 --- a/site/vendor/composer/autoload_classmap.php +++ b/site/vendor/composer/autoload_classmap.php @@ -591,6 +591,7 @@ 'Nette\\Schema\\Elements\\Type' => $vendorDir . '/nette/schema/src/Schema/Elements/Type.php', 'Nette\\Schema\\Expect' => $vendorDir . '/nette/schema/src/Schema/Expect.php', 'Nette\\Schema\\Helpers' => $vendorDir . '/nette/schema/src/Schema/Helpers.php', + 'Nette\\Schema\\MergeMode' => $vendorDir . '/nette/schema/src/Schema/MergeMode.php', 'Nette\\Schema\\Message' => $vendorDir . '/nette/schema/src/Schema/Message.php', 'Nette\\Schema\\Processor' => $vendorDir . '/nette/schema/src/Schema/Processor.php', 'Nette\\Schema\\Schema' => $vendorDir . '/nette/schema/src/Schema/Schema.php', diff --git a/site/vendor/composer/autoload_static.php b/site/vendor/composer/autoload_static.php index 40c7d78a3..a36ade51a 100644 --- a/site/vendor/composer/autoload_static.php +++ b/site/vendor/composer/autoload_static.php @@ -799,6 +799,7 @@ class ComposerStaticInit247de957f14f643f393d210a332dd05b 'Nette\\Schema\\Elements\\Type' => __DIR__ . '/..' . '/nette/schema/src/Schema/Elements/Type.php', 'Nette\\Schema\\Expect' => __DIR__ . '/..' . '/nette/schema/src/Schema/Expect.php', 'Nette\\Schema\\Helpers' => __DIR__ . '/..' . '/nette/schema/src/Schema/Helpers.php', + 'Nette\\Schema\\MergeMode' => __DIR__ . '/..' . '/nette/schema/src/Schema/MergeMode.php', 'Nette\\Schema\\Message' => __DIR__ . '/..' . '/nette/schema/src/Schema/Message.php', 'Nette\\Schema\\Processor' => __DIR__ . '/..' . '/nette/schema/src/Schema/Processor.php', 'Nette\\Schema\\Schema' => __DIR__ . '/..' . '/nette/schema/src/Schema/Schema.php', diff --git a/site/vendor/composer/installed.json b/site/vendor/composer/installed.json index a106e6a8f..bf802f0f4 100644 --- a/site/vendor/composer/installed.json +++ b/site/vendor/composer/installed.json @@ -667,29 +667,29 @@ }, { "name": "nette/component-model", - "version": "v3.1.0", - "version_normalized": "3.1.0.0", + "version": "v3.1.1", + "version_normalized": "3.1.1.0", "source": { "type": "git", "url": "https://github.com/nette/component-model.git", - "reference": "4e0946a788b4ac42ea903b761c693ec7dd083a69" + "reference": "fb7608fd5f1c378ef9ef8ddc459c6ef0b63e9d77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/component-model/zipball/4e0946a788b4ac42ea903b761c693ec7dd083a69", - "reference": "4e0946a788b4ac42ea903b761c693ec7dd083a69", + "url": "https://api.github.com/repos/nette/component-model/zipball/fb7608fd5f1c378ef9ef8ddc459c6ef0b63e9d77", + "reference": "fb7608fd5f1c378ef9ef8ddc459c6ef0b63e9d77", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { "nette/tester": "^2.5", "phpstan/phpstan": "^1.0", "tracy/tracy": "^2.9" }, - "time": "2024-02-08T20:25:40+00:00", + "time": "2024-08-07T00:35:59+00:00", "type": "library", "extra": { "branch-alias": { @@ -726,7 +726,7 @@ ], "support": { "issues": "https://github.com/nette/component-model/issues", - "source": "https://github.com/nette/component-model/tree/v3.1.0" + "source": "https://github.com/nette/component-model/tree/v3.1.1" }, "install-path": "../nette/component-model" }, @@ -810,35 +810,35 @@ }, { "name": "nette/di", - "version": "v3.2.2", - "version_normalized": "3.2.2.0", + "version": "v3.2.3", + "version_normalized": "3.2.3.0", "source": { "type": "git", "url": "https://github.com/nette/di.git", - "reference": "50beb3271322a7c9a7b9f76d991476c9ae5c82d6" + "reference": "9b9bfb43dac31c7804b2c8900217046cc0ca3307" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/50beb3271322a7c9a7b9f76d991476c9ae5c82d6", - "reference": "50beb3271322a7c9a7b9f76d991476c9ae5c82d6", + "url": "https://api.github.com/repos/nette/di/zipball/9b9bfb43dac31c7804b2c8900217046cc0ca3307", + "reference": "9b9bfb43dac31c7804b2c8900217046cc0ca3307", "shasum": "" }, "require": { "ext-ctype": "*", "ext-tokenizer": "*", "nette/neon": "^3.3 || ^4.0", - "nette/php-generator": "^4.1.3", + "nette/php-generator": "^4.1.6", "nette/robot-loader": "^4.0", "nette/schema": "^1.2.5", "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { "nette/tester": "^2.5.2", "phpstan/phpstan": "^1.0", "tracy/tracy": "^2.9" }, - "time": "2024-05-16T13:30:24+00:00", + "time": "2024-10-05T03:14:33+00:00", "type": "library", "extra": { "branch-alias": { @@ -880,7 +880,7 @@ ], "support": { "issues": "https://github.com/nette/di/issues", - "source": "https://github.com/nette/di/tree/v3.2.2" + "source": "https://github.com/nette/di/tree/v3.2.3" }, "install-path": "../nette/di" }, @@ -1050,23 +1050,23 @@ }, { "name": "nette/mail", - "version": "v4.0.2", - "version_normalized": "4.0.2.0", + "version": "v4.0.3", + "version_normalized": "4.0.3.0", "source": { "type": "git", "url": "https://github.com/nette/mail.git", - "reference": "c0b81124284bee573ee968de98fe3dcf2c2a9b5e" + "reference": "d99839701c48031d6f35e3be95bdd9418f66ad2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/mail/zipball/c0b81124284bee573ee968de98fe3dcf2c2a9b5e", - "reference": "c0b81124284bee573ee968de98fe3dcf2c2a9b5e", + "url": "https://api.github.com/repos/nette/mail/zipball/d99839701c48031d6f35e3be95bdd9418f66ad2d", + "reference": "d99839701c48031d6f35e3be95bdd9418f66ad2d", "shasum": "" }, "require": { "ext-iconv": "*", "nette/utils": "^4.0", - "php": "8.0 - 8.3" + "php": "8.0 - 8.4" }, "require-dev": { "nette/di": "^3.1 || ^4.0", @@ -1078,7 +1078,7 @@ "ext-fileinfo": "to detect type of attached files", "ext-openssl": "to use Nette\\Mail\\DkimSigner" }, - "time": "2023-10-02T20:59:33+00:00", + "time": "2024-10-05T03:15:12+00:00", "type": "library", "extra": { "branch-alias": { @@ -1107,7 +1107,7 @@ "homepage": "https://nette.org/contributors" } ], - "description": "📧 Nette Mail: handy email creation and transfer library for PHP with both text and MIME-compliant support.", + "description": "📧 Nette Mail: A handy library for creating and sending emails in PHP.", "homepage": "https://nette.org", "keywords": [ "mail", @@ -1118,35 +1118,35 @@ ], "support": { "issues": "https://github.com/nette/mail/issues", - "source": "https://github.com/nette/mail/tree/v4.0.2" + "source": "https://github.com/nette/mail/tree/v4.0.3" }, "install-path": "../nette/mail" }, { "name": "nette/neon", - "version": "v3.4.3", - "version_normalized": "3.4.3.0", + "version": "v3.4.4", + "version_normalized": "3.4.4.0", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "c8481c104431c8d94cc88424a1e21f47f8c93280" + "reference": "3411aa86b104e2d5b7e760da4600865ead963c3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/c8481c104431c8d94cc88424a1e21f47f8c93280", - "reference": "c8481c104431c8d94cc88424a1e21f47f8c93280", + "url": "https://api.github.com/repos/nette/neon/zipball/3411aa86b104e2d5b7e760da4600865ead963c3c", + "reference": "3411aa86b104e2d5b7e760da4600865ead963c3c", "shasum": "" }, "require": { "ext-json": "*", - "php": "8.0 - 8.3" + "php": "8.0 - 8.4" }, "require-dev": { "nette/tester": "^2.4", "phpstan/phpstan": "^1.0", "tracy/tracy": "^2.7" }, - "time": "2024-06-26T14:53:59+00:00", + "time": "2024-10-04T22:00:08+00:00", "bin": [ "bin/neon-lint" ], @@ -1189,7 +1189,7 @@ ], "support": { "issues": "https://github.com/nette/neon/issues", - "source": "https://github.com/nette/neon/tree/v3.4.3" + "source": "https://github.com/nette/neon/tree/v3.4.4" }, "install-path": "../nette/neon" }, @@ -1401,29 +1401,29 @@ }, { "name": "nette/schema", - "version": "v1.3.0", - "version_normalized": "1.3.0.0", + "version": "v1.3.1", + "version_normalized": "1.3.1.0", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188" + "reference": "9522dad6211c4d995a01a9ac529da88d0b0ba7b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", - "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", + "url": "https://api.github.com/repos/nette/schema/zipball/9522dad6211c4d995a01a9ac529da88d0b0ba7b5", + "reference": "9522dad6211c4d995a01a9ac529da88d0b0ba7b5", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { - "nette/tester": "^2.4", + "nette/tester": "^2.5.2", "phpstan/phpstan-nette": "^1.0", "tracy/tracy": "^2.8" }, - "time": "2023-12-11T11:54:22+00:00", + "time": "2024-10-05T03:01:50+00:00", "type": "library", "extra": { "branch-alias": { @@ -1460,7 +1460,7 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.3.0" + "source": "https://github.com/nette/schema/tree/v1.3.1" }, "install-path": "../nette/schema" }, @@ -2506,12 +2506,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "5bd374d4b964c449fc99b871b6d9f139d0b41502" + "reference": "c90faeb954dbf0e3bb0657496199afeb99e2d4dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/5bd374d4b964c449fc99b871b6d9f139d0b41502", - "reference": "5bd374d4b964c449fc99b871b6d9f139d0b41502", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/c90faeb954dbf0e3bb0657496199afeb99e2d4dd", + "reference": "c90faeb954dbf0e3bb0657496199afeb99e2d4dd", "shasum": "" }, "conflict": { @@ -2612,7 +2612,7 @@ "concrete5/core": "<8.5.8|>=9,<9.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/comments-bundle": ">=2,<4.13.40|>=5.0.0.0-RC1-dev,<5.3.4", - "contao/contao": ">=3,<3.5.37|>=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4", + "contao/contao": "<=5.4.1", "contao/core": "<3.5.39", "contao/core-bundle": "<4.13.49|>=5,<5.3.15|>=5.4,<5.4.3", "contao/listing-bundle": ">=3,<=3.5.30|>=4,<4.4.8", @@ -2635,6 +2635,7 @@ "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3", "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4", "desperado/xml-bundle": "<=0.1.7", + "dev-lancer/minecraft-motd-parser": "<=1.0.5", "devgroup/dotplant": "<2020.09.14-dev", "directmailteam/direct-mail": "<6.0.3|>=7,<7.0.3|>=8,<9.5.2", "doctrine/annotations": "<1.2.7", @@ -2649,9 +2650,9 @@ "dolibarr/dolibarr": "<19.0.2", "dompdf/dompdf": "<2.0.4", "doublethreedigital/guest-entries": "<3.1.2", - "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<=11.0.4", - "drupal/core-recommended": ">=8,<=11.0.4", - "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<=11.0.4", + "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.3.6|>=11,<11.0.5", + "drupal/core-recommended": ">=8,<10.3.6|>=11,<11.0.5", + "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<10.3.6|>=11,<11.0.5", "duncanmcclean/guest-entries": "<3.1.2", "dweeves/magmi": "<=0.7.24", "ec-cube/ec-cube": "<2.4.4|>=2.11,<=2.17.1|>=3,<=3.0.18.0-patch4|>=4,<=4.1.2", @@ -2853,7 +2854,7 @@ "magneto/core": "<1.9.4.4-dev", "maikuolan/phpmussel": ">=1,<1.6", "mainwp/mainwp": "<=4.4.3.3", - "mantisbt/mantisbt": "<2.26.2", + "mantisbt/mantisbt": "<=2.26.3", "marcwillmann/turn": "<0.3.3", "matyhtf/framework": "<3.0.6", "mautic/core": "<4.4.13|>=5,<5.1.1", @@ -2915,7 +2916,7 @@ "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", "october/backend": "<1.1.2", "october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1", - "october/october": "<=3.4.4", + "october/october": "<=3.6.4", "october/rain": "<1.0.472|>=1.1,<1.1.2", "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.15", "omeka/omeka-s": "<4.0.3", @@ -3087,6 +3088,7 @@ "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", "ssddanbrown/bookstack": "<24.05.1", + "starcitizentools/citizen-skin": ">=2.6.3,<2.31", "statamic/cms": "<4.46|>=5.3,<5.6.2", "stormpath/sdk": "<9.9.99", "studio-42/elfinder": "<=2.1.64", @@ -3094,7 +3096,7 @@ "subhh/libconnect": "<7.0.8|>=8,<8.1", "sukohi/surpass": "<1", "sulu/form-bundle": ">=2,<2.5.3", - "sulu/sulu": "<1.6.44|>=2,<2.4.17|>=2.5,<2.5.13", + "sulu/sulu": "<1.6.44|>=2,<2.6.5", "sumocoders/framework-user-bundle": "<1.4", "superbig/craft-audit": "<3.0.2", "swag/paypal": "<5.4.4", @@ -3166,7 +3168,7 @@ "topthink/thinkphp": "<=3.2.3", "torrentpier/torrentpier": "<=2.4.3", "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2", - "tribalsystems/zenario": "<9.5.60602", + "tribalsystems/zenario": "<=9.7.61188", "truckersmp/phpwhois": "<=4.3.1", "ttskch/pagination-service-provider": "<1", "twbs/bootstrap": "<=3.4.1|>=4,<=4.6.2", @@ -3289,7 +3291,7 @@ "zfr/zfr-oauth2-server-module": "<0.1.2", "zoujingli/thinkadmin": "<=6.1.53" }, - "time": "2024-09-27T21:04:39+00:00", + "time": "2024-10-04T19:04:42+00:00", "default-branch": true, "type": "metapackage", "notification-url": "https://packagist.org/downloads/", @@ -4881,21 +4883,21 @@ }, { "name": "texy/texy", - "version": "v3.2.2", - "version_normalized": "3.2.2.0", + "version": "v3.2.3", + "version_normalized": "3.2.3.0", "source": { "type": "git", "url": "https://github.com/dg/texy.git", - "reference": "cd1068e6abef89808f969347076aaaace9215bd5" + "reference": "a441883938f1ab79f4e22c949e6a1169a119a078" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dg/texy/zipball/cd1068e6abef89808f969347076aaaace9215bd5", - "reference": "cd1068e6abef89808f969347076aaaace9215bd5", + "url": "https://api.github.com/repos/dg/texy/zipball/a441883938f1ab79f4e22c949e6a1169a119a078", + "reference": "a441883938f1ab79f4e22c949e6a1169a119a078", "shasum": "" }, "require": { - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "conflict": { "latte/latte": ">=3.0.0 <3.0.14" @@ -4909,7 +4911,7 @@ "phpstan/phpstan": "^1", "tracy/tracy": "^2.9" }, - "time": "2024-05-27T12:24:38+00:00", + "time": "2024-10-05T15:06:56+00:00", "type": "library", "extra": { "branch-alias": { @@ -4947,7 +4949,7 @@ "wiki" ], "support": { - "source": "https://github.com/dg/texy/tree/v3.2.2" + "source": "https://github.com/dg/texy/tree/v3.2.3" }, "install-path": "../texy/texy" }, diff --git a/site/vendor/composer/installed.php b/site/vendor/composer/installed.php index e24bc366a..56cf3ed8f 100644 --- a/site/vendor/composer/installed.php +++ b/site/vendor/composer/installed.php @@ -128,9 +128,9 @@ 'dev_requirement' => false, ), 'nette/component-model' => array( - 'pretty_version' => 'v3.1.0', - 'version' => '3.1.0.0', - 'reference' => '4e0946a788b4ac42ea903b761c693ec7dd083a69', + 'pretty_version' => 'v3.1.1', + 'version' => '3.1.1.0', + 'reference' => 'fb7608fd5f1c378ef9ef8ddc459c6ef0b63e9d77', 'type' => 'library', 'install_path' => __DIR__ . '/../nette/component-model', 'aliases' => array(), @@ -146,9 +146,9 @@ 'dev_requirement' => false, ), 'nette/di' => array( - 'pretty_version' => 'v3.2.2', - 'version' => '3.2.2.0', - 'reference' => '50beb3271322a7c9a7b9f76d991476c9ae5c82d6', + 'pretty_version' => 'v3.2.3', + 'version' => '3.2.3.0', + 'reference' => '9b9bfb43dac31c7804b2c8900217046cc0ca3307', 'type' => 'library', 'install_path' => __DIR__ . '/../nette/di', 'aliases' => array(), @@ -179,18 +179,18 @@ 'dev_requirement' => false, ), 'nette/mail' => array( - 'pretty_version' => 'v4.0.2', - 'version' => '4.0.2.0', - 'reference' => 'c0b81124284bee573ee968de98fe3dcf2c2a9b5e', + 'pretty_version' => 'v4.0.3', + 'version' => '4.0.3.0', + 'reference' => 'd99839701c48031d6f35e3be95bdd9418f66ad2d', 'type' => 'library', 'install_path' => __DIR__ . '/../nette/mail', 'aliases' => array(), 'dev_requirement' => false, ), 'nette/neon' => array( - 'pretty_version' => 'v3.4.3', - 'version' => '3.4.3.0', - 'reference' => 'c8481c104431c8d94cc88424a1e21f47f8c93280', + 'pretty_version' => 'v3.4.4', + 'version' => '3.4.4.0', + 'reference' => '3411aa86b104e2d5b7e760da4600865ead963c3c', 'type' => 'library', 'install_path' => __DIR__ . '/../nette/neon', 'aliases' => array(), @@ -224,9 +224,9 @@ 'dev_requirement' => false, ), 'nette/schema' => array( - 'pretty_version' => 'v1.3.0', - 'version' => '1.3.0.0', - 'reference' => 'a6d3a6d1f545f01ef38e60f375d1cf1f4de98188', + 'pretty_version' => 'v1.3.1', + 'version' => '1.3.1.0', + 'reference' => '9522dad6211c4d995a01a9ac529da88d0b0ba7b5', 'type' => 'library', 'install_path' => __DIR__ . '/../nette/schema', 'aliases' => array(), @@ -412,7 +412,7 @@ 'roave/security-advisories' => array( 'pretty_version' => 'dev-latest', 'version' => 'dev-latest', - 'reference' => '5bd374d4b964c449fc99b871b6d9f139d0b41502', + 'reference' => 'c90faeb954dbf0e3bb0657496199afeb99e2d4dd', 'type' => 'metapackage', 'install_path' => null, 'aliases' => array( @@ -667,9 +667,9 @@ 'dev_requirement' => false, ), 'texy/texy' => array( - 'pretty_version' => 'v3.2.2', - 'version' => '3.2.2.0', - 'reference' => 'cd1068e6abef89808f969347076aaaace9215bd5', + 'pretty_version' => 'v3.2.3', + 'version' => '3.2.3.0', + 'reference' => 'a441883938f1ab79f4e22c949e6a1169a119a078', 'type' => 'library', 'install_path' => __DIR__ . '/../texy/texy', 'aliases' => array(), diff --git a/site/vendor/nette/component-model/composer.json b/site/vendor/nette/component-model/composer.json index eaae0231a..52a8f9e00 100644 --- a/site/vendor/nette/component-model/composer.json +++ b/site/vendor/nette/component-model/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "8.1 - 8.3", + "php": "8.1 - 8.4", "nette/utils": "^4.0" }, "require-dev": { diff --git a/site/vendor/nette/component-model/readme.md b/site/vendor/nette/component-model/readme.md index 2ef9eb22b..91c9b8011 100644 --- a/site/vendor/nette/component-model/readme.md +++ b/site/vendor/nette/component-model/readme.md @@ -28,4 +28,4 @@ The recommended way to install is via Composer: composer require nette/component-model ``` -It requires PHP version 8.1 and supports PHP up to 8.3. +It requires PHP version 8.1 and supports PHP up to 8.4. diff --git a/site/vendor/nette/component-model/src/ComponentModel/Component.php b/site/vendor/nette/component-model/src/ComponentModel/Component.php index 492e452cf..64f77fc35 100644 --- a/site/vendor/nette/component-model/src/ComponentModel/Component.php +++ b/site/vendor/nette/component-model/src/ComponentModel/Component.php @@ -13,9 +13,7 @@ /** - * Component is the base class for all components. - * - * Components are objects implementing IComponent. They has parent component and own name. + * Base class for all components. Components have a parent, name, and can be monitored by ancestors. * * @property-read string $name * @property-read IContainer|null $parent @@ -32,7 +30,7 @@ abstract class Component implements IComponent /** - * Finds the closest ancestor specified by class or interface name. + * Finds the closest ancestor of specified type. * @param bool $throw throw exception if component doesn't exist? * @return ($throw is true ? IComponent : ?IComponent) */ @@ -88,7 +86,7 @@ final public function lookupPath(?string $type = null, bool $throw = true): ?str /** - * Starts monitoring of ancestors. + * Starts monitoring ancestors for attach/detach events. */ final public function monitor(string $type, ?callable $attached = null, ?callable $detached = null): void { @@ -110,7 +108,7 @@ final public function monitor(string $type, ?callable $attached = null, ?callabl /** - * Stops monitoring of ancestors. + * Stops monitoring ancestors of specified type. */ final public function unmonitor(string $type): void { @@ -198,8 +196,8 @@ public function setParent(?IContainer $parent, ?string $name = null): static /** - * Is called by a component when it is about to be set new parent. Descendant can - * override this method to disallow a parent change by throwing an Nette\InvalidStateException + * Validates the new parent before it's set. + * Descendant classes can override this to implement custom validation logic. * @throws Nette\InvalidStateException */ protected function validateParent(IContainer $parent): void diff --git a/site/vendor/nette/component-model/src/ComponentModel/Container.php b/site/vendor/nette/component-model/src/ComponentModel/Container.php index ec74fa14e..256196fb7 100644 --- a/site/vendor/nette/component-model/src/ComponentModel/Container.php +++ b/site/vendor/nette/component-model/src/ComponentModel/Container.php @@ -13,7 +13,7 @@ /** - * ComponentContainer is default implementation of IContainer. + * Manages a collection of child components. * * @property-read IComponent[] $components */ @@ -30,7 +30,7 @@ class Container extends Component implements IContainer /** - * Adds the component to the container. + * Adds a child component to the container. * @return static * @throws Nette\InvalidStateException */ @@ -91,7 +91,7 @@ public function addComponent(IComponent $component, ?string $name, ?string $inse /** - * Removes the component from the container. + * Removes a child component from the container. */ public function removeComponent(IComponent $component): void { @@ -106,7 +106,7 @@ public function removeComponent(IComponent $component): void /** - * Returns component specified by name or path. + * Retrieves a child component by name or creates it if it doesn't exist. * @param bool $throw throw exception if component doesn't exist? * @return ($throw is true ? IComponent : ?IComponent) */ @@ -153,7 +153,7 @@ final public function getComponent(string $name, bool $throw = true): ?IComponen /** - * Component factory. Delegates the creation of components to a createComponent method. + * Creates a new component. Delegates creation to createComponent method if it exists. */ protected function createComponent(string $name): ?IComponent { @@ -178,7 +178,7 @@ protected function createComponent(string $name): ?IComponent /** - * Returns immediate child components. + * Returns all immediate child components. * @return array */ final public function getComponents(): iterable @@ -217,7 +217,8 @@ final public function getComponentTree(): array /** - * Descendant can override this method to disallow insert a child by throwing an Nette\InvalidStateException. + * Validates a child component before it's added to the container. + * Descendant classes can override this to implement custom validation logic. * @throws Nette\InvalidStateException */ protected function validateChildComponent(IComponent $child): void @@ -229,7 +230,7 @@ protected function validateChildComponent(IComponent $child): void /** - * Object cloning. + * Handles object cloning. Clones all child components and re-sets their parents. */ public function __clone() { diff --git a/site/vendor/nette/component-model/src/ComponentModel/IComponent.php b/site/vendor/nette/component-model/src/ComponentModel/IComponent.php index eb21c97b6..4573a5054 100644 --- a/site/vendor/nette/component-model/src/ComponentModel/IComponent.php +++ b/site/vendor/nette/component-model/src/ComponentModel/IComponent.php @@ -11,7 +11,7 @@ /** - * Provides functionality required by all components. + * Defines core functionality required by all components. */ interface IComponent { @@ -29,7 +29,7 @@ function getName(): ?string; function getParent(): ?IContainer; /** - * Sets the parent of this component. + * Sets the parent container and optionally renames the component. */ function setParent(?IContainer $parent, ?string $name = null): static; } diff --git a/site/vendor/nette/component-model/src/ComponentModel/IContainer.php b/site/vendor/nette/component-model/src/ComponentModel/IContainer.php index 12cfb8440..18956ac20 100644 --- a/site/vendor/nette/component-model/src/ComponentModel/IContainer.php +++ b/site/vendor/nette/component-model/src/ComponentModel/IContainer.php @@ -13,7 +13,7 @@ /** - * Containers are objects that logically contain zero or more IComponent components. + * Defines functionality for objects that can contain other components. */ interface IContainer extends IComponent { diff --git a/site/vendor/nette/di/composer.json b/site/vendor/nette/di/composer.json index 28498797b..f8342787f 100644 --- a/site/vendor/nette/di/composer.json +++ b/site/vendor/nette/di/composer.json @@ -15,11 +15,11 @@ } ], "require": { - "php": "8.1 - 8.3", + "php": "8.1 - 8.4", "ext-tokenizer": "*", "ext-ctype": "*", "nette/neon": "^3.3 || ^4.0", - "nette/php-generator": "^4.1.3", + "nette/php-generator": "^4.1.6", "nette/robot-loader": "^4.0", "nette/schema": "^1.2.5", "nette/utils": "^4.0" diff --git a/site/vendor/nette/di/readme.md b/site/vendor/nette/di/readme.md index 24d81e254..25acf6454 100644 --- a/site/vendor/nette/di/readme.md +++ b/site/vendor/nette/di/readme.md @@ -1,5 +1,4 @@ -Nette Dependency Injection (DI) -=============================== +[![Nette Dependency Injection](https://github.com/nette/di/assets/194960/d368a458-bac1-48b1-9b4b-7929f4bb2f98)](https://doc.nette.org/dependency-injection) [![Downloads this Month](https://img.shields.io/packagist/dm/nette/di.svg)](https://packagist.org/packages/nette/di) [![Tests](https://github.com/nette/di/workflows/Tests/badge.svg?branch=master)](https://github.com/nette/di/actions) @@ -7,6 +6,7 @@ Nette Dependency Injection (DI) [![Latest Stable Version](https://poser.pugx.org/nette/di/v/stable)](https://github.com/nette/di/releases) [![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://github.com/nette/di/blob/master/license.md) +  Introduction ------------ @@ -17,6 +17,7 @@ Nette DI is one of the most interesting part of framework. It is compiled DI con Documentation can be found on the [website](https://doc.nette.org/dependency-injection). +  [Support Me](https://github.com/sponsors/dg) -------------------------------------------- @@ -27,6 +28,7 @@ Do you like Nette DI? Are you looking forward to the new features? Thank you! +  Installation ------------ @@ -37,8 +39,9 @@ The recommended way to install is via Composer: composer require nette/di ``` -It requires PHP version 8.1 and supports PHP up to 8.3. +It requires PHP version 8.1 and supports PHP up to 8.4. +  Usage ----- @@ -177,6 +180,8 @@ $manager->distribute(...); Significant to Dependency Injection is that no class depends on the container. Thus it can be easily replaced with another one. For example with the container generated by Nette DI. +  + Nette DI ---------- @@ -218,6 +223,7 @@ During development it is useful to activate auto-refresh mode which automaticall $loader = new Nette\DI\ContainerLoader(__DIR__ . '/temp', autoRebuild: true); ``` +  Services -------- @@ -291,6 +297,7 @@ class FooClass However, this method is not ideal, because the variable must be declared as public and there is no way how you can ensure that the passed object will be of the given type. We also lose the ability to handle the assigned dependency in our code and we violate the principles of encapsulation. +  Factories --------- diff --git a/site/vendor/nette/di/src/DI/ContainerLoader.php b/site/vendor/nette/di/src/DI/ContainerLoader.php index e6241a75b..8162013d7 100644 --- a/site/vendor/nette/di/src/DI/ContainerLoader.php +++ b/site/vendor/nette/di/src/DI/ContainerLoader.php @@ -40,7 +40,7 @@ public function load(callable $generator, mixed $key = null): string public function getClassName(mixed $key): string { - return 'Container_' . substr(md5(serialize($key)), 0, 10); + return 'Container_' . substr(hash('xxh128', serialize($key)), 0, 10); } diff --git a/site/vendor/nette/di/src/DI/DependencyChecker.php b/site/vendor/nette/di/src/DI/DependencyChecker.php index b9bcb305b..94eb9fdc8 100644 --- a/site/vendor/nette/di/src/DI/DependencyChecker.php +++ b/site/vendor/nette/di/src/DI/DependencyChecker.php @@ -166,7 +166,7 @@ class_uses($name), ]; } - return md5(serialize($hash)); + return hash('xxh128', serialize($hash)); } @@ -179,7 +179,7 @@ private static function hashParameters(\ReflectionFunctionAbstract $method): arr (string) $param->getType(), $param->isVariadic(), $param->isDefaultValueAvailable() - ? is_object($tmp = $param->getDefaultValue()) ? ['object' => $tmp::class] : ['value' => $tmp] + ? is_object($tmp = Reflection::getParameterDefaultValue($param)) ? ['object' => $tmp::class] : ['value' => $tmp] : null, ]; } diff --git a/site/vendor/nette/di/src/DI/Extensions/ParametersExtension.php b/site/vendor/nette/di/src/DI/Extensions/ParametersExtension.php index 3de4d1c46..144554d5f 100644 --- a/site/vendor/nette/di/src/DI/Extensions/ParametersExtension.php +++ b/site/vendor/nette/di/src/DI/Extensions/ParametersExtension.php @@ -61,7 +61,8 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void }); } - $class->inheritMethod('getStaticParameters') + $manipulator = new Nette\PhpGenerator\ClassManipulator($class); + $manipulator->inheritMethod('getStaticParameters') ->addBody('return ?;', [array_diff_key($builder->parameters, $dynamicParams)]); if (!$dynamicParams) { @@ -70,7 +71,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void $resolver = new Nette\DI\Resolver($builder); $generator = new Nette\DI\PhpGenerator($builder); - $method = $class->inheritMethod('getDynamicParameter'); + $method = $manipulator->inheritMethod('getDynamicParameter'); $method->addBody('return match($key) {'); foreach ($dynamicParams as $key => $foo) { $value = Helpers::expand($this->config[$key] ?? null, $builder->parameters); @@ -84,7 +85,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void $method->addBody("\tdefault => parent::getDynamicParameter(\$key),\n};"); if ($preload = array_keys($dynamicParams, true, true)) { - $method = $class->inheritMethod('getParameters'); + $method = $manipulator->inheritMethod('getParameters'); $method->addBody('array_map($this->getParameter(...), ?);', [$preload]); $method->addBody('return parent::getParameters();'); } diff --git a/site/vendor/nette/di/src/DI/PhpGenerator.php b/site/vendor/nette/di/src/DI/PhpGenerator.php index da0abf59a..bbb4b574c 100644 --- a/site/vendor/nette/di/src/DI/PhpGenerator.php +++ b/site/vendor/nette/di/src/DI/PhpGenerator.php @@ -38,11 +38,12 @@ public function generate(string $className): Php\ClassType $this->className = $className; $class = new Php\ClassType($this->className); $class->setExtends(Container::class); - $class->inheritMethod('__construct') + $manipulator = new Php\ClassManipulator($class); + $manipulator->inheritMethod('__construct') ->addBody('parent::__construct($params);'); foreach ($this->builder->exportMeta() as $key => $value) { - $class->inheritProperty($key) + $manipulator->inheritProperty($key) ->setComment(null) ->setValue($value); } @@ -57,7 +58,7 @@ public function generate(string $className): Php\ClassType $class->getMethod(Container::getMethodName(ContainerBuilder::ThisContainer)) ->setBody('return $this;'); - $class->inheritMethod('initialize'); + $manipulator->inheritMethod('initialize'); return $class; } diff --git a/site/vendor/nette/mail/composer.json b/site/vendor/nette/mail/composer.json index 9894a2b4a..121e7951e 100644 --- a/site/vendor/nette/mail/composer.json +++ b/site/vendor/nette/mail/composer.json @@ -1,6 +1,6 @@ { "name": "nette/mail", - "description": "📧 Nette Mail: handy email creation and transfer library for PHP with both text and MIME-compliant support.", + "description": "📧 Nette Mail: A handy library for creating and sending emails in PHP.", "keywords": ["nette", "mail", "mailer", "smtp", "mime"], "homepage": "https://nette.org", "license": ["BSD-3-Clause", "GPL-2.0-only", "GPL-3.0-only"], @@ -15,7 +15,7 @@ } ], "require": { - "php": "8.0 - 8.3", + "php": "8.0 - 8.4", "ext-iconv": "*", "nette/utils": "^4.0" }, diff --git a/site/vendor/nette/mail/readme.md b/site/vendor/nette/mail/readme.md index 045c35e4d..1cb9e0006 100644 --- a/site/vendor/nette/mail/readme.md +++ b/site/vendor/nette/mail/readme.md @@ -1,5 +1,4 @@ -Nette Mail: Sending E-mails -=========================== +[![Nette Mail](https://github.com/nette/mail/assets/194960/8b2371bd-0976-443c-b60a-460eb8b3222f)](https://doc.nette.org/en/mail) [![Downloads this Month](https://img.shields.io/packagist/dm/nette/mail.svg)](https://packagist.org/packages/nette/mail) [![Tests](https://github.com/nette/mail/workflows/Tests/badge.svg?branch=master)](https://github.com/nette/mail/actions) @@ -7,13 +6,17 @@ Nette Mail: Sending E-mails [![Latest Stable Version](https://poser.pugx.org/nette/mail/v/stable)](https://github.com/nette/mail/releases) [![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://github.com/nette/mail/blob/master/license.md) +  + Introduction ------------ Are you going to send emails such as newsletters or order confirmations? Nette Framework provides the necessary tools with a very nice API. -Documentation can be found on the [website](https://doc.nette.org/mailing). +Documentation can be found on the [website](https://doc.nette.org/en/mail). + +  [Support Me](https://github.com/sponsors/dg) @@ -25,6 +28,8 @@ Do you like Nette Mail? Are you looking forward to the new features? Thank you! +  + Installation ------------ @@ -33,7 +38,9 @@ Installation composer require nette/mail ``` -It requires PHP version 8.0 and supports PHP up to 8.3. +It requires PHP version 8.0 and supports PHP up to 8.4. + +  Creating Emails @@ -74,7 +81,7 @@ Images can also be extremely easily inserted into the HTML body of an email. Jus // automatically adds /path/to/images/background.gif to the email $mail->setHtmlBody( 'Hello ', - '/path/to/images' + '/path/to/images', ); ``` @@ -118,14 +125,14 @@ $mail = new Nette\Mail\Message; $mail->setFrom('John ') ->addTo('jack@example.com') ->setHtmlBody( - $latte->renderToString('email.latte', $params), - '/path/to/images' + $latte->renderToString('/path/to/email.latte', $params), + '/path/to/images', ); ``` File `email.latte`: -```html +```latte @@ -146,6 +153,7 @@ File `email.latte`: Nette automatically inserts all images, sets the subject according to the `` element, and generates text alternative for HTML body. + <!----> Sending Emails @@ -174,22 +182,22 @@ SmtpMailer To send mail via the SMTP server, use `SmtpMailer`. ```php -$mailer = new Nette\Mail\SmtpMailer([ - 'host' => 'smtp.gmail.com', - 'username' => 'franta@gmail.com', - 'password' => '*****', - 'secure' => 'ssl', -]); +$mailer = new Nette\Mail\SmtpMailer( + host: 'smtp.gmail.com', + username: 'franta@gmail.com', + password: '*****', + encryption: Nette\Mail\SmtpMailer::EncryptionSSL, +); $mailer->send($mail); ``` -If you do not specify `host`, the value from php.ini will be used. The following additional keys can be used in the options: +The following additional parameters can be passed to the constructor: * `port` - if not set, the default 25 or 465 for `ssl` will be used -* `context` - allows you to set [SSL context options](https://www.php.net/manual/en/context.ssl.php) for connection * `timeout` - timeout for SMTP connection * `persistent` - use persistent connection * `clientHost` - client designation +* `streamOptions` - allows you to set [SSL context options](https://www.php.net/manual/en/context.ssl.php) for connection FallbackMailer @@ -201,13 +209,15 @@ It does not send email but sends them through a set of mailers. If one mailer fa $mailer = new Nette\Mail\FallbackMailer([ $smtpMailer, $backupSmtpMailer, - $sendmailMailer + $sendmailMailer, ]); $mailer->send($mail); ``` -Other parameters in the constructor include the number of repeat and waiting time in miliseconds. +Other parameters in the constructor include the number of repeat and waiting time in milliseconds. + + <!----> DKIM ==== @@ -216,14 +226,14 @@ DKIM (DomainKeys Identified Mail) is a trustworthy email technology that also he The recipient's server compares this signature with the public key stored in the domain's DNS records. By matching the signature, it is shown that the email actually originated from the sender's domain and that the message was not modified during the transmission of the message. ```php -$options = [ - 'domain' => 'nette.org', - 'selector' => 'dkim', - 'privateKey' => file_get_contents('../dkim/dkim.key'), - 'passPhrase' => '****', -]; +$signer = new Nette\Mail\DkimSigner( + domain: 'nette.org', + selector: 'dkim', + privateKey: file_get_contents('../dkim/dkim.key'), + passPhrase: '****', +); $mailer = new Nette\Mail\SendmailMailer; // or SmtpMailer -$mailer->setSigner(new Nette\Mail\DkimSigner($options)); +$mailer->setSigner($signer); $mailer->send($mail); ``` diff --git a/site/vendor/nette/mail/src/Bridges/MailDI/MailExtension.php b/site/vendor/nette/mail/src/Bridges/MailDI/MailExtension.php index fdef305a4..a209ef6d2 100644 --- a/site/vendor/nette/mail/src/Bridges/MailDI/MailExtension.php +++ b/site/vendor/nette/mail/src/Bridges/MailDI/MailExtension.php @@ -45,7 +45,7 @@ public function getConfigSchema(): Nette\Schema\Schema } - public function loadConfiguration() + public function loadConfiguration(): void { $builder = $this->getContainerBuilder(); diff --git a/site/vendor/nette/mail/src/Mail/FallbackMailer.php b/site/vendor/nette/mail/src/Mail/FallbackMailer.php index 69e87f55a..23abb38e8 100644 --- a/site/vendor/nette/mail/src/Mail/FallbackMailer.php +++ b/site/vendor/nette/mail/src/Mail/FallbackMailer.php @@ -14,7 +14,7 @@ class FallbackMailer implements Mailer { - /** @var callable[] function (FallbackMailer $sender, SendException $e, Mailer $mailer, Message $mail): void */ + /** @var array<callable(self, SendException, Mailer, Message): void> */ public array $onFailure = []; /** @var Mailer[] */ diff --git a/site/vendor/nette/mail/src/Mail/SendmailMailer.php b/site/vendor/nette/mail/src/Mail/SendmailMailer.php index 534e572cf..8bbe6c649 100644 --- a/site/vendor/nette/mail/src/Mail/SendmailMailer.php +++ b/site/vendor/nette/mail/src/Mail/SendmailMailer.php @@ -19,6 +19,7 @@ class SendmailMailer implements Mailer { public string $commandArgs = ''; private ?Signer $signer = null; + private bool $envelopeSender = true; public function setSigner(Signer $signer): static @@ -28,6 +29,16 @@ public function setSigner(Signer $signer): static } + /** + * Sets whether to use the envelope sender (-f option) in the mail command. + */ + public function setEnvelopeSender(bool $state = true): static + { + $this->envelopeSender = $state; + return $this; + } + + /** * Sends email. * @throws SendException @@ -48,7 +59,7 @@ public function send(Message $mail): void $parts = explode(Message::EOL . Message::EOL, $data, 2); $cmd = $this->commandArgs; - if ($from = $mail->getFrom()) { + if ($this->envelopeSender && ($from = $mail->getFrom())) { $cmd .= ' -f' . key($from); } diff --git a/site/vendor/nette/neon/composer.json b/site/vendor/nette/neon/composer.json index df8ad211b..d2971d29e 100644 --- a/site/vendor/nette/neon/composer.json +++ b/site/vendor/nette/neon/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "8.0 - 8.3", + "php": "8.0 - 8.4", "ext-json": "*" }, "require-dev": { diff --git a/site/vendor/nette/neon/readme.md b/site/vendor/nette/neon/readme.md index ab46729ae..491b70dc6 100644 --- a/site/vendor/nette/neon/readme.md +++ b/site/vendor/nette/neon/readme.md @@ -39,7 +39,7 @@ Install via Composer: composer require nette/neon ``` -It requires PHP version 8.0 up to 8.3. Documentation can be found on the [website](https://doc.nette.org/neon). +It requires PHP version 8.0 up to 8.4. Documentation can be found on the [website](https://doc.nette.org/neon). `Neon::encode()` returns `$value` converted to NEON. As the second parameter `$blockMode` you can pass true, which will create multiline output. The third parameter `$indentation` specifies the characters used for indentation (default is tab). diff --git a/site/vendor/nette/neon/src/Neon/Node/StringNode.php b/site/vendor/nette/neon/src/Neon/Node/StringNode.php index 1d4730899..f92191218 100644 --- a/site/vendor/nette/neon/src/Neon/Node/StringNode.php +++ b/site/vendor/nette/neon/src/Neon/Node/StringNode.php @@ -70,14 +70,16 @@ function (array $m): string { public function toString(): string { if (!str_contains($this->value, "\n")) { - return "'" . str_replace("'", "''", $this->value) . "'"; + return preg_match('~[\x00-\x08\x0B-\x1F]~', $this->value) + ? json_encode($this->value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) + : "'" . str_replace("'", "''", $this->value) . "'"; - } elseif (preg_match('~\n[\t ]+\'{3}~', $this->value)) { - $s = json_encode($this->value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); + } elseif (preg_match('~[\x00-\x08\x0B-\x1F]|\n[\t ]+\'{3}~', $this->value)) { + $s = substr(json_encode($this->value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), 1, -1); $s = preg_replace_callback( '#[^\\\\]|\\\\(.)#s', fn($m) => ['n' => "\n", 't' => "\t", '"' => '"'][$m[1] ?? ''] ?? $m[0], - substr($s, 1, -1), + $s, ); $s = str_replace('"""', '""\"', $s); $delim = '"""'; diff --git a/site/vendor/nette/neon/src/Neon/Parser.php b/site/vendor/nette/neon/src/Neon/Parser.php index f53eca10f..a2a4a1c36 100644 --- a/site/vendor/nette/neon/src/Neon/Parser.php +++ b/site/vendor/nette/neon/src/Neon/Parser.php @@ -240,7 +240,7 @@ private function checkArrayKey(Node $key, array &$arr): void } - private function injectPos(Node $node, int $start = null, int $end = null): Node + private function injectPos(Node $node, ?int $start = null, ?int $end = null): Node { $node->startTokenPos = $start ?? $this->tokens->getPos(); $node->startLine = $this->posToLine[$node->startTokenPos]; diff --git a/site/vendor/nette/schema/composer.json b/site/vendor/nette/schema/composer.json index 626e98f92..56b845278 100644 --- a/site/vendor/nette/schema/composer.json +++ b/site/vendor/nette/schema/composer.json @@ -15,11 +15,11 @@ } ], "require": { - "php": "8.1 - 8.3", + "php": "8.1 - 8.4", "nette/utils": "^4.0" }, "require-dev": { - "nette/tester": "^2.4", + "nette/tester": "^2.5.2", "tracy/tracy": "^2.8", "phpstan/phpstan-nette": "^1.0" }, diff --git a/site/vendor/nette/schema/readme.md b/site/vendor/nette/schema/readme.md index c88f6bd20..5ee1382ba 100644 --- a/site/vendor/nette/schema/readme.md +++ b/site/vendor/nette/schema/readme.md @@ -21,7 +21,7 @@ Installation: composer require nette/schema ``` -It requires PHP version 8.1 and supports PHP up to 8.3. +It requires PHP version 8.1 and supports PHP up to 8.4. [Support Me](https://github.com/sponsors/dg) diff --git a/site/vendor/nette/schema/src/Schema/Elements/Structure.php b/site/vendor/nette/schema/src/Schema/Elements/Structure.php index 56f5ffe89..54b2cc5bb 100644 --- a/site/vendor/nette/schema/src/Schema/Elements/Structure.php +++ b/site/vendor/nette/schema/src/Schema/Elements/Structure.php @@ -12,6 +12,7 @@ use Nette; use Nette\Schema\Context; use Nette\Schema\Helpers; +use Nette\Schema\MergeMode; use Nette\Schema\Schema; @@ -28,15 +29,16 @@ final class Structure implements Schema /** @var array{?int, ?int} */ private array $range = [null, null]; private bool $skipDefaults = false; + private MergeMode $mergeMode = MergeMode::AppendKeys; /** - * @param Schema[] $items + * @param Schema[] $shape */ - public function __construct(array $items) + public function __construct(array $shape) { - (function (Schema ...$items) {})(...array_values($items)); - $this->items = $items; + (function (Schema ...$items) {})(...array_values($shape)); + $this->items = $shape; $this->castTo('object'); $this->required = true; } @@ -76,6 +78,26 @@ public function skipDefaults(bool $state = true): self } + public function mergeMode(MergeMode $mode): self + { + $this->mergeMode = $mode; + return $this; + } + + + public function extend(array|self $shape): self + { + $shape = $shape instanceof self ? $shape->items : $shape; + return new self(array_merge($this->items, $shape)); + } + + + public function getShape(): array + { + return $this->items; + } + + /********************* processing ****************d*g**/ @@ -111,31 +133,28 @@ public function normalize(mixed $value, Context $context): mixed public function merge(mixed $value, mixed $base): mixed { - if (is_array($value) && isset($value[Helpers::PreventMerging])) { + if ($this->mergeMode === MergeMode::Replace || (is_array($value) && isset($value[Helpers::PreventMerging]))) { unset($value[Helpers::PreventMerging]); $base = null; } if (is_array($value) && is_array($base)) { - $index = 0; + $index = $this->mergeMode === MergeMode::OverwriteKeys ? null : 0; foreach ($value as $key => $val) { if ($key === $index) { $base[] = $val; $index++; - } elseif (array_key_exists($key, $base)) { - $itemSchema = $this->items[$key] ?? $this->otherItems; - $base[$key] = $itemSchema - ? $itemSchema->merge($val, $base[$key]) - : Helpers::merge($val, $base[$key]); } else { - $base[$key] = $val; + $base[$key] = array_key_exists($key, $base) && ($itemSchema = $this->items[$key] ?? $this->otherItems) + ? $itemSchema->merge($val, $base[$key]) + : $val; } } return $base; } - return Helpers::merge($value, $base); + return $value ?? $base; } diff --git a/site/vendor/nette/schema/src/Schema/Elements/Type.php b/site/vendor/nette/schema/src/Schema/Elements/Type.php index 4094442ec..b87eb94c4 100644 --- a/site/vendor/nette/schema/src/Schema/Elements/Type.php +++ b/site/vendor/nette/schema/src/Schema/Elements/Type.php @@ -12,6 +12,7 @@ use Nette\Schema\Context; use Nette\Schema\DynamicParameter; use Nette\Schema\Helpers; +use Nette\Schema\MergeMode; use Nette\Schema\Schema; @@ -27,6 +28,7 @@ final class Type implements Schema private array $range = [null, null]; private ?string $pattern = null; private bool $merge = true; + private ?MergeMode $mergeMode = null; public function __construct(string $type) @@ -51,6 +53,13 @@ public function mergeDefaults(bool $state = true): self } + public function mergeMode(MergeMode $mode): self + { + $this->mergeMode = $mode; + return $this; + } + + public function dynamic(): self { $this->type = DynamicParameter::class . '|' . $this->type; @@ -75,7 +84,7 @@ public function max(?float $max): self /** * @internal use arrayOf() or listOf() */ - public function items(string|Schema $valueType = 'mixed', string|Schema $keyType = null): self + public function items(string|Schema $valueType = 'mixed', string|Schema|null $keyType = null): self { $this->itemsValue = $valueType instanceof Schema ? $valueType @@ -130,19 +139,19 @@ public function normalize(mixed $value, Context $context): mixed public function merge(mixed $value, mixed $base): mixed { - if (is_array($value) && isset($value[Helpers::PreventMerging])) { + if ($this->mergeMode === MergeMode::Replace || (is_array($value) && isset($value[Helpers::PreventMerging]))) { unset($value[Helpers::PreventMerging]); return $value; } - if (is_array($value) && is_array($base) && $this->itemsValue) { - $index = 0; + if (is_array($value) && is_array($base) && ($this->itemsValue || $this->mergeMode)) { + $index = $this->mergeMode === MergeMode::OverwriteKeys ? null : 0; foreach ($value as $key => $val) { if ($key === $index) { $base[] = $val; $index++; } else { - $base[$key] = array_key_exists($key, $base) + $base[$key] = array_key_exists($key, $base) && $this->itemsValue ? $this->itemsValue->merge($val, $base[$key]) : $val; } diff --git a/site/vendor/nette/schema/src/Schema/Expect.php b/site/vendor/nette/schema/src/Schema/Expect.php index 38f1c81f6..e56ae8237 100644 --- a/site/vendor/nette/schema/src/Schema/Expect.php +++ b/site/vendor/nette/schema/src/Schema/Expect.php @@ -56,11 +56,11 @@ public static function anyOf(mixed ...$set): AnyOf /** - * @param Schema[] $items + * @param Schema[] $shape */ - public static function structure(array $items): Structure + public static function structure(array $shape): Structure { - return new Structure($items); + return new Structure($shape); } @@ -95,7 +95,7 @@ public static function from(object $object, array $items = []): Structure } - public static function arrayOf(string|Schema $valueType, string|Schema $keyType = null): Type + public static function arrayOf(string|Schema $valueType, string|Schema|null $keyType = null): Type { return (new Type('array'))->items($valueType, $keyType); } @@ -105,4 +105,16 @@ public static function listOf(string|Schema $type): Type { return (new Type('list'))->items($type); } + + + /** + * @param Schema[] $shape + */ + public static function tuple(array $shape): Structure + { + if (!array_is_list($shape)) { + throw new Nette\InvalidArgumentException('Tuple shape must be indexed array.'); + } + return (new Structure($shape))->castTo('array')->mergeMode(MergeMode::Replace); + } } diff --git a/site/vendor/nette/schema/src/Schema/MergeMode.php b/site/vendor/nette/schema/src/Schema/MergeMode.php new file mode 100644 index 000000000..633fb6fbe --- /dev/null +++ b/site/vendor/nette/schema/src/Schema/MergeMode.php @@ -0,0 +1,23 @@ +<?php + +/** + * This file is part of the Nette Framework (https://nette.org) + * Copyright (c) 2004 David Grudl (https://davidgrudl.com) + */ + +declare(strict_types=1); + +namespace Nette\Schema; + + +enum MergeMode: int +{ + /** Replaces all items with the last one. */ + case Replace = 0; + + /** Overwrites existing keys. */ + case OverwriteKeys = 1; + + /** Overwrites existing keys and appends new indexed elements. */ + case AppendKeys = 2; +} diff --git a/site/vendor/texy/texy/composer.json b/site/vendor/texy/texy/composer.json index 37272dbde..570a4400f 100644 --- a/site/vendor/texy/texy/composer.json +++ b/site/vendor/texy/texy/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { "nette/tester": "^2.5", @@ -28,6 +28,7 @@ "autoload": { "classmap": ["src/"] }, + "minimum-stability": "dev", "scripts": { "phpstan": "phpstan analyse", "tester": "tester tests -s" diff --git a/site/vendor/texy/texy/src/Texy/HandlerInvocation.php b/site/vendor/texy/texy/src/Texy/HandlerInvocation.php index ce2ff1af2..84f326a86 100644 --- a/site/vendor/texy/texy/src/Texy/HandlerInvocation.php +++ b/site/vendor/texy/texy/src/Texy/HandlerInvocation.php @@ -46,10 +46,7 @@ public function proceed(...$args) $this->pos--; $res = $this->handlers[$this->pos](...$this->args); - if ($res === false) { - trigger_error('Return type of Texy handlers was changed from FALSE to NULL. (' . get_class($this->handlers[$this->pos][0]) . ')', E_USER_DEPRECATED); - return; - } elseif ($res !== null && !is_string($res) && !$res instanceof HtmlElement) { + if ($res !== null && !is_string($res) && !$res instanceof HtmlElement) { throw new \UnexpectedValueException("Invalid value returned from handler '" . get_class($this->handlers[$this->pos][0]) . "'."); } diff --git a/site/vendor/texy/texy/src/Texy/Modules/HtmlOutputModule.php b/site/vendor/texy/texy/src/Texy/Modules/HtmlOutputModule.php index 738d1e8b2..5c16a01a4 100644 --- a/site/vendor/texy/texy/src/Texy/Modules/HtmlOutputModule.php +++ b/site/vendor/texy/texy/src/Texy/Modules/HtmlOutputModule.php @@ -31,9 +31,6 @@ final class HtmlOutputModule extends Texy\Module /** wrap width, doesn't include indent space */ public int $lineWrap = 80; - /** @deprecated */ - public bool $removeOptional = false; - /** indent space counter */ private int $space = 0; diff --git a/site/vendor/texy/texy/src/Texy/Texy.php b/site/vendor/texy/texy/src/Texy/Texy.php index 9eb0f1374..3ff7db806 100644 --- a/site/vendor/texy/texy/src/Texy/Texy.php +++ b/site/vendor/texy/texy/src/Texy/Texy.php @@ -21,7 +21,7 @@ class Texy { // Texy version - public const VERSION = '3.2.2'; + public const VERSION = '3.2.3'; // configuration directives public const @@ -163,17 +163,7 @@ class Texy public function __construct() { - if ( - extension_loaded('mbstring') - && mb_get_info('func_overload') & 2 - && str_starts_with(mb_get_info('internal_encoding'), 'U') - ) { - mb_internal_encoding('pass'); - trigger_error("Texy: mb_internal_encoding changed to 'pass'", E_USER_WARNING); - } - $this->loadModules(); - $this->initDTD(); // examples of link references ;-) @@ -204,21 +194,6 @@ private function initDTD(): void } - /** @deprecated */ - public function setOutputMode(int $mode): void - { - trigger_error('Texy::setOutputMode() is deprecated, only HTML5 mode is supported.', E_USER_DEPRECATED); - } - - - /** @deprecated */ - public function getOutputMode(): int - { - trigger_error('Texy::getOutputMode() is deprecated, only HTML5 mode is supported.', E_USER_DEPRECATED); - return self::HTML5; - } - - /** * Create array of all used modules ($this->modules). * This array can be changed by overriding this method (by subclasses) @@ -596,78 +571,6 @@ final public function __clone() { throw new \Exception('Clone is not supported.'); } - - - /** @deprecated */ - final public static function freezeSpaces(string $s): string - { - trigger_error(__METHOD__ . '() is deprecated, use Texy\Helpers::freezeSpaces()', E_USER_DEPRECATED); - return Helpers::freezeSpaces($s); - } - - - /** @deprecated */ - final public static function unfreezeSpaces(string $s): string - { - trigger_error(__METHOD__ . '() is deprecated, use Texy\Helpers::unfreezeSpaces()', E_USER_DEPRECATED); - return Helpers::unfreezeSpaces($s); - } - - - /** @deprecated */ - final public static function normalize(string $s): string - { - trigger_error(__METHOD__ . '() is deprecated, use Texy\Helpers::normalize()', E_USER_DEPRECATED); - return Helpers::normalize($s); - } - - - /** @deprecated */ - final public static function webalize(string $s, string $charlist = ''): string - { - trigger_error(__METHOD__ . '() is deprecated, use Texy\Helpers::webalize()', E_USER_DEPRECATED); - return Helpers::webalize($s, $charlist); - } - - - /** @deprecated */ - final public static function escapeHtml(string $s): string - { - trigger_error(__METHOD__ . '() is deprecated, use htmlspecialchars()', E_USER_DEPRECATED); - return htmlspecialchars($s, ENT_NOQUOTES, 'UTF-8'); - } - - - /** @deprecated */ - final public static function unescapeHtml(string $s): string - { - trigger_error(__METHOD__ . '() is deprecated, use Texy\Helpers::unescapeHtml()', E_USER_DEPRECATED); - return Helpers::unescapeHtml($s); - } - - - /** @deprecated */ - final public static function outdent(string $s): string - { - trigger_error(__METHOD__ . '() is deprecated, use Texy\Helpers::outdent()', E_USER_DEPRECATED); - return Helpers::outdent($s); - } - - - /** @deprecated */ - final public static function isRelative(string $URL): bool - { - trigger_error(__METHOD__ . '() is deprecated, use Texy\Helpers::isRelative()', E_USER_DEPRECATED); - return Helpers::isRelative($URL); - } - - - /** @deprecated */ - final public static function prependRoot(string $URL, ?string $root): string - { - trigger_error(__METHOD__ . '() is deprecated, use Texy\Helpers::prependRoot()', E_USER_DEPRECATED); - return Helpers::prependRoot($URL, $root); - } }