- Jun 28, 2024
-
-
Garvin Hicking authored
Currently only `siteLanguage` was documented as usable, now also `site` is explained with the most common public getter methods and an example. Resolves: #99723 Releases: main, 12.4 Change-Id: I8cb6de70b481322c31bd6fa7b3319c74f8af517a Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84896 Tested-by:
core-ci <typo3@b13.com> Tested-by:
Stefan Bürk <stefan@buerk.tech> Reviewed-by:
Georg Ringer <georg.ringer@gmail.com> Tested-by:
-
- Jun 27, 2024
-
-
Garvin Hicking authored
The migration wizard BackendGroupsExplicitAllowDeny ('Migrate backend groups "explicit_allowdeny" field to simplified format') returns Symfony formatted error messages for specific single rows. Before this patch, it was still reported as a successful migration, and the success message is formatted with "everything is great" green background, so that errors may not receive attention. This patch changes the wizard to return a failure state. This will then return the messages formatted as errors. Since the wizard migrates all rows (even the faulty ones), the wizard can then be re-executed to be marked as "done". This is not ideal, but because of the way Symfony output streams cannot reveal if they contain an error when the stream is retrieved, there is little other choice. Otherwise the Wizard API would need to receive a breaking API change to allow to carry additional meta information about "warnings" rather than just errors, which is beyond scope for current development state. Resolves: #104208 Related: #104225 Releases: main, 12.4 Change-Id: Ibde1d977bc8747a053da1360aea6c0e3f8b77f7f Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84933 Tested-by:Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by:
-
Georg Ringer authored
Resolves: #104216 Releases: main, 12.4 Change-Id: Ifbd5499fe8c50661cec4ec198b479978bd839084 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84938 Tested-by:
Riccardo De Contardi <erredeco@gmail.com> Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Oliver Klee <typo3-coding@oliverklee.de> Tested-by:
-
Jasmina Ließmann authored
The "Owner" information in "Recycler" backend module is broken and never shows a valid value. This patch ensures that the correct owner information such as user name and UID is now displayed. Resolves: #104228 Releases: main, 12.4 Change-Id: Ib1ddd570e1bfe2fe86e114e946cb57413a766692 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84937 Reviewed-by:
Garvin Hicking <gh@faktor-e.de> Reviewed-by:
Jasmina Ließmann <minapokhalo+typo3@gmail.com> Tested-by:
-
Garvin Hicking authored
The CKEditor YAML files support a lot of configuration options to adjust the Link Browser appearance, adding additional CSS class selection, link-target selection, title attribute and others. The Link Browser configuration is mostly revealed through TCA configuration, but the YAML format was not documented yet. The documentation is updated to reflect all configuration options, and an example YAML file `EXT:rte_ckeditor/Configuration/RTE/Editor/LinkBrowser.yaml` has been added. Resolves: #104157 Resolves: #101711 Releases: main, 12.4 Change-Id: Iffed9f87a35038c01d43947e6e57a0c363cf7c1a Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84921 Tested-by:
Torben Hansen <derhansen@gmail.com> Tested-by:
Lina Wolf <112@linawolf.de> Tested-by:
-
Torben Hansen authored
This change cleans up and streamlines Extbase type converters by: * using typed properties * adding proper return types for the `convertFrom` method * marking all `convertFrom` methods `@internal` * make `$configuration` attribute in `convertFrom` method explicitly nullable * removing unnecessary qualifiers * removing superfluous comparisons Additionally, more tests have been added for the `ArrayConverter` and `FloatConverter`. Resolves: #104226 Releases: main Change-Id: Ie56a7275969963f47f8ab538300718a3a63dced7 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84936 Tested-by:
-
Benni Mack authored
12.0 allowed the option to show "scheduled records", that is: Records that are timed with starttime / endtime. However, the backend should always show records (based on the Context) with starttime / endtime ignored, but that was simply forgotten in the original patch. Resolves: #104235 Related: #91082 Releases: main, 12.4 Change-Id: I2fbc2023efbcd1039cfa0ee37b7f1c32ed743b94 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84947 Tested-by:
-
Simon Praetorius authored
The XSD schema generator, added with Fluid Standalone 2.12, is applied to TYPO3's Fluid integration. This provides autocompletion for supporting IDEs (like PhpStorm) by executing the CLI command added with this patch. Resolves: #104114 Releases: main Change-Id: Id9f996820483e5af21506cdde2221b2be65a38d8 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84720 Tested-by:
-
Benni Mack authored
This feature introduces a schema for *reading* information out of TCA, especially when working with data from the database that is TYPO3-specific only to be based on "types" (e.g. tt_content) or a specific "subtype" (e.g. the value from tt_content.CType, such as "tt_content.textmedia"), or detecting information from the global TCA definition. The basic structure works as follows: TcaSchemaFactory serves as the basic entry point for fetching the schema for e.g. tt_content.textmedia which then resolves all information from TCA based on the "tca" schema. A Schema can be the main TCA table information (with everything) or the "subSchema". A Schema contains a list of "Capabilities" (typically within "ctrl" section), possible sub schemata, and all fields registered in "showitem" (for a subtype). The Fields are divided by the "type=..." information in TCA. Non-recognized type fields are skipped for the time being. Only TcaSchemaFactory knows about the actual full TCA information and builds objects out of it. Schemas and Fields are put in collections so they can never be modified after the Boostrap process is completed. Before the schema objects are built, the RelationMap is built, which contains information which fields contain information that records "might" have a connection to another database field or table. These are then attached to the Schema and Field objects as Active and Passive Relations. Building the Schema API as graph thus in turn needs to run two times over all TCA information and all registered FlexForm data structure definitions (as flexforms might also contain relations to tables). Relations are built as loose DTO relation informations and not as pointers to Schema objects. Missing parts to be evaluated later-on: - Can this be used for Site Configuration definitions as well? - "Subsubtype" resolving (tt_content.list and list_type) - childTca resolving (if this is possible) - having a colon ":" in type field (maybe related to childTca) - Add tests for Flex once it is clear how it is needed in DataHandler Resolves: #104002 Releases: main Change-Id: I75cf20d491364f60be7f284615eea65086085801 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75486 Tested-by:
Oliver Hader <oliver.hader@typo3.org> Tested-by:
Oliver Bartsch <bo@cedev.de> Reviewed-by:
-
Benni Mack authored
Since HTML Sanitizer was introduced, lib.parseFunc does "transformations", instead of ensuring that HTML is "safe", which wasn't possible anyways (that was one of the reasons why htmlSanitize is introduced). A quick explanation to the existing functionality of allowTags and denyTags: * If parseFunc stumbles across a tag, which is NOT a typotag (tags.a for example), and NOT an external block, it will be checked if it is in "allowTags" or NOT in "denyTags", then it gets rendered, otherwise the tag including its contents is htmlspecialchar'ed. The tags are thus NOT removed, but instead hsced. In order to simplify the process, allowTags and denyTags can now be omitted, with the following result: If allowTags = a,b,em... ONLY these tags are allowed, and denyTags does not matter anymore already. allowTags can now be set to "*", thus denyTags can be used to mark explicitly use "denyTags". It now makes little sense to define allowTags AND denyTags at the same time. Resolves: #104220 Releases: main Change-Id: I817109a896e8ebde8cccdf502bf24b38c05a4502 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84824 Tested-by:
-
Oliver Bartsch authored
This makes passing the PSR-7 Request to the PolicyMutatedEvent optional, since there are use cases where the available request is not relevant for CSP / the Event. Those usages are adjusted accordingly. Resolves: #104141 Releases: main, 12.4 Change-Id: Id4597e26850f42a444a16fe986e2136b6a543075 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84930 Reviewed-by:
-
- Jun 26, 2024
-
-
Georg Ringer authored
Apply the latest rules of cs-fixer also on the Build directory Resolves: #104227 Releases: main, 12.4 Change-Id: Ief38397cb0870e358caa43ca505f04fbb89a86c0 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84935 Tested-by:
-
Simon Praetorius authored
This patch updates Fluid to the latest version. It also adds a RST file which describes the new ViewHelper capabilities that were added with 2.12. Executed command: composer req typo3fluid/fluid:^2.12.0 Resolves: #103560 Releases: main Change-Id: I24edbc6552e05779dfbea0157b0184799bff6f6b Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84931 Tested-by:
Simon Praetorius <simon@praetorius.me> Reviewed-by:
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator or adding a null tyype to an union type definition. [1] This prepares the way towards PHP 8.4 compatibility. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104210 Releases: main, 12.4, 11.5 Change-Id: Id20216f2b920b5f5c0d665a370536c447590f53c Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84915 Reviewed-by:
-
Benni Mack authored
Resolves: #104219 Releases: main Change-Id: I18609bb963eae8dd1aa918d74ea40293ea2c5e3a Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84928 Reviewed-by:
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator or adding a null tyype to an union type definition. [1] This prepares the way towards PHP 8.4 compatibility. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104209 Releases: main Change-Id: Iea94673b0d04d80f7b71f1cc9e936ccdbd7784e9 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84914 Tested-by:
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator or adding a null tyype to an union type definition. [1] This prepares the way towards PHP 8.4 compatibility. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104211 Releases: main, 12.4, 11.5 Change-Id: Ic086fc77872c54f763d774f4118517658d8d52e3 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84918 Tested-by:
-
Stefan Bürk authored
Since recently upgraded PHP-version the 10mb big xml unit test failes. The `\LIBXML_PARSEHUGE` xml option could be used to mitigate this case but would not explain the change from PHP yet. Thus the decision has been made to disable the failing data set as a temporary solution to avoid disturbance for core contribution until this issue has been investigated and reported to PHP itself. Resolves: #104218 Releases: main, 12.4, 11.5 Change-Id: Ifef4f18818e661312b9e56e013bb8f479146b806 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84926 Tested-by:
Markus Hofmann <typo3@calien.de> Reviewed-by:
-
Oliver Bartsch authored
For additional context does the PolicyMutatedEvent now provide the current PSR-7 Request. Resolves: #104141 Releases: main, 12.4 Change-Id: I1817366e77f20f6c43eef0ee209fbb419e7237e2 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84913 Tested-by:
-
Christian Kuhn authored
typo3/testing-framework v8 has been branched, dev-main modernizes the codebase and removes some deprecated details. > composer u typo3/testing-framework Resolves: #104213 Releases: main Change-Id: Iaf5770905c8c9cad1d3d15dbc3c6ad1559334f3e Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84882 Tested-by:
-
- Jun 25, 2024
-
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator. [1] This prepares the way towards PHP 8.4 compatibility. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104206 Releases: main, 12.4, 11.5 Change-Id: I0d82e0474143f63870f772002de52d26c6c960fd Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84906 Reviewed-by:
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator. [1] This prepares the way towards PHP 8.4 compatibility. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104205 Releases: main, 12.4, 11.5 Change-Id: Iaca12350ce8b28943fd5ce8181d42b91feb471e3 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84903 Reviewed-by:
-
Andreas Kienast authored
All FormEngine field types shipped in TYPO3 core use a CSS class `hasDefaultValue` that was never defined or referenced since its introduction in TYPO3 4.7 with #33235. This commit removes the remaining traces of said CSS class. Resolves: #104207 Related: #33235 Releases: main, 12.4 Change-Id: I10d70fb61f79a0c0974a6d101efb3b4cb5463060 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84911 Tested-by:
Andreas Nedbal <andy@pixelde.su> Tested-by:
Andreas Kienast <a.fernandez@scripting-base.de> Reviewed-by:
-
Christian Reifenscheid authored
The AbstractModule class is located within the 'ModuleApi' folder, so the namespace must be \TYPO3\CMS\Adminpanel\ModuleApi\AbstractModule. This patch fixes the issue. Releases: main, 12.4 Resolves: #104204 Change-Id: I28dc1777fe8900665e8a3d43a8655674dbb82185 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84901 Reviewed-by:
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator. [1] In case of union type the null is added as additional type. This prepares the way towards PHP 8.4 compatibility. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104203 Releases: main, 12.4, 11.5 Change-Id: I1e264d242e53e4d258abe82831e612ee43234d0d Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84898 Reviewed-by:
-
Tim Weisenberger authored
This patch adds missing translation string for the validation error which is returned when a string is not recognized as date in a specific format. Resolves: #94192 Releases: main Change-Id: Ia205d323b6ce65279823c8a7ea6880a068ee98b1 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/81933 Tested-by:
-
Stefan Bürk authored
This change modifies the `Build/Scripts/runTests.sh` dispatcher script to add new database version. Added versions: * MySQL 8.4 * MariaDB 11.2 * MariaDB 11.3 * MariaDB 11.4 Note that for TYPO3 v12 and v11 also missing versions up to these are added now. This is not a official supported version statement. [1] https://endoflife.date/mariadb [2] https://endoflife.date/mysql [3] https://endoflife.date/postgresql Resolves: #104200 Releases: main, 12.4, 11.5 Change-Id: I338a7f0973a46fb8bc6a582a5c478c4715a8000e Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84893 Tested-by:
Anja Leichsenring <aleichsenring@ab-softlab.de> Tested-by:
-
Stefan Bürk authored
This change modifies the `Build/Script/runTests.sh` command dispatcher to allow passing composer options to the `composer install` subcommand, for example Build/Scripts/runTests.sh -s composerInstall \ -- --prefer-source Note that this is already possible using the generic `-s composer` dispatcher but would resolve some user confusion. This is useful to install dependencies as git checkouts, for example when working on packages like `typo3/testing-framework` changes. Albeit the need to remove the vendor folder first is needed in case of the example. Resolves: #104186 Releases: main, 12.4, 11.5 Change-Id: Id07c90f3b6902ad8866249563eceeb2dafbc919b Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84870 Tested-by: -
Oliver Bartsch authored
The ext:form EmailFinisher allows to retreive recipients via different ways. Next to the default yaml configuration is it also possible to set recipients via flexform or via TypoScript. In such cases there might be additional whitespaces added, which would lead to the function not returning the recipients address since GU:validEmail() would fail. Since recipients are mandatory, this leads to an exception in the finisher. To prevent such "false positives", the address is now trimmed before being checked. Resolves: #104198 Releases: main, 12.4 Change-Id: Ia66cc73d477507aee6c954995d6afd6a771e6354 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84889 Reviewed-by:
-
Stefan Bürk authored
This change adds a `@` silence operator to the usage of `preg_match()` in the `RedirectService`. This prevents errors in case of manually-entered malformed regexp patterns and follows existing similar usages of the service. Additionally, a todo comment is added to evaluate future early pattern evaluation in record creation/editing so that a proper response to invalid patterns can be emitted. Resolves: #102176 Releases: main, 12.4, 11.5 Change-Id: I88687c128986ae6fa1e2b7a3a4bf414ee8f952f0 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84872 Reviewed-by:
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator. [1] This prepares the way towards PHP 8.4 compatibility. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104196 Releases: main, 12.4, 11.5 Change-Id: Iec724407eed8edefed48c2e032b2105b42cabc94 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84883 Tested-by:
Fabien Udriot <fudriot@omic.ch> Tested-by:
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator. [1] This prepares the way towards PHP 8.4 compatibility. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104197 Releases: main, 12.4, 11.5 Change-Id: Ie2fbd6369e6c59c275939c42daa8c45c22334e48 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84886 Tested-by:
-
- Jun 24, 2024
-
-
Marcin Sągol authored
The `typo3-backend-icon` component code contains a duplicated code fragment. This patch removes one occurrence. Resolves: #104199 Releases: main, 12.4 Change-Id: I0530f89f646c5c2fda8a170f3792a28a2c04243d Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84890 Tested-by:
-
Oliver Bartsch authored
Since #104172, the `columnsOnly` configuration has to be provided in a new format, using the table name as key and an array of fields as parameter value. To prevent deprecation log entries are the recordlist and filelist JS components adjusted to use the new format. Resolves: #104172 Related: #104108 Releases: main Change-Id: I87a03179bac3eeba40f6a1c1d6e9ad5d88f055b4 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84816 Reviewed-by:
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator. [1] This prepares the way towards PHP 8.4 compatibility and unifies towards using `?` nullable operator over union null type when possible. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104185 Releases: main, 12.4, 11.5 Change-Id: I12462595d622efa1bbe2a479f159d68a984bda23 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84867 Reviewed-by:
-
Andreas Kienast authored
Resolves: #104161 Resolves: #104193 Related: #103767 Releases: main Change-Id: I8223ae8aef6bb7b035d184e454bf2f781374788b Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84881 Tested-by:
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator. [1] This prepares the way towards PHP 8.4 compatibility. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104187 Releases: main, 12.4 Change-Id: I80b1494413016658e6c5ed88485cce887178fdbf Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84873 Reviewed-by:
-
Stefan Bürk authored
With PHP 8.4 marking method parameter implicitly nullable is deprecated and will emit a `E_DEPRECATED` warning. One recommended way to resolve this, is making it explicitly nullable using the `?` nullable operator. [1] This prepares the way towards PHP 8.4 compatibility. [1] https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated Resolves: #104188 Releases: main, 12.4 Change-Id: I3a3273b9176fce9b0e64a084654acf17c8738da4 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84875 Reviewed-by:
-
Jasmina Ließmann authored
Language keys used in toolbar context are now in their corresponding extensions. The following language keys were unused and have been removed: - toolbarItems.shortcut - toolbarItems.shortcuts - toolbarItems.shortcutsGroup - toolbarItems.shortcutsEdit - toolbarItems.shortcutsDelete - toolbarItems.bookmark - toolbarItems.bookmarksGroup - toolbarItems.collapsePageTree - systemInformation.header Resolves: #104128 Releases: main Change-Id: Ia8aed4da14c625df324c4741bdcaa5e5cd124e9e Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84734 Reviewed-by:
-
Andreas Kienast authored
This commit updates TypeScript to 5.5, along with its related friends. Executed commands: npm install --save-dev \ @typescript-eslint/eslint-plugin@^7.13.1 \ @typescript-eslint/parser@^7.13.1 \ @typescript-eslint/typescript-estree@^7.13.1 \ typescript@^5.5.2 npm run build Resolves: #104189 Releases: main, 12.4 Change-Id: Ic2b66c65485845ae62371228f6f8b62c8a320172 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84877 Reviewed-by:
-
