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

Merge branch 'release/2021.07-01'

Browse Source
This commit is contained in:
Björn Fromme
2021-07-15 11:19:49 +02:00
parent b81fb124b2 a9974d6559
commit e1f311932d
5 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+87 -87
View File
@@ -180,24 +180,23 @@
},
{
"name": "doctrine/cache",
"version": "1.11.3",
"version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "3bb5588cec00a0268829cc4a518490df6741af9d"
"reference": "92032beb419568d3b61ae645f48bbb693cc7e00e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d",
"reference": "3bb5588cec00a0268829cc4a518490df6741af9d",
"url": "https://api.github.com/repos/doctrine/cache/zipball/92032beb419568d3b61ae645f48bbb693cc7e00e",
"reference": "92032beb419568d3b61ae645f48bbb693cc7e00e",
"shasum": ""
},
"require": {
"php": "~7.1 || ^8.0"
},
"conflict": {
"doctrine/common": ">2.2,<2.4",
"psr/cache": ">=3"
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
@@ -206,8 +205,9 @@
"mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
"predis/predis": "~1.0",
"psr/cache": "^1.0 || ^2.0",
"symfony/cache": "^4.4 || ^5.2"
"psr/cache": "^1.0 || ^2.0 || ^3.0",
"symfony/cache": "^4.4 || ^5.2 || ^6.0@dev",
"symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
@@ -259,7 +259,7 @@
],
"support": {
"issues": "https://github.com/doctrine/cache/issues",
"source": "https://github.com/doctrine/cache/tree/1.11.3"
"source": "https://github.com/doctrine/cache/tree/1.12.0"
},
"funding": [
{
@@ -275,7 +275,7 @@
"type": "tidelift"
}
],
"time": "2021-05-25T09:01:55+00:00"
"time": "2021-07-14T11:09:49+00:00"
},
{
"name": "doctrine/dbal",
@@ -831,16 +831,16 @@
},
{
"name": "gridelementsteam/gridelements",
"version": "9.6.0",
"version": "9.7.0",
"source": {
"type": "git",
"url": "https://gitlab.com/coderscare/gridelements.git",
"reference": "dc433a1f0e47558399df98ae6eb3c5d5a80351b4"
"reference": "496f3fc57e5a96611f9b54b233f86bbcad8e3582"
},
"dist": {
"type": "zip",
"url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=dc433a1f0e47558399df98ae6eb3c5d5a80351b4",
"reference": "dc433a1f0e47558399df98ae6eb3c5d5a80351b4",
"url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=496f3fc57e5a96611f9b54b233f86bbcad8e3582",
"reference": "496f3fc57e5a96611f9b54b233f86bbcad8e3582",
"shasum": ""
},
"require": {
@@ -878,7 +878,7 @@
"support": {
"issues": "https://forge.typo3.org/projects/extension-gridelements2/issues"
},
"time": "2021-05-05T16:08:06+00:00"
"time": "2021-07-01T20:19:59+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -1296,16 +1296,16 @@
},
{
"name": "kigkonsult/icalcreator",
"version": "v2.39",
"version": "v2.39.2",
"source": {
"type": "git",
"url": "https://github.com/iCalcreator/iCalcreator.git",
"reference": "f6bde4e517ac508db6b78d003de71894fde5e718"
"reference": "722e161d1a25c3ceec1692642d64a7f2cf5faee9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/f6bde4e517ac508db6b78d003de71894fde5e718",
"reference": "f6bde4e517ac508db6b78d003de71894fde5e718",
"url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/722e161d1a25c3ceec1692642d64a7f2cf5faee9",
"reference": "722e161d1a25c3ceec1692642d64a7f2cf5faee9",
"shasum": ""
},
"require": {
@@ -1366,7 +1366,7 @@
],
"support": {
"issues": "https://github.com/iCalcreator/iCalcreator/issues",
"source": "https://github.com/iCalcreator/iCalcreator/tree/v2.39"
"source": "https://github.com/iCalcreator/iCalcreator/tree/v2.39.2"
},
"funding": [
{
@@ -1374,7 +1374,7 @@
"type": "other"
}
],
"time": "2021-06-21T10:09:46+00:00"
"time": "2021-06-28T09:19:24+00:00"
},
{
"name": "league/csv",
@@ -1629,16 +1629,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.10.5",
"version": "v4.11.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
"reference": "fe14cf3672a149364fb66dfe11bf6549af899f94"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
"reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fe14cf3672a149364fb66dfe11bf6549af899f94",
"reference": "fe14cf3672a149364fb66dfe11bf6549af899f94",
"shasum": ""
},
"require": {
@@ -1679,9 +1679,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.11.0"
},
"time": "2021-05-03T19:11:20+00:00"
"time": "2021-07-03T13:36:55+00:00"
},
{
"name": "pixelant/pxa-social-feed",
@@ -2354,16 +2354,16 @@
},
{
"name": "symfony/cache",
"version": "v5.3.0",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
"reference": "44fd0f97d1fb198d344f22379dfc56af2221e608"
"reference": "82962a497f090e95e3b357c21bf6f54991c9b1a5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/cache/zipball/44fd0f97d1fb198d344f22379dfc56af2221e608",
"reference": "44fd0f97d1fb198d344f22379dfc56af2221e608",
"url": "https://api.github.com/repos/symfony/cache/zipball/82962a497f090e95e3b357c21bf6f54991c9b1a5",
"reference": "82962a497f090e95e3b357c21bf6f54991c9b1a5",
"shasum": ""
},
"require": {
@@ -2430,7 +2430,7 @@
"psr6"
],
"support": {
"source": "https://github.com/symfony/cache/tree/v5.3.0"
"source": "https://github.com/symfony/cache/tree/v5.3.3"
},
"funding": [
{
@@ -2446,7 +2446,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T17:43:10+00:00"
"time": "2021-06-24T08:13:00+00:00"
},
{
"name": "symfony/cache-contracts",
@@ -2529,16 +2529,16 @@
},
{
"name": "symfony/console",
"version": "v4.4.25",
"version": "v4.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "a62acecdf5b50e314a4f305cd01b5282126f3095"
"reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/a62acecdf5b50e314a4f305cd01b5282126f3095",
"reference": "a62acecdf5b50e314a4f305cd01b5282126f3095",
"url": "https://api.github.com/repos/symfony/console/zipball/9aa1eb46c1b12fada74dc0c529e93d1ccef22576",
"reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576",
"shasum": ""
},
"require": {
@@ -2598,7 +2598,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/console/tree/v4.4.25"
"source": "https://github.com/symfony/console/tree/v4.4.26"
},
"funding": [
{
@@ -2614,7 +2614,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T11:20:16+00:00"
"time": "2021-06-06T09:12:27+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -2809,16 +2809,16 @@
},
{
"name": "symfony/http-client",
"version": "v4.4.25",
"version": "v4.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
"reference": "00bb90bfb0b3823f700d7251735dced581f9dd90"
"reference": "78bd3796452b2e47d585f807dbfca945cfe34a73"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/00bb90bfb0b3823f700d7251735dced581f9dd90",
"reference": "00bb90bfb0b3823f700d7251735dced581f9dd90",
"url": "https://api.github.com/repos/symfony/http-client/zipball/78bd3796452b2e47d585f807dbfca945cfe34a73",
"reference": "78bd3796452b2e47d585f807dbfca945cfe34a73",
"shasum": ""
},
"require": {
@@ -2869,7 +2869,7 @@
"description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-client/tree/v4.4.25"
"source": "https://github.com/symfony/http-client/tree/v4.4.26"
},
"funding": [
{
@@ -2885,7 +2885,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T11:20:16+00:00"
"time": "2021-06-23T20:58:46+00:00"
},
{
"name": "symfony/http-client-contracts",
@@ -2967,16 +2967,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v5.3.2",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "7b6dd714d95106b831aaa7f3c9c612ab886516bd"
"reference": "0e45ab1574caa0460d9190871a8ce47539e40ccf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/7b6dd714d95106b831aaa7f3c9c612ab886516bd",
"reference": "7b6dd714d95106b831aaa7f3c9c612ab886516bd",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/0e45ab1574caa0460d9190871a8ce47539e40ccf",
"reference": "0e45ab1574caa0460d9190871a8ce47539e40ccf",
"shasum": ""
},
"require": {
@@ -3020,7 +3020,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v5.3.2"
"source": "https://github.com/symfony/http-foundation/tree/v5.3.3"
},
"funding": [
{
@@ -3036,7 +3036,7 @@
"type": "tidelift"
}
],
"time": "2021-06-12T10:15:17+00:00"
"time": "2021-06-27T09:19:40+00:00"
},
{
"name": "symfony/inflector",
@@ -3914,16 +3914,16 @@
},
{
"name": "symfony/process",
"version": "v4.4.25",
"version": "v4.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "cd61e6dd273975c6625316de9d141ebd197f93c9"
"reference": "7e812c84c3f2dba173d311de6e510edf701685a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/cd61e6dd273975c6625316de9d141ebd197f93c9",
"reference": "cd61e6dd273975c6625316de9d141ebd197f93c9",
"url": "https://api.github.com/repos/symfony/process/zipball/7e812c84c3f2dba173d311de6e510edf701685a8",
"reference": "7e812c84c3f2dba173d311de6e510edf701685a8",
"shasum": ""
},
"require": {
@@ -3955,7 +3955,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v4.4.25"
"source": "https://github.com/symfony/process/tree/v4.4.26"
},
"funding": [
{
@@ -3971,7 +3971,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T11:20:16+00:00"
"time": "2021-06-09T14:57:04+00:00"
},
{
"name": "symfony/property-access",
@@ -4142,16 +4142,16 @@
},
{
"name": "symfony/serializer",
"version": "v4.4.25",
"version": "v4.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
"reference": "6db3eb4f1bb437cd3730f52353ba4b568acaddf5"
"reference": "24f5f3024401c97b0c6f1874568369bdd1a378d9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/serializer/zipball/6db3eb4f1bb437cd3730f52353ba4b568acaddf5",
"reference": "6db3eb4f1bb437cd3730f52353ba4b568acaddf5",
"url": "https://api.github.com/repos/symfony/serializer/zipball/24f5f3024401c97b0c6f1874568369bdd1a378d9",
"reference": "24f5f3024401c97b0c6f1874568369bdd1a378d9",
"shasum": ""
},
"require": {
@@ -4215,7 +4215,7 @@
"description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/serializer/tree/v4.4.25"
"source": "https://github.com/symfony/serializer/tree/v4.4.26"
},
"funding": [
{
@@ -4231,7 +4231,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T11:20:16+00:00"
"time": "2021-06-05T20:22:57+00:00"
},
{
"name": "symfony/service-contracts",
@@ -4314,16 +4314,16 @@
},
{
"name": "symfony/string",
"version": "v5.3.2",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "0732e97e41c0a590f77e231afc16a327375d50b0"
"reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/0732e97e41c0a590f77e231afc16a327375d50b0",
"reference": "0732e97e41c0a590f77e231afc16a327375d50b0",
"url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
"reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
"shasum": ""
},
"require": {
@@ -4377,7 +4377,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v5.3.2"
"source": "https://github.com/symfony/string/tree/v5.3.3"
},
"funding": [
{
@@ -4393,20 +4393,20 @@
"type": "tidelift"
}
],
"time": "2021-06-06T09:51:56+00:00"
"time": "2021-06-27T11:44:38+00:00"
},
{
"name": "symfony/var-exporter",
"version": "v5.3.2",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
"reference": "df663fb63bdcd7298373cbd431165ab031706cb2"
"reference": "903c2c0babd6267de5bcb2995e8fc1efb5f01f1f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-exporter/zipball/df663fb63bdcd7298373cbd431165ab031706cb2",
"reference": "df663fb63bdcd7298373cbd431165ab031706cb2",
"url": "https://api.github.com/repos/symfony/var-exporter/zipball/903c2c0babd6267de5bcb2995e8fc1efb5f01f1f",
"reference": "903c2c0babd6267de5bcb2995e8fc1efb5f01f1f",
"shasum": ""
},
"require": {
@@ -4450,7 +4450,7 @@
"serialize"
],
"support": {
"source": "https://github.com/symfony/var-exporter/tree/v5.3.2"
"source": "https://github.com/symfony/var-exporter/tree/v5.3.3"
},
"funding": [
{
@@ -4466,20 +4466,20 @@
"type": "tidelift"
}
],
"time": "2021-06-09T10:57:10+00:00"
"time": "2021-06-27T09:16:08+00:00"
},
{
"name": "symfony/web-link",
"version": "v4.4.25",
"version": "v4.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/web-link.git",
"reference": "edc2c49f3c783daf6e91bc4c8857caf016715956"
"reference": "6381ec2bbe4aa9b3a19baca3aaaac9ddbcad4d6c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/web-link/zipball/edc2c49f3c783daf6e91bc4c8857caf016715956",
"reference": "edc2c49f3c783daf6e91bc4c8857caf016715956",
"url": "https://api.github.com/repos/symfony/web-link/zipball/6381ec2bbe4aa9b3a19baca3aaaac9ddbcad4d6c",
"reference": "6381ec2bbe4aa9b3a19baca3aaaac9ddbcad4d6c",
"shasum": ""
},
"require": {
@@ -4538,7 +4538,7 @@
"push"
],
"support": {
"source": "https://github.com/symfony/web-link/tree/v4.4.25"
"source": "https://github.com/symfony/web-link/tree/v4.4.26"
},
"funding": [
{
@@ -4554,20 +4554,20 @@
"type": "tidelift"
}
],
"time": "2021-05-26T11:20:16+00:00"
"time": "2021-06-22T07:44:52+00:00"
},
{
"name": "symfony/yaml",
"version": "v4.4.25",
"version": "v4.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc"
"reference": "e096ef4b4c4c9a2f72c2ac660f54352cd31c60f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc",
"reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc",
"url": "https://api.github.com/repos/symfony/yaml/zipball/e096ef4b4c4c9a2f72c2ac660f54352cd31c60f8",
"reference": "e096ef4b4c4c9a2f72c2ac660f54352cd31c60f8",
"shasum": ""
},
"require": {
@@ -4609,7 +4609,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/yaml/tree/v4.4.25"
"source": "https://github.com/symfony/yaml/tree/v4.4.26"
},
"funding": [
{
@@ -4625,7 +4625,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T17:39:37+00:00"
"time": "2021-06-23T19:06:53+00:00"
},
{
"name": "typo3/class-alias-loader",
package-lock.json
Generated
+3 -3
View File
@@ -3350,9 +3350,9 @@
}
},
"dayjs": {
"version": "1.10.5",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.5.tgz",
"integrity": "sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g=="
"version": "1.10.6",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.6.tgz",
"integrity": "sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw=="
},
"de-indent": {
"version": "1.0.2",
package.json
+1 -1
View File
@@ -17,7 +17,7 @@
"bootstrap-sass": "^3.4.1",
"bourbon": "^4.3.2",
"cookieconsent": "^3.1.0",
"dayjs": "^1.10.5",
"dayjs": "^1.10.6",
"flatpickr": "^4.6.9",
"font-awesome": "^4.7.0",
"jquery": "^1.12.4",
public/typo3conf/ext/ep_events/Configuration/PageTS/Main.tsconfig
+1 -1
View File
@@ -1,5 +1,5 @@
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Mod/Wizards/NewContentElement.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Wizards/NewContentElement.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/RTE.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/TCEFORM.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Mod/SHARED.tsconfig">
public/typo3conf/ext/ep_products/Classes/Controller/AjaxCalendarController.php
+1 -1
View File
@@ -71,7 +71,7 @@ class AjaxCalendarController extends ActionController
$eventsRangeBegin = $range->getBegin()->sub(new \DateInterval('P1D'));
$eventsRangeEnd = $range->getEnd()->add(new \DateInterval('P1D'));
$eventsRange = new Range($eventsRangeBegin, $eventsRangeEnd);
$events = $factory->getEvents($eventsRange, [ 'hotel' => $hotel, 'hotelCode' => $hotel->getCode() ]);
$events = $factory->getEvents($eventsRange, [ 'hotel' => $hotel ]);
$yearStart = $factory->getYear($range->getBegin()->format('Y'));
$yearEnd = null;