EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2023-01-19 16:21:06 +01:00
parent 0d86c5af36 8318626063
commit 18cc1b9369
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+38 -33
View File
@@ -799,19 +799,20 @@
},
{
"name": "fluidtypo3/vhs",
"version": "6.1.2",
"version": "6.1.3",
"source": {
"type": "git",
"url": "https://github.com/FluidTYPO3/vhs.git",
"reference": "007d141c78ef34f8bf2a6b325c89918c51fae592"
"reference": "05bec6cab8e8fba2d29fbed9ee1ab99ab12cd1fe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FluidTYPO3/vhs/zipball/007d141c78ef34f8bf2a6b325c89918c51fae592",
"reference": "007d141c78ef34f8bf2a6b325c89918c51fae592",
"url": "https://api.github.com/repos/FluidTYPO3/vhs/zipball/05bec6cab8e8fba2d29fbed9ee1ab99ab12cd1fe",
"reference": "05bec6cab8e8fba2d29fbed9ee1ab99ab12cd1fe",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": "^7.4.0 || ^8",
"typo3/cms-backend": "^8.7 || ^9 || ^10 || ^11 || dev-master",
"typo3/cms-core": "^8.7 || ^9 || ^10 || ^11 || dev-master",
@@ -823,17 +824,21 @@
"typo3-ter/vhs": "self.version"
},
"require-dev": {
"fluidtypo3/development": "^4.0"
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.5",
"phpstan/phpstan": "^1.8",
"phpunit/phpunit": "^5.7 || ^9.5",
"squizlabs/php_codesniffer": "^3.7"
},
"suggest": {
"ext-tidy": "Allows to make use of the tidy ViewHelper"
"ext-json": "Enable use of v:format.json.encode and v:format.json.decode",
"ext-tidy": "Allows to make use of the tidy ViewHelper v:format.tidy",
"ext-zlib": "Enable use of v:format.placeholder.lipsum with default lipsum text"
},
"type": "typo3-cms-extension",
"extra": {
"typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"extension-key": "vhs",
"web-dir": "build/web"
"extension-key": "vhs"
}
},
"autoload": {
@@ -861,7 +866,7 @@
"issues": "https://github.com/FluidTYPO3/vhs/issues",
"source": "https://github.com/FluidTYPO3/vhs"
},
"time": "2022-06-16T12:00:28+00:00"
"time": "2023-01-07T16:09:17+00:00"
},
{
"name": "georgringer/news",
@@ -1364,16 +1369,16 @@
},
{
"name": "helhum/typo3-console",
"version": "v6.7.6",
"version": "v6.7.7",
"source": {
"type": "git",
"url": "https://github.com/TYPO3-Console/TYPO3-Console.git",
"reference": "8469c8604b97ecf6fd8ec3428c2ddb194ef959ed"
"reference": "4b7123a8198978b46bd2370c685d44432242a2b3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/8469c8604b97ecf6fd8ec3428c2ddb194ef959ed",
"reference": "8469c8604b97ecf6fd8ec3428c2ddb194ef959ed",
"url": "https://api.github.com/repos/TYPO3-Console/TYPO3-Console/zipball/4b7123a8198978b46bd2370c685d44432242a2b3",
"reference": "4b7123a8198978b46bd2370c685d44432242a2b3",
"shasum": ""
},
"require": {
@@ -1464,7 +1469,7 @@
"type": "github"
}
],
"time": "2022-12-20T16:36:38+00:00"
"time": "2023-01-08T21:22:53+00:00"
},
{
"name": "kigkonsult/icalcreator",
@@ -1853,16 +1858,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.15.2",
"version": "v4.15.3",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
"reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
"reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
"reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
"shasum": ""
},
"require": {
@@ -1903,9 +1908,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
},
"time": "2022-11-12T15:38:23+00:00"
"time": "2023-01-16T22:05:37+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -8333,16 +8338,16 @@
"packages-dev": [
{
"name": "deployer/deployer",
"version": "v7.0.2",
"version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/deployphp/deployer.git",
"reference": "99a57a9035cfe0eeae5dba5befe5411ac0f3ac72"
"reference": "9c9a8187413e191606efaffa393e96f625f1868e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/deployphp/deployer/zipball/99a57a9035cfe0eeae5dba5befe5411ac0f3ac72",
"reference": "99a57a9035cfe0eeae5dba5befe5411ac0f3ac72",
"url": "https://api.github.com/repos/deployphp/deployer/zipball/9c9a8187413e191606efaffa393e96f625f1868e",
"reference": "9c9a8187413e191606efaffa393e96f625f1868e",
"shasum": ""
},
"bin": [
@@ -8372,7 +8377,7 @@
"type": "github"
}
],
"time": "2022-09-10T07:44:30+00:00"
"time": "2023-01-18T18:00:30+00:00"
},
{
"name": "ichhabrecht/filefill",
@@ -8982,20 +8987,20 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.27",
"version": "9.5.28",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
"reference": "954ca3113a03bf780d22f07bf055d883ee04b65e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
"reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e",
"reference": "954ca3113a03bf780d22f07bf055d883ee04b65e",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.3.1",
"doctrine/instantiator": "^1.3.1 || ^2",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
@@ -9064,7 +9069,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28"
},
"funding": [
{
@@ -9080,7 +9085,7 @@
"type": "tidelift"
}
],
"time": "2022-12-09T07:31:23+00:00"
"time": "2023-01-14T12:32:24+00:00"
},
{
"name": "sebastian/cli-parser",
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Details.html
+3 -7
View File
@@ -16,13 +16,9 @@
</f:if>
{hotel.description -> f:format.html()}
<f:if condition="{showInquiryForm}">
<f:if condition="{hotel.groupsPriceConfigs}">
<f:else>
<f:link.typolink class="button bg-button" parameter="{settings.groupsContactFormPageUid}" additionalParams="&ref={currentPageUid}">
<f:translate key="tx_eptheme.label.to_inquiry_form" extensionName="ep_theme"/>
</f:link.typolink>
</f:else>
</f:if>
<f:link.typolink class="button bg-button" parameter="{settings.groupsContactFormPageUid}" additionalParams="&ref={currentPageUid}">
<f:translate key="tx_eptheme.label.to_inquiry_form" extensionName="ep_theme"/>
</f:link.typolink>
</f:if>
</div>
<f:if condition="{teasers}">