Merge remote-tracking branch 'upstream/5.x' into feature/edit-image-s…

…izes

# Conflicts:
#	core-bundle/contao/themes/flexible/basic.min.css
#	core-bundle/contao/themes/flexible/main.min.css
#	core-bundle/contao/themes/flexible/styles/basic.css
#	core-bundle/contao/widgets/ImageSize.php
#	core-bundle/public/entrypoints.json
#	core-bundle/public/manifest.json

.github/workflows/coverage.yml

@@ -0,0 +1,39 @@
+name: Coverage
+
+on:
+    pull_request: ~
+    push:
+        branches:
+            - 5.x
+        tags:
+            - '*'
+
+permissions: read-all
+
+jobs:
+    coverage:
+        name: Codecov
+        runs-on: ubuntu-latest
+        steps:
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.1
+                  extensions: dom, fileinfo, filter, gd, hash, intl, json, mbstring, mysqli, pcre, pdo_mysql, zlib
+                  coverage: pcov
+
+            - name: Checkout
+              uses: actions/checkout@v3
+
+            - name: Install the dependencies
+              run: composer install --no-interaction --no-progress
+
+            - name: Generate the coverage report
+              run: php -d pcov.enabled=1 vendor/bin/phpunit --testsuite=coverage --coverage-clover=clover.xml --colors=always
+
+            - name: Upload the coverage report
+              uses: codecov/codecov-action@v3
+              with:
+                  files: ./clover.xml
+                  fail_ci_if_error: true
+                  token: 6ec51b7a-f2e6-4310-a60c-d2ee69ecd8ba

.github/workflows/assign-pr.yml → .github/workflows/pr.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
     assign-pr:
-        name: Assign
+        name: Assign PR
         runs-on: ubuntu-latest
         continue-on-error: true
         steps:

.github/workflows/schedule.yml

@@ -0,0 +1,68 @@
+name: Schedule
+
+on:
+    schedule:
+        - cron: 0 13 * * MON,THU
+
+permissions: read-all
+
+jobs:
+    inspect:
+        name: Isolated tests
+        runs-on: ubuntu-latest
+        steps:
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.1
+                  extensions: dom, fileinfo, filter, gd, hash, intl, json, mbstring, mysqli, pcre, pdo_mysql, zlib
+                  coverage: none
+
+            - name: Checkout
+              uses: actions/checkout@v3
+
+            - name: Install the dependencies
+              run: |
+                  composer install --no-interaction --no-progress
+                  composer bin isolated-tests install --no-interaction --no-progress
+
+            - name: Run the unit tests
+              run: vendor/bin/phpunit --extensions Contao\\CoreBundle\\Tests\\PhpunitExtension\\GlobalStateWatcher --colors=always
+
+            - name: Run the unit tests isolated
+              run: tools/isolated-tests/bin/run-tests-isolated --ansi
+
+    windows:
+        name: Windows
+        runs-on: windows-latest
+        steps:
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.1
+                  extensions: dom, fileinfo, filter, gd, hash, intl, json, mbstring, mysqli, pcre, pdo_mysql, zlib
+                  ini-values: memory_limit=1G
+                  coverage: none
+
+            - name: Adjust the Git autocrlf setting
+              run: git config --global core.autocrlf false
+
+            - name: Checkout
+              uses: actions/checkout@v3
+
+            - name: Get the Composer cache directory
+              id: composer-cache
+              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+            - name: Cache the dependencies
+              uses: actions/cache@v3
+              with:
+                  path: ${{ steps.composer-cache.outputs.dir }}
+                  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: ${{ runner.os }}-composer-
+
+            - name: Install the dependencies
+              run: composer install --no-interaction --no-progress
+
+            - name: Run the unit tests
+              run: vendor/bin/phpunit.bat --colors=always

.github/workflows/split.yml

@@ -0,0 +1,39 @@
+name: Split
+
+on:
+    push:
+        branches:
+            - 5.x
+        tags:
+            - '*'
+
+permissions: read-all
+
+jobs:
+    monorepo-split:
+        name: Monorepo split
+        runs-on: ubuntu-latest
+        steps:
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.1
+                  extensions: json, zlib
+                  coverage: none
+
+            - name: Checkout
+              uses: actions/checkout@v3
+
+            - name: Cache the monorepo split
+              uses: actions/cache@v1
+              with:
+                  path: .monorepo-split-cache
+                  key: dev-${GITHUB_REF##*/}
+
+            - name: Install the dependencies
+              run: composer global require contao/monorepo-tools:dev-main
+
+            - name: Split the monorepo
+              run: $HOME/.composer/vendor/bin/monorepo-tools split ${GITHUB_REF##*/}
+              env:
+                  GITHUB_TOKEN: ${{ secrets.MONOREPO_SPLIT_TOKEN }}

.gitignore

@@ -18,3 +18,6 @@
 
 # CS fixer
 /.php_cs.cache
+
+# Ignore the symlinks required for upstream merging
+/*-bundle/src/Resources/

CONTRIBUTORS.md

@@ -18,87 +18,87 @@
  * Richard Henkenjohann ([richardhj](https://github.com/richardhj))
  * Ralf Baussenwein ([rabauss](https://github.com/rabauss))
  * Christoph Wiechert ([psi-4ward](https://github.com/psi-4ward))
- * Dominik Zogg ([dominikzogg](https://github.com/dominikzogg))
  * Severin Glöckle ([SeverinGloeckle](https://github.com/SeverinGloeckle))
+ * Dominik Zogg ([dominikzogg](https://github.com/dominikzogg))
  * Jim Schmid ([sheeep](https://github.com/sheeep))
  * Henry ([Mynyx](https://github.com/Mynyx))
  * Sergey Dyagovchenko ([DyaGa](https://github.com/DyaGa))
  * Arne Stappen ([agoat](https://github.com/agoat))
+ * Dennis Bohn ([bohnmedia](https://github.com/bohnmedia))
  * Nicky Hoff ([frontendschlampe](https://github.com/frontendschlampe))
  * Michael Roitzsch ([mroi](https://github.com/mroi))
- * Oliver Hoff ([backbone87](https://github.com/backbone87))
- * Dennis Bohn ([bohnmedia](https://github.com/bohnmedia))
  * Daniel Jahnsmüller ([Tastaturberuf](https://github.com/Tastaturberuf))
- * Volker Richert ([volkerrichert](https://github.com/volkerrichert))
+ * Oliver Hoff ([backbone87](https://github.com/backbone87))
  * Cliff Parnitzky ([cliffparnitzky](https://github.com/cliffparnitzky))
+ * Volker Richert ([volkerrichert](https://github.com/volkerrichert))
  * ameotoko ([ameotoko](https://github.com/ameotoko))
  * gmpf ([gmpf](https://github.com/gmpf))
  * Markus Nestmann
- * Daniel Schwiperich ([DanielSchwiperich](https://github.com/DanielSchwiperich))
- * Glen Langer ([BugBuster1701](https://github.com/BugBuster1701))
- * Daniele Sciannimanica
  * Arndt von Lucadou ([a-v-l](https://github.com/a-v-l))
- * Christian Eggeling ([amisso](https://github.com/amisso))
+ * Glen Langer ([BugBuster1701](https://github.com/BugBuster1701))
+ * Daniel Schwiperich ([DanielSchwiperich](https://github.com/DanielSchwiperich))
+ * de-es ([de-es](https://github.com/de-es))
  * Stefan Heimes ([stefanheimes](https://github.com/stefanheimes))
- * Simon Wohler ([bekanntmacher](https://github.com/bekanntmacher))
- * Matey ([Matey](https://github.com/Matey))
  * Andreas Burg ([Aybee](https://github.com/Aybee))
- * Roland Schütz ([rolandschuetz](https://github.com/rolandschuetz))
  * Benjamin Hummel
- * kroka ([kroka](https://github.com/kroka))
- * Fabian Laule ([fabianlaule](https://github.com/fabianlaule))
- * de-es ([de-es](https://github.com/de-es))
  * Blair Winans ([blairwinans](https://github.com/blairwinans))
+ * CMSworker ([CMSworker](https://github.com/CMSworker))
+ * Christian Eggeling ([amisso](https://github.com/amisso))
+ * Daniele Sciannimanica
  * David Enke ([davidenke](https://github.com/davidenke))
+ * Fabian Laule ([fabianlaule](https://github.com/fabianlaule))
  * Hendrik Obermayer ([henobi](https://github.com/henobi))
  * initart ([initart](https://github.com/initart))
  * Jamie Devine ([jamesdevine](https://github.com/jamesdevine))
- * CMSworker ([CMSworker](https://github.com/CMSworker))
  * John Brand ([brandbrilliance](https://github.com/brandbrilliance))
- * Torsten Baldes ([tobaco](https://github.com/tobaco))
- * Takahiro Kambe ([taca](https://github.com/taca))
+ * Matey ([Matey](https://github.com/Matey))
  * Olli ([Olli](https://github.com/Olli))
  * Patrick ([patrickjDE](https://github.com/patrickjDE))
- * Joe Ray Gregory ([may17](https://github.com/may17))
- * Florian Otto
+ * Roland Schütz ([rolandschuetz](https://github.com/rolandschuetz))
+ * Simon Wohler ([bekanntmacher](https://github.com/bekanntmacher))
+ * Takahiro Kambe ([taca](https://github.com/taca))
+ * Torsten Baldes ([tobaco](https://github.com/tobaco))
+ * kroka ([kroka](https://github.com/kroka))
  * Alex ([Alex](https://github.com/Alex))
- * Arndt H. Ziegler
- * Christian Romeni ([christianromeni](https://github.com/christianromeni))
- * Patrick Landolt ([scuben](https://github.com/scuben))
+ * Florian Otto
+ * Bjarke Amann ([netzarbeiter](https://github.com/netzarbeiter))
+ * zonky2 ([zonky2](https://github.com/zonky2))
  * Leopold Seckendorff ([poddus](https://github.com/poddus))
+ * Patrick Landolt ([scuben](https://github.com/scuben))
+ * Joe Ray Gregory ([may17](https://github.com/may17))
+ * Christian Romeni ([christianromeni](https://github.com/christianromeni))
+ * Arndt H. Ziegler
+ * Defcon0 ([Defcon0](https://github.com/Defcon0))
  * Benny Born ([bennyborn](https://github.com/bennyborn))
  * Mathias Arzberger ([MDevster](https://github.com/MDevster))
  * Patrick Froch ([eS-IT](https://github.com/eS-IT))
  * Simon Reitinger ([simonreitinger](https://github.com/simonreitinger))
- * zonky2 ([zonky2](https://github.com/zonky2))
  * Alexej Kossmann
- * Andreas Allacher ([AndreasA](https://github.com/AndreasA))
- * Andreas Fieger ([fiedsch](https://github.com/fiedsch))
- * Anthony Clark
- * Christian Barkowsky
- * Christian Kolb ([christian-kolb](https://github.com/christian-kolb))
- * Cédric Morin ([Cerdic](https://github.com/Cerdic))
- * Daniel Nemeth ([daniel-nemeth](https://github.com/daniel-nemeth))
- * Defcon0 ([Defcon0](https://github.com/Defcon0))
- * Dennis Erdmann ([denniserdmann](https://github.com/denniserdmann))
- * Florian Krohmer ([Floxn](https://github.com/Floxn))
- * Florian Reuschel ([loilo](https://github.com/loilo))
- * Andreas ([Glumanda](https://github.com/Glumanda))
- * Jens Dutzi ([Blog404DE](https://github.com/Blog404DE))
- * Marc Reimann ([MacKP](https://github.com/MacKP))
- * Marko Cupic
- * Physiklehrer ([Physiklehrer](https://github.com/Physiklehrer))
- * Sebastian Zoglowek
+ * Adrián Granado ([playmono](https://github.com/playmono))
  * Stefan Schleich ([stefanschleich](https://github.com/stefanschleich))
  * Stephan Gehle ([SGehle](https://github.com/SGehle))
  * Sven Baumann ([baumannsven](https://github.com/baumannsven))
+ * Martin Hauke ([soxrepo](https://github.com/soxrepo))
+ * Christian Kolb ([christian-kolb](https://github.com/christian-kolb))
  * Tsarma ([Tsarma](https://github.com/Tsarma))
  * Vladimir Reznichenko ([kalessil](https://github.com/kalessil))
+ * Christian Barkowsky
  * Alexander Stulnikov ([alarstyle](https://github.com/alarstyle))
+ * Anthony Clark
+ * Andreas Fieger ([fiedsch](https://github.com/fiedsch))
  * leonexcc ([leonexcc](https://github.com/leonexcc))
+ * Marc Reimann ([MacKP](https://github.com/MacKP))
+ * Marko Cupic
+ * Jens Dutzi ([Blog404DE](https://github.com/Blog404DE))
+ * Andreas ([Glumanda](https://github.com/Glumanda))
  * Martin Schumann ([martinschumann](https://github.com/martinschumann))
  * mkt ([mktcode](https://github.com/mktcode))
+ * Florian Reuschel ([loilo](https://github.com/loilo))
+ * Florian Krohmer ([Floxn](https://github.com/Floxn))
+ * Dennis Erdmann ([denniserdmann](https://github.com/denniserdmann))
  * Mike ([mvscheidt](https://github.com/mvscheidt))
- * Bjarke Amann ([netzarbeiter](https://github.com/netzarbeiter))
- * Martin Hauke ([soxrepo](https://github.com/soxrepo))
- * Adrián Granado ([playmono](https://github.com/playmono))
+ * Physiklehrer ([Physiklehrer](https://github.com/Physiklehrer))
+ * Andreas Allacher ([AndreasA](https://github.com/AndreasA))
+ * Sebastian Zoglowek
+ * Daniel Nemeth ([daniel-nemeth](https://github.com/daniel-nemeth))
+ * Cédric Morin ([Cerdic](https://github.com/Cerdic))

UPGRADE.md

@@ -260,11 +260,11 @@ $GLOBALS['TL_CTE']['links']['hyperlink'] = \Contao\ContentHyperlink::class;
 $GLOBALS['TL_CTE']['links']['toplink'] = \Contao\ContentToplink::class;
 $GLOBALS['TL_CTE']['media']['image'] = \Contao\ContentImage::class;
 $GLOBALS['TL_CTE']['media']['gallery'] = \Contao\ContentGallery::class;
+$GLOBALS['TL_CTE']['media']['player'] = \Contao\ContentPlayer::class;
 $GLOBALS['TL_CTE']['media']['youtube'] = \Contao\ContentYouTube::class;
 $GLOBALS['TL_CTE']['media']['vimeo'] = \Contao\ContentVimeo::class;
 $GLOBALS['TL_CTE']['files']['downloads'] = \Contao\ContentDownloads::class;
 $GLOBALS['TL_CTE']['files']['download'] = \Contao\ContentDownload::class;
-$GLOBALS['TL_CTE']['media']['player'] = \Contao\ContentPlayer::class;
 $GLOBALS['TL_CTE']['includes']['teaser'] = \Contao\ContentTeaser::class;
 ```
 
@@ -310,15 +310,15 @@ removed. Use the image handling services and the `FileMetadataEvent` instead.
 The value of the `FormTextarea` widget is no longer encoded with `specialchars()`. Encode the value in your custom
 `form_textarea` templates instead.
 
-### languages.php, getLanguages and $GLOBALS['TL_LANG']['LNG']
+### languages.php, getLanguages and `$GLOBALS['TL_LANG']['LNG']`
 
 The `System::getLanguages()` method, the `getLanguages` hook and the `config/languages.php` file have been removed. Use
 or decorate the `contao.intl.locales` service instead.
 
 To add or remove countries, you can use the `contao.intl.locales` or `contao.intl.enabled_locales` configuration.
 `$GLOBALS['TL_LANG']['LNG']` can still be used for overwriting translations, but no longer to retrieve language names.
 
-### countries.php, getCountries and $GLOBALS['TL_LANG']['CNT']
+### countries.php, getCountries and `$GLOBALS['TL_LANG']['CNT']`
 
 The `System::getCountries()` method, the `getCountries` hook and the `config/countries.php` file have been removed. Use
 or decorate the `contao.intl.countries` service instead.

calendar-bundle/.tx/config

@@ -1,48 +1,48 @@
 [main]
 host = https://www.transifex.com
-type = XLIFF
 
-[calendar-bundle.v5_1-default]
+[o:contao:p:calendar-bundle:r:v5_1-default]
+file_filter = contao/languages/<lang>/default.xlf
 source_file = contao/languages/en/default.xlf
 source_lang = en
-file_filter = contao/languages/<lang>/default.xlf
 
-[calendar-bundle.v5_1-modules]
+[o:contao:p:calendar-bundle:r:v5_1-modules]
+file_filter = contao/languages/<lang>/modules.xlf
 source_file = contao/languages/en/modules.xlf
 source_lang = en
-file_filter = contao/languages/<lang>/modules.xlf
 
-[calendar-bundle.v5_1-tl_calendar]
+[o:contao:p:calendar-bundle:r:v5_1-tl_calendar]
+file_filter = contao/languages/<lang>/tl_calendar.xlf
 source_file = contao/languages/en/tl_calendar.xlf
 source_lang = en
-file_filter = contao/languages/<lang>/tl_calendar.xlf
 
-[calendar-bundle.v5_1-tl_calendar_events]
+[o:contao:p:calendar-bundle:r:v5_1-tl_calendar_events]
+file_filter = contao/languages/<lang>/tl_calendar_events.xlf
 source_file = contao/languages/en/tl_calendar_events.xlf
 source_lang = en
-file_filter = contao/languages/<lang>/tl_calendar_events.xlf
 
-[calendar-bundle.v5_1-tl_calendar_feed]
+[o:contao:p:calendar-bundle:r:v5_1-tl_calendar_feed]
+file_filter = contao/languages/<lang>/tl_calendar_feed.xlf
 source_file = contao/languages/en/tl_calendar_feed.xlf
 source_lang = en
-file_filter = contao/languages/<lang>/tl_calendar_feed.xlf
 
-[calendar-bundle.v5_1-tl_layout]
+[o:contao:p:calendar-bundle:r:v5_1-tl_layout]
+file_filter = contao/languages/<lang>/tl_layout.xlf
 source_file = contao/languages/en/tl_layout.xlf
 source_lang = en
-file_filter = contao/languages/<lang>/tl_layout.xlf
 
-[calendar-bundle.v5_1-tl_module]
+[o:contao:p:calendar-bundle:r:v5_1-tl_module]
+file_filter = contao/languages/<lang>/tl_module.xlf
 source_file = contao/languages/en/tl_module.xlf
 source_lang = en
-file_filter = contao/languages/<lang>/tl_module.xlf
 
-[calendar-bundle.v5_1-tl_user]
+[o:contao:p:calendar-bundle:r:v5_1-tl_user]
+file_filter = contao/languages/<lang>/tl_user.xlf
 source_file = contao/languages/en/tl_user.xlf
 source_lang = en
-file_filter = contao/languages/<lang>/tl_user.xlf
 
-[calendar-bundle.v5_1-tl_user_group]
+[o:contao:p:calendar-bundle:r:v5_1-tl_user_group]
+file_filter = contao/languages/<lang>/tl_user_group.xlf
 source_file = contao/languages/en/tl_user_group.xlf
 source_lang = en
-file_filter = contao/languages/<lang>/tl_user_group.xlf
+