- 04 Jan, 2021 1 commit
-
-
With Bootstrap 5, <select> fields make use of the class `form-select`. This patch aims to replace every occurrence of `form-control` used with select fields. Since Bootstrap finally brings proper styling for select boxes, the custom implementation rendering chevrons can be removed. In the same run, the `input-$size` classes are migrated to its new class names and some obsolete classes have been removed. Resolves: #93135 Releases: master Change-Id: I0044127cc380bddfbaec0b9f730123959f7288bd Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/67247 Tested-by:
TYPO3com <noreply@typo3.com> Tested-by:
Martin Kutschker <mkutschker-typo3@yahoo.com> Tested-by:
Benjamin Franzke <bfr@qbus.de> Reviewed-by:
Martin Kutschker <mkutschker-typo3@yahoo.com> Reviewed-by:
Benjamin Franzke <bfr@qbus.de>
-
- 04 Sep, 2020 1 commit
-
-
ext:scheduler This patch fixes incompatible type usage in function arguments and is preparatory work for introducing native type hints and strict mode in all core files. Releases: master, 10.4 Resolves: #92159 Change-Id: I8e6a06a81cc12ff4c1bbdb69611d1d1bfd48d109 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/65538 Tested-by:
TYPO3com <noreply@typo3.com> Tested-by:
Jörg Bösche <typo3@joergboesche.de> Tested-by:
Benni Mack <benni@typo3.org> Reviewed-by:
Jörg Bösche <typo3@joergboesche.de> Reviewed-by:
Benni Mack <benni@typo3.org>
-
- 15 Apr, 2020 1 commit
-
-
With this patch, the header comment of php files is automatically added by the php-cs-fixer, which guarantees that its format and place of occurrence remain the same in all files. Files that are copied over from other projects are excluded. Furthermore, files that are kind of inspired by other projects also get the same header comment but may have a second, additional comment explaining its origin. Used command: bin/php-cs-fixer fix --config=Build/php-cs-fixer/header-comment.php Releases: master Resolves: #91024 Change-Id: I5a040517e0fbde6e5a27d589bf2f222078326dc8 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64159 Tested-by:
TYPO3com <noreply@typo3.com> Tested-by:
Andreas Fernandez <a.fernandez@scripting-base.de> Tested-by:
Benni Mack <benni@typo3.org> Reviewed-by:
Andreas Fernandez <a.fernandez@scripting-base.de> Reviewed-by:
Benni Mack <benni@typo3.org>
-
- 19 Mar, 2020 1 commit
-
-
Releases: master Resolves: #90766 Change-Id: I59823ed9b573344a96823d3308b253edcc765a65 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/63682 Tested-by:
Georg Ringer <georg.ringer@gmail.com> Tested-by:
TYPO3com <noreply@typo3.com> Tested-by:
Benni Mack <benni@typo3.org> Reviewed-by:
Georg Ringer <georg.ringer@gmail.com> Reviewed-by:
Oliver Klee <typo3-coding@oliverklee.de> Reviewed-by:
Benni Mack <benni@typo3.org>
-
- 15 Mar, 2019 1 commit
-
-
Replace string concatenations like 'abc' . 'def' with 'abcdef'. Resolves: #87004 Releases: master Change-Id: I9c1a610e88dd4bd4e617214989a915b1dafda094 Reviewed-on: https://review.typo3.org/c/60155 Reviewed-by:
Markus Klein <markus.klein@typo3.org> Reviewed-by:
Guido Schmechel <guido.schmechel@brandung.de> Reviewed-by:
Daniel Goerz <daniel.goerz@posteo.de> Tested-by:
TYPO3com <noreply@typo3.com> Tested-by:
Markus Klein <markus.klein@typo3.org> Tested-by:
Daniel Goerz <daniel.goerz@posteo.de>
-
- 01 Oct, 2018 1 commit
-
-
All specific controllers for specific Backend actions, Backend-module related modules, all hook implementations (where the core uses hooks by itself), and module-specific ViewHelpers are now marked as @internal to ensure developers what is part of the public TYPO3 Core API. within - EXT:indexed_search - EXT:info - EXT:linkvalidator - EXT:lowlevel - EXT:opendocs - EXT:recordlist - EXT:recycler - EXT:redirects - EXT:reports - EXT:scheduler All @api annotations have been removed. Resolves: #86511 Releases: master Change-Id: I80de460142266305c1af3ad437f939b7e4448676 Reviewed-on: https://review.typo3.org/58530 Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
TYPO3com <no-reply@typo3.com> Reviewed-by:
Oliver Hader <oliver.hader@typo3.org> Tested-by:
Oliver Hader <oliver.hader@typo3.org>
-
- 09 Jul, 2018 1 commit
-
-
* replace usages of _GP, getIndpEnv * add return hints Resolves: #84387 Releases: master Change-Id: I156f9005c132ab91abfbd72b97084ede6708d0dc Reviewed-on: https://review.typo3.org/56264 Tested-by:
TYPO3com <no-reply@typo3.com> Reviewed-by:
Anja Leichsenring <aleichsenring@ab-softlab.de> Tested-by:
Anja Leichsenring <aleichsenring@ab-softlab.de> Reviewed-by:
Robert van Kammen <rvkammen@hotmail.com> Tested-by:
Robert van Kammen <rvkammen@hotmail.com> Reviewed-by:
Mathias Brodala <mbrodala@pagemachine.de> Tested-by:
Mathias Brodala <mbrodala@pagemachine.de>
-
- 23 Jun, 2018 1 commit
-
-
Georg Ringer authored
Avoid persisting the IP address of a login action twice and just use the one of the IP field. Additionally the anoymize scheduler task can now remove all unwanted IP addresses from the logs. Be aware that the anonymization of the sys_log entries only works for new entries that were generated after this patch. Older entries have to be deleted or the details field needs to be cleared manually. Resolves: #85316 Releases: master, 8.7, 7.6 Change-Id: I9c5c65d52462a82047324390bc3e6b970a8f8840 Reviewed-on: https://review.typo3.org/57313 Reviewed-by:
Andreas Wolf <andreas.wolf@typo3.org> Tested-by:
Andreas Wolf <andreas.wolf@typo3.org> Tested-by:
TYPO3com <no-reply@typo3.com> Reviewed-by:
Stefan Neufeind <typo3.neufeind@speedpartner.de> Tested-by:
Stefan Neufeind <typo3.neufeind@speedpartner.de>
-
- 09 Jun, 2018 1 commit
-
-
The new IpAnonymizationAdditionalFieldProvider introduced the same JavaScript variable which breaks the garbage collection task. The JavaScript initialization has been removed and the field provider simplified. Resolves: #85068 Releases: master, 8.7, 7.6 Change-Id: Ibb307ee37d6fea33a721373bdc50bbbd3fee1453 Reviewed-on: https://review.typo3.org/57136 Tested-by:
TYPO3com <no-reply@typo3.com> Reviewed-by:
Anja Leichsenring <aleichsenring@ab-softlab.de> Tested-by:
Anja Leichsenring <aleichsenring@ab-softlab.de> Reviewed-by:
Christian Kuhn <lolli@schwarzbu.ch> Tested-by:
Christian Kuhn <lolli@schwarzbu.ch>
-
- 04 May, 2018 1 commit
-
-
IP anonymizing improves the privacy of users and required as part of the GDPR. Resolves: #84781 Releases: master, 8.7, 7.6 Change-Id: Idd938136bed8f29e86b5e3e541c9fb8c9afd48ff Reviewed-on: https://review.typo3.org/56732 Reviewed-by:
Mathias Schreiber <mathias.schreiber@typo3.com> Tested-by:
Mathias Schreiber <mathias.schreiber@typo3.com> Tested-by:
TYPO3com <no-reply@typo3.com> Reviewed-by:
Andreas Wolf <andreas.wolf@typo3.org> Tested-by:
Andreas Wolf <andreas.wolf@typo3.org>
-
- 27 Nov, 2017 1 commit
-
-
This patch applies the phpdoc_types rule of the php-cs-fixer. See http://cs.sensiolabs.org/ -> phpdoc_types Releases: master, 8.7 Resolves: #83106 Change-Id: I958b75d85a08169a987afe9eed0baa4d86139770 Reviewed-on: https://review.typo3.org/54770 Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
TYPO3com <no-reply@typo3.com> Reviewed-by:
Georg Ringer <georg.ringer@gmail.com> Tested-by:
Georg Ringer <georg.ringer@gmail.com>
-
- 28 Mar, 2017 1 commit
-
-
The TYPO3 Core currently has no guidline how to handle phpdoc comments regarding @return annoations related to "void" and "null". In practice, these annotations have no additional value if no additional documentation is given. With this change, the php-cs-fixer will remove any unnecessary linebreaks within the comments above the @return annotation, as well as remove completely empty phpdoc comments because the @return annotation is removed. Please be aware, that once PSR-5 is accepted, this coding standard within the TYPO3 Core will change again, where there are currently some further proposal details like inheritance information. Resolves: #80454 Releases: master Change-Id: Ie969d720684c0a75919fe5addd1c36ef5b12eb04 Reviewed-on: https://review.typo3.org/51686 Reviewed-by:
Nicole Cordes <typo3@cordes.co> Tested-by:
Nicole Cordes <typo3@cordes.co> Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
- 30 Aug, 2016 1 commit
-
-
As decided during T3ACME we will use the short array syntax in master. The 7.6 branch will also be done to make backporting easier. Resolves: #77692 Releases: master,7.6 Change-Id: I37e9484b1012fc9161148257a842054c24d162ba Reviewed-on: https://review.typo3.org/49651 Reviewed-by:
Georg Ringer <georg.ringer@gmail.com> Tested-by:
Georg Ringer <georg.ringer@gmail.com> Reviewed-by:
Susanne Moog <susanne.moog@typo3.org> Tested-by:
Susanne Moog <susanne.moog@typo3.org>
-
- 08 Oct, 2015 1 commit
-
-
TYPO3 Release Team authored
In our efforts to achieve a better interoperability with other PHP projects, the PHP code base of the TYPO3 Core switches to the PHP coding guideline standard PSR-2. See http://www.php-fig.org/psr/psr-2/ for more information. Resolves: #70515 Releases: master Change-Id: I734c0d838af157003decfeb5fc0a11dddcb87bf5 Reviewed-on: http://review.typo3.org/43918 Reviewed-by:
TYPO3 Release Team <typo3cms@typo3.org> Tested-by:
TYPO3 Release Team <typo3cms@typo3.org>
-
- 18 Jul, 2015 1 commit
-
-
In english you have to use "an" before any spoken vowel. Resolves: #68326 Releases: master Change-Id: I2f8996d14eb532bd297b7035a6daaee4fea3f140 Reviewed-on: http://review.typo3.org/41651 Reviewed-by:
Helmut Hummel <helmut.hummel@typo3.org> Tested-by:
Helmut Hummel <helmut.hummel@typo3.org> Reviewed-by:
Nicole Cordes <typo3@cordes.co> Tested-by:
Nicole Cordes <typo3@cordes.co>
-
- 15 Jul, 2015 1 commit
-
-
@author information can be found in version control. Cluttering our code with these tags does not make much sense and they are outdated by definition or would sum up to impressive lists. As decided on acme 2015, we drop them now. Releases: master Resolves: #68152 Change-Id: Iec1ea0f873b44ab6027c94ba8353a9fdb5477bdd Reviewed-on: http://review.typo3.org/41264 Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Wouter Wolters <typo3@wouterwolters.nl> Reviewed-by:
Christian Kuhn <lolli@schwarzbu.ch> Tested-by:
Christian Kuhn <lolli@schwarzbu.ch>
-
- 07 Jul, 2015 1 commit
-
-
Replace occurences of count() with matching empty() pendants. Affected extensions: - scheduler - sv - version - workspaces Resolves: #67955 Releases: master Change-Id: I1fd152ed9b581e0f2645837776fd7fab1ccbf73e Reviewed-on: http://review.typo3.org/40959 Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Reviewed-by:
Stephan Großberndt <stephan@grossberndt.de> Reviewed-by:
Christian Kuhn <lolli@schwarzbu.ch> Tested-by:
Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by:
Anja Leichsenring <aleichsenring@ab-softlab.de> Tested-by:
Anja Leichsenring <aleichsenring@ab-softlab.de>
-
- 04 Mar, 2015 1 commit
-
-
Streamline the layout of the scheduler. Resolves: #65233 Releases: master Change-Id: I2f91f187e21359d2228e81efb198b9bf9134d400 Reviewed-on: http://review.typo3.org/37110 Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Wouter Wolters <typo3@wouterwolters.nl> Reviewed-by:
Christian Kuhn <lolli@schwarzbu.ch> Tested-by:
Christian Kuhn <lolli@schwarzbu.ch>
-
- 18 Jan, 2015 1 commit
-
-
* use "resource" or MySQL result instead of "pointer" * use the specific class instead of "object" * drop the @param of some removed parameters * fix a few typos in comments * add the missing parameter name in some @param This changeset does not add any type hinting in order to not break any existing code. Resolves: #38270 Releases: master Change-Id: Ied64439162d45fccafd15694f56ce675b5001a71 Reviewed-on: http://review.typo3.org/35885 Reviewed-by:
Philipp Gampe <philipp.gampe@typo3.org> Reviewed-by:
Christian Kuhn <lolli@schwarzbu.ch> Tested-by:
Christian Kuhn <lolli@schwarzbu.ch>
-
- 13 Dec, 2014 1 commit
-
-
This regular expression was used to replace PHPDoc style comments with ordinary comments: Search: /\*\*(\n \* This file is part of the TYPO3 CMS project.) Replace with: /*$1 Resolves: #63328 Releases: master Change-Id: Ic8f11dbfefee94a19657c8fe8426c81d1cb435d8 Reviewed-on: http://review.typo3.org/35103 Reviewed-by:
Christian Kuhn <lolli@schwarzbu.ch> Tested-by:
Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by:
Benjamin Mack <benni@typo3.org> Tested-by:
Benjamin Mack <benni@typo3.org>
-
- 05 Dec, 2014 1 commit
-
-
Stefan Neufeind authored
(part for extensions starting with "s") Use name-resolution with ...::class instead of strings where possible. (needs PHP 5.5, which is meanwhile required for master) Change-set Iedbb896607adddce2b23ab67f990fa2296c0d1bb first introduced usage of ::class in master. We now add it in various more places. Change-Id: I54a34f04bf9027051500f574d9760c80fafe05a9 Resolves: #63477 Releases: master Reviewed-on: http://review.typo3.org/34868 Reviewed-by:
Alexander Opitz <opitz.alexander@googlemail.com> Tested-by:
Alexander Opitz <opitz.alexander@googlemail.com> Reviewed-by:
Frank Nägler <typo3@naegler.net> Tested-by:
Frank Nägler <typo3@naegler.net>
-
- 28 Oct, 2014 1 commit
-
-
Wouter Wolters authored
* Use bool in @return * Use int in @return * Use bool in @param * Use int in @param * Remove extra tabs and spaces in @param Resolves: #62506 Releases: master Change-Id: I673888aa08855a1364150d0060d0f205fc1f83a2 Reviewed-on: http://review.typo3.org/33577 Reviewed-by:
Stefan Froemken <froemken@gmail.com> Tested-by:
Stefan Froemken <froemken@gmail.com> Reviewed-by:
Frank Nägler <typo3@naegler.net> Tested-by:
Frank Nägler <typo3@naegler.net>
-
- 08 Sep, 2014 1 commit
-
-
Wouter Wolters authored
* Move images to Resources/Public/Images/ * Move language files to Resources/Private/Language/ * Migrate ExtJs to jQuery * Move module template to Resources/Private/Template/ * Add strict comparison were possible Resolves: #60630 Releases: 6.3 Change-Id: I7bae64263268562b158dccf9b9c8fa6d6726fe52 Reviewed-on: http://review.typo3.org/31875 Reviewed-by:
Christian Kuhn <lolli@schwarzbu.ch> Tested-by:
Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by:
Markus Klein <klein.t3@reelworx.at> Tested-by:
Markus Klein <klein.t3@reelworx.at>
-
- 22 Jun, 2014 1 commit
-
-
Michael Schams authored
This patch replaces the copyright/license header in PHP files with a new, simplified one. The new header does not show the year figure, nor an author name, and refers to the LICENSE.txt file for the full copyright information. License is: GPL2 or any later version. This is a multi-part commit due to the huge number of changed files. See issue #59785 for further details. Resolves: #59785 Releases: 6.3, 6.2 Change-Id: If6a4795e7f2841474241d236d8ed33baceee0d2e Reviewed-on: https://review.typo3.org/31030 Reviewed-by: Markus Klein Tested-by: Markus Klein
-
- 01 Feb, 2014 1 commit
-
-
Jo Hasenau authored
This patch replaces most of around 1600 occurrences of intval() and every (integer) in the whole core. Additionally it changes GeneralUtility::intExplode to use references and typecasting as well. Some occurrences of strstr() together with intval() have been replaced with strpos() as well. And some superfluous intval calls have been removed or reduced to a single one i.e. for protected variables or before loops. Patch updated after Core CGL decision from 30.01.2014 Resolves: #54265 Releases: 6.2 Change-Id: Iba57ffad1f4233ffa1a9f7d3ca5bfe9d2b53f1e8 Reviewed-on: https://review.typo3.org/26740 Reviewed-by: Stefan Neufeind Tested-by: Stefan Neufeind
-
- 01 Oct, 2013 1 commit
-
-
Change-Id: Iaa92566c53301e49396fc9fb26b0b339c48d567b Resolves: #52360 Releases: 6.2 Reviewed-on: https://review.typo3.org/24212 Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn Reviewed-by: Ernesto Baschny Tested-by: Ernesto Baschny Reviewed-by: Anja Leichsenring Tested-by: Anja Leichsenring
-
- 10 Jul, 2013 1 commit
-
-
Move all old language includes (php,xml) in the core to .xlf Change-Id: I804b5970a360cbfdc2940736632c55c535ccbd40 Resolves: #49832 Releases: 6.2 Reviewed-on: https://review.typo3.org/22167 Reviewed-by: Markus Klein Reviewed-by: Georg Ringer Tested-by: Georg Ringer
-
- 02 Jul, 2013 1 commit
-
-
Felix Kopp authored
On many installation the module menu is very crowded. In order to distribute backend modules on module menu groups equally a new module menu group is added: Adds "System" as module menu group. The new group "System" hosts low-level status tools and does not bring a navigation tree: * user management * install * scheduler * log * lowlevel * reports This restructuring is a step on our way to backend modules that themselves steer the nav frame. Change-Id: I70c345848d404337d00c51d678e03d619a0190b8 Resolves: #48625 Related: #5128 Releases: 6.2 Reviewed-on: https://review.typo3.org/21177 Reviewed-by: Georg Ringer Tested-by: Georg Ringer Reviewed-by: Anja Leichsenring Tested-by: Anja Leichsenring Reviewed-by: Ernesto Baschny Tested-by: Ernesto Baschny
-
- 19 Mar, 2013 1 commit
-
-
In this patch are also some fixes for files containing a interface. Due the namespace change all interfaces have the curly bracket not on the same line as the interface name. Change-Id: I64ba45de73693452d681ce7f018965968b11d2af Resolves: #46370 Releases: 6.1 Reviewed-on: https://review.typo3.org/18984 Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn
-
- 16 Nov, 2012 1 commit
-
-
Christian Kuhn authored
With namespaces the @package and @subpackage annotations do not have a real benefit anymore and can be removed. Change-Id: Id8f4718db0c1c51ae5143a3353dd5efb42dadf70 Resolves: #43019 Releases: 6.0 Reviewed-on: http://review.typo3.org/16474 Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn
-
- 08 Nov, 2012 1 commit
-
-
Helmut Hummel authored
All abstract classes should be start with an Abstract prefix in the class name. Adjust the abstract task class to this naming convention. Resolves: #42803 Releases: 6.0 Change-Id: Ibef1d71f1d3a6aa3683331464b33118b88b1ec01 Reviewed-on: http://review.typo3.org/16329 Reviewed-by: Steffen Ritter Reviewed-by: Helmut Hummel Tested-by: Helmut Hummel
-
- 27 Sep, 2012 1 commit
-
-
Thomas Maroschik authored
Currently the scheduler depends at many parts on its classname field in the tx_scheduler_task table. This is not necessary as the classname is already stored in the serialized task object. By releasing scheduler tasks from their classname field backwards compatibility is maintained by the class_alias mechanism. Change-Id: I26f228add1f3db9f99ec3f5691488bd453ae2339 Fixes: #40215 Related: #40095 Releases: 6.0 Reviewed-on: http://review.typo3.org/14236 Reviewed-by: Philipp Gampe Tested-by: Philipp Gampe Reviewed-by: Jigal van Hemert Tested-by: Jigal van Hemert
-
- 17 Sep, 2012 1 commit
-
-
Arvid Jakobsson authored
Removes superfluous parenthesis in sysexts "saltedpasswords", "scheduler", "setup" and "statictemplates". Change ("a" . "b") . "c" into "a" . "b" . "c" using the lex-pass tool. Change-Id: Ie1e7d052f5d8dfac95d01a70ed750e69cf4bb7f6 Resolves: #40970 Related: #40095 Reviewed-on: http://review.typo3.org/14629 Reviewed-by: Thomas Loeffler Reviewed-by: Wouter Wolters Tested-by: Wouter Wolters Reviewed-by: Jigal van Hemert Tested-by: Jigal van Hemert
-
- 23 Aug, 2012 1 commit
-
-
Change-Id: Id49218118087244bcd063b730631ee69b2820670 Resolves: #40096 Related: #40095 Releases: 6.0 Reviewed-on: http://review.typo3.org/14015 Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn
-
- 03 May, 2012 1 commit
-
-
Christian Kuhn authored
Remove all XCLASS definitions in typo3/ and all system extension that are not handled as git submodules. Change-Id: Ib9e1d8db31f91f5f1453deb694f2441ef41130f2 Resolves: #36821 Related: #31893 Releases: 6.0 Reviewed-on: http://review.typo3.org/10981 Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn
-
- 24 Jun, 2011 1 commit
-
-
Francois Suter authored
Clean up code in the Scheduler system extension: phpDoc, CGLs compliancy, spelling mistakes, type hinting. Change-Id: I59cb7450fd31f714590b81df33e2986397be2545 Resolves: #27687 Releases: 4.6 Reviewed-on: http://review.typo3.org/2917 Reviewed-by: Francois Suter Tested-by: Francois Suter
-
- 23 Jun, 2011 1 commit
-
-
collection scheduler task This patch reactivates the number of days field even if it is empty if a default number is provided by the selected table. Change-Id: I58afb4f9c9430802477fd93d8b387497e1dd698b Resolves: #27632 Reviewed-on: http://review.typo3.org/2868 Reviewed-by: Philipp Gampe Tested-by: Philipp Gampe Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn
-
- 19 Jun, 2011 1 commit
-
-
Christian Kuhn authored
This feature was implemented during T3BOARD11 bug auction. It is kindly sponsored with 100 beers by jweiland.net and is called the 'Schnaps Hans scheduler task' Change-Id: Id7c58d28e4f6e82a708513a3ce9761baf36c06cd Resolves: #25343 Releases: 4.6 Reviewed-on: http://review.typo3.org/1376 Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn
-