Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ad36b75

Browse filesBrowse files
fritzmgfritzmg
committed
merge with master
2 parents 72e72d2 + dbb46a1 commit ad36b75
Copy full SHA for ad36b75

File tree

208 files changed

+1942
-2077
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

208 files changed

+1942
-2077
lines changed

‎.github/CONTRIBUTING.md

Copy file name to clipboardExpand all lines: .github/CONTRIBUTING.md
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ propose changes to this document in a pull request.
2020

2121
* Follow the Contao coding standards.
2222
* For new features, create your pull request against the `master` branch.
23-
* For bug fixes, create your pull request against the lowest affected branch,
24-
e.g. `4.4` if the bug is in Contao 4.4 or `4.7` if the bug is in Contao 4.7.
23+
* For bug fixes, create your pull request against the lowest affected branch
24+
that is actively supported, e.g. `4.9` if the bug is in Contao 4.9 or `4.10`
25+
if the bug is only in Contao 4.10 or greater.
2526
* Include screenshots in your pull request whenever possible.
2627
* If you want to add a new feature, we recommend that you discuss your ideas
2728
with us before your start writing code; either on GitHub or in one of our

‎.github/ISSUE_TEMPLATE/1_Bug_report.md

Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/1_Bug_report.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ about: Report errors and problems
55

66
**Affected version(s)**
77

8-
Contao 4.4 or Contao 4.9?
8+
Contao 4.9 or Contao 4.10?
99

1010
**Description**
1111

‎.github/PULL_REQUEST_TEMPLATE.md

Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
| Docs PR or issue | contao/docs#...
55

66
<!--
7-
Bugfixes should be based on the 4.4 or 4.9 branch and features on the master
7+
Bugfixes should be based on the 4.9 or 4.10 branch and features on the master
88
branch. Select the correct branch in the "base:" drop-down menu above.
99
1010
Replace this notice with a short README for your feature/bugfix. This will help

‎.github/workflows/ci.yml

Copy file name to clipboardExpand all lines: .github/workflows/ci.yml
+19-15Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v1
2929

3030
- name: Install the dependencies
31-
run: composer install --no-interaction
31+
run: composer install --no-interaction --no-progress
3232

3333
- name: Generate the coverage report
3434
run: php -d pcov.enabled=1 vendor/bin/phpunit --testsuite=coverage --coverage-clover=clover.xml --colors=always
@@ -56,18 +56,22 @@ jobs:
5656
uses: actions/checkout@v1
5757

5858
- name: Install the dependencies
59-
run: composer install --no-interaction
59+
run: |
60+
composer install --no-interaction --no-progress
61+
composer bin ecs install --no-interaction --no-progress
62+
composer bin phpstan install --no-interaction --no-progress
63+
composer bin psalm install --no-interaction --no-progress
6064
61-
- name: Check the coding style
65+
- name: Check the coding standard
6266
run: |
63-
vendor/bin/ecs check *-bundle/bin *-bundle/src *-bundle/tests --config vendor/contao/easy-coding-standard/config/default.php --no-progress-bar --ansi
64-
vendor/bin/ecs check *-bundle/src/Resources/contao --config vendor/contao/easy-coding-standard/config/legacy.php --no-progress-bar --ansi
65-
vendor/bin/ecs check *-bundle/src/Resources/contao/templates --config vendor/contao/easy-coding-standard/config/template.php --no-progress-bar --ansi
67+
tools/ecs/vendor/bin/ecs check *-bundle/bin *-bundle/src *-bundle/tests --config tools/ecs/vendor/contao/easy-coding-standard/config/default.php --no-progress-bar --ansi
68+
tools/ecs/vendor/bin/ecs check *-bundle/src/Resources/contao --config tools/ecs/vendor/contao/easy-coding-standard/config/legacy.php --no-progress-bar --ansi
69+
tools/ecs/vendor/bin/ecs check *-bundle/src/Resources/contao/templates --config tools/ecs/vendor/contao/easy-coding-standard/config/template.php --no-progress-bar --ansi
6670
6771
- name: Analyze the code
6872
run: |
69-
vendor/bin/phpstan analyse core-bundle/src core-bundle/tests --level=5 --no-progress
70-
vendor/bin/psalm --no-suggestions --threads=4 --no-progress
73+
tools/phpstan/vendor/bin/phpstan analyse core-bundle/src core-bundle/tests --level=5 --no-progress
74+
tools/psalm/vendor/bin/psalm --no-suggestions --no-progress
7175
7276
- name: Analyze the YAML files
7377
run: |
@@ -101,7 +105,7 @@ jobs:
101105
uses: actions/checkout@v1
102106

103107
- name: Install the dependencies
104-
run: composer install --no-interaction
108+
run: composer install --no-interaction --no-progress
105109

106110
- name: Run the unit tests
107111
run: vendor/bin/phpunit --colors=always
@@ -133,7 +137,7 @@ jobs:
133137
uses: actions/checkout@v1
134138

135139
- name: Install the dependencies
136-
run: composer install --ignore-platform-reqs --no-interaction
140+
run: composer install --ignore-platform-reqs --no-interaction --no-progress
137141

138142
- name: Run the unit tests
139143
run: vendor/bin/phpunit --colors=always
@@ -165,7 +169,7 @@ jobs:
165169
uses: actions/checkout@v1
166170

167171
- name: Install the dependencies
168-
run: composer update --prefer-lowest --prefer-stable --no-interaction
172+
run: composer update --prefer-lowest --prefer-stable --no-interaction --no-progress
169173

170174
- name: Run the unit tests
171175
run: vendor/bin/phpunit --colors=always
@@ -208,7 +212,7 @@ jobs:
208212
}
209213
file_put_contents(__DIR__."/composer.json", json_encode($data, JSON_UNESCAPED_SLASHES));
210214
'
211-
COMPOSER_ROOT_VERSION=dev-${{ env.GITHUB_SHA }} composer install --no-interaction
215+
COMPOSER_ROOT_VERSION=dev-${{ env.GITHUB_SHA }} composer install --no-interaction --no-progress
212216
vendor/bin/phpunit --colors=always
213217
cd ..
214218
done
@@ -256,11 +260,11 @@ jobs:
256260

257261
- name: Install the dependencies
258262
run: |
259-
composer global require contao/monorepo-tools:dev-master
260-
composer install --no-interaction
263+
composer install --no-interaction --no-progress
264+
composer bin monorepo install --no-interaction --no-progress
261265
262266
- name: Validate the composer.json files
263-
run: $HOME/.composer/vendor/bin/monorepo-tools composer-json --validate --ansi
267+
run: tools/monorepo/vendor/bin/monorepo-tools composer-json --validate --ansi
264268

265269
monorepo-split:
266270
name: Monorepo Split

‎.gitignore

Copy file name to clipboardExpand all lines: .gitignore
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
/composer.lock
33
/vendor/
44

5+
# Composer bin
6+
/tools/*/composer.lock
7+
/tools/*/vendor
8+
59
# Monorepo Tools
610
/.monorepo-split-cache/
711

‎.yamllint

Copy file name to clipboardExpand all lines: .yamllint
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ extends: default
22

33
ignore: |
44
/node_modules/
5+
/tools/
56
/vendor/
67

78
rules:

‎CONTRIBUTORS.md

Copy file name to clipboard
+85-72Lines changed: 85 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,87 @@
11
# Contributors
22

3-
* Leo Feyer (leofeyer)
4-
* Andreas Schempp (aschempp)
5-
* Yanick Witschi (Toflar)
6-
* Martin Auswöger (ausi)
7-
* Tristan Lins (tristanlins)
8-
* Hannes (xchs)
9-
* Christian Schiffler (discordier)
10-
* Kamil Kuzminski (qzminski)
11-
* Fritz Michael Gschwantner (fritzmg)
12-
* David Molineus (dmolineus)
13-
* David Greminger (bytehead)
14-
* Marco Biedermann (marcobiedermann)
15-
* Christoph Wiechert (psi-4ward)
16-
* Dominik Zogg (dominikzogg)
17-
* Jim Schmid (sheeep)
18-
* Sergey Dyagovchenko (DyaGa)
19-
* Richard Henkenjohann (richardhj)
20-
* Arne Stappen (agoat)
21-
* Oliver Hoff (backbone87)
22-
* Volker Richert (volkerrichert)
23-
* gmpf
24-
* Nicky Hoff (frontendschlampe)
25-
* Michael Roitzsch (mroi)
26-
* Daniel Schwiperich (DanielSchwiperich)
27-
* Torsten Baldes (tobaco)
28-
* Takahiro Kambe (taca)
29-
* Stefan Heimes (stefanheimes)
30-
* Roland Schütz (rolandschuetz)
31-
* Moritz Vondano (m-vo)
32-
* kroka
33-
* Jamie Devine (jamesdevine)
34-
* Hendrik Obermayer (henobi)
35-
* David Enke (davidenke)
36-
* Simon Wohler (bekanntmacher)
37-
* Arndt von Lucadou (a-v-l)
38-
* Mynyx
39-
* Eike Schuderer (ESchuderer)
40-
* Glen Langer (BugBuster1701)
41-
* Andreas Burg (Aybee)
42-
* Leopold Seckendorff (poddus)
43-
* Joe Ray Gregory (may17)
44-
* Christian Romeni (christianromeni)
45-
* CMSworker
46-
* Stefan Schleich (stefanschleich)
47-
* Martin Hauke (soxrepo)
48-
* Patrick Landolt (scuben)
49-
* Adrián Granado (playmono)
50-
* Patrick (patrickjDE)
51-
* Bjarke Ammann (netzarbeiter)
52-
* mvscheidt
53-
* mkt (mktcode)
54-
* Martin Schumann (martinschumann)
55-
* Vladimir Reznichenko (kalessil)
56-
* Andreas Fieger (fiedsch)
57-
* Patrick Froch (eS-IT)
58-
* Daniel Nemeth (daniel-nemeth)
59-
* Cliff Parnitzky (cliffparnitzky)
60-
* Christian Kolb (christian-kolb)
61-
* Benedict Zinke (bezin)
62-
* Alexander Stulnikov (alarstyle)
63-
* Physiklehrer
64-
* Marc Reimann (MacKP)
65-
* Mathias Arzberger (MDevster)
66-
* Defcon0
67-
* Cédric Morin (Cerdic)
68-
* Simon Reitinger (simonreitinger)
69-
* Dominik Tomasi (dtomasi)
70-
* Daniel Jahnsmüller
71-
* Christian Eggeling
72-
* John Brand (brandbrilliance)
73-
* Blair Winans (blairwinans)
74-
* Fabian Laule (fabianlaule)
3+
* Leo Feyer ([leofeyer](https://github.com/leofeyer))
4+
* Andreas Schempp ([aschempp](https://github.com/aschempp))
5+
* Yanick Witschi ([Toflar](https://github.com/Toflar))
6+
* Martin Auswöger ([ausi](https://github.com/ausi))
7+
* Tristan Lins ([tristanlins](https://github.com/tristanlins))
8+
* Hannes ([xchs](https://github.com/xchs))
9+
* Christian Schiffler ([discordier](https://github.com/discordier))
10+
* Fritz Michael Gschwantner ([fritzmg](https://github.com/fritzmg))
11+
* David Greminger ([bytehead](https://github.com/bytehead))
12+
* Kamil Kuzminski ([qzminski](https://github.com/qzminski))
13+
* David Molineus ([dmolineus](https://github.com/dmolineus))
14+
* Moritz Vondano ([m-vo](https://github.com/m-vo))
15+
* Dominik Tomasi ([dtomasi](https://github.com/dtomasi))
16+
* Marco Biedermann ([marcobiedermann](https://github.com/marcobiedermann))
17+
* Christoph Wiechert ([psi-4ward](https://github.com/psi-4ward))
18+
* Richard Henkenjohann ([richardhj](https://github.com/richardhj))
19+
* Dominik Zogg ([dominikzogg](https://github.com/dominikzogg))
20+
* Jim Schmid ([sheeep](https://github.com/sheeep))
21+
* Henry ([Mynyx](https://github.com/Mynyx))
22+
* Sergey Dyagovchenko ([DyaGa](https://github.com/DyaGa))
23+
* Ralf Baussenwein ([rabauss](https://github.com/rabauss))
24+
* Arne Stappen ([agoat](https://github.com/agoat))
25+
* Nicky Hoff ([frontendschlampe](https://github.com/frontendschlampe))
26+
* Oliver Hoff ([backbone87](https://github.com/backbone87))
27+
* Michael Roitzsch ([mroi](https://github.com/mroi))
28+
* Volker Richert ([volkerrichert](https://github.com/volkerrichert))
29+
* gmpf ([gmpf](https://github.com/gmpf))
30+
* Daniel Jahnsmüller ([Tastaturberuf](https://github.com/Tastaturberuf))
31+
* Daniel Schwiperich ([DanielSchwiperich](https://github.com/DanielSchwiperich))
32+
* Fabian Laule ([fabianlaule](https://github.com/fabianlaule))
33+
* Glen Langer ([BugBuster1701](https://github.com/BugBuster1701))
34+
* Takahiro Kambe ([taca](https://github.com/taca))
35+
* initart ([initart](https://github.com/initart))
36+
* Jamie Devine ([jamesdevine](https://github.com/jamesdevine))
37+
* Torsten Baldes ([tobaco](https://github.com/tobaco))
38+
* kroka ([kroka](https://github.com/kroka))
39+
* David Enke ([davidenke](https://github.com/davidenke))
40+
* Hendrik Obermayer ([henobi](https://github.com/henobi))
41+
* Arndt von Lucadou ([a-v-l](https://github.com/a-v-l))
42+
* Matey ([Matey](https://github.com/Matey))
43+
* Olli ([Olli](https://github.com/Olli))
44+
* Roland Schütz ([rolandschuetz](https://github.com/rolandschuetz))
45+
* Stefan Heimes ([stefanheimes](https://github.com/stefanheimes))
46+
* Blair Winans ([blairwinans](https://github.com/blairwinans))
47+
* Christian Eggeling ([amisso](https://github.com/amisso))
48+
* John Brand ([brandbrilliance](https://github.com/brandbrilliance))
49+
* Andreas Burg ([Aybee](https://github.com/Aybee))
50+
* Simon Wohler ([bekanntmacher](https://github.com/bekanntmacher))
51+
* Leopold Seckendorff ([poddus](https://github.com/poddus))
52+
* Patrick Froch ([eS-IT](https://github.com/eS-IT))
53+
* Patrick Landolt ([scuben](https://github.com/scuben))
54+
* Joe Ray Gregory ([may17](https://github.com/may17))
55+
* CMSworker ([CMSworker](https://github.com/CMSworker))
56+
* Christian Romeni ([christianromeni](https://github.com/christianromeni))
57+
* Dennis Bohn ([bohnmedia](https://github.com/bohnmedia))
58+
* Adrián Granado ([playmono](https://github.com/playmono))
59+
* Daniel Nemeth ([daniel-nemeth](https://github.com/daniel-nemeth))
60+
* Cédric Morin ([Cerdic](https://github.com/Cerdic))
61+
* Martin Schumann ([martinschumann](https://github.com/martinschumann))
62+
* mkt ([mktcode](https://github.com/mktcode))
63+
* Mike ([mvscheidt](https://github.com/mvscheidt))
64+
* Bjarke Amann ([netzarbeiter](https://github.com/netzarbeiter))
65+
* Cliff Parnitzky ([cliffparnitzky](https://github.com/cliffparnitzky))
66+
* Christian Kolb ([christian-kolb](https://github.com/christian-kolb))
67+
* Benedict Zinke ([bezin](https://github.com/bezin))
68+
* Martin Hauke ([soxrepo](https://github.com/soxrepo))
69+
* Andreas Fieger ([fiedsch](https://github.com/fiedsch))
70+
* Defcon0 ([Defcon0](https://github.com/Defcon0))
71+
* Alexander Stulnikov ([alarstyle](https://github.com/alarstyle))
72+
* Stephan Gehle ([SGehle](https://github.com/SGehle))
73+
* Dennis Erdmann ([denniserdmann](https://github.com/denniserdmann))
74+
* Vladimir Reznichenko ([kalessil](https://github.com/kalessil))
75+
* Tsarma ([Tsarma](https://github.com/Tsarma))
76+
* Florian Krohmer ([Floxn](https://github.com/Floxn))
77+
* Florian Reuschel ([loilo](https://github.com/loilo))
78+
* Andreas ([Glumanda](https://github.com/Glumanda))
79+
* Jens Dutzi ([Blog404DE](https://github.com/Blog404DE))
80+
* Sven Baumann ([baumannsven](https://github.com/baumannsven))
81+
* Stefan Schleich ([stefanschleich](https://github.com/stefanschleich))
82+
* Marc Reimann ([MacKP](https://github.com/MacKP))
83+
* Mathias Arzberger ([MDevster](https://github.com/MDevster))
84+
* Simon Reitinger ([simonreitinger](https://github.com/simonreitinger))
85+
* Patrick ([patrickjDE](https://github.com/patrickjDE))
86+
* Andreas Allacher ([AndreasA](https://github.com/AndreasA))
87+
* Physiklehrer ([Physiklehrer](https://github.com/Physiklehrer))

‎README.md

Copy file name to clipboardExpand all lines: README.md
+8-2Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ composer create-project --no-install contao/managed-edition <directory> <branch>
4545
Replace `<directory>` with the directory you want to install the Managed
4646
Edition in (use `.` for the current one). Replace `<branch>` with `dev-master`
4747
if you want to add a new feature or with `<lts-version>.x-dev` (currently
48-
`4.4.x-dev` and `4.9.x-dev`) if you want to fix a bug.
48+
`4.9.x-dev`) if you want to fix a bug.
4949

5050
Then adjust the `require` section in your `composer.json` file so Composer
5151
loads the monorepo instead of the individual bundles:
@@ -75,7 +75,13 @@ you can submit your pull request directly from within your application.
7575

7676
## Running scripts
7777

78-
You can use Composer to run the code quality scripts:
78+
First install the code quality tools:
79+
80+
```bash
81+
composer bin all update
82+
```
83+
84+
Then run the code quality scripts via Composer:
7985

8086
```bash
8187
composer run all

‎calendar-bundle/composer.json

Copy file name to clipboardExpand all lines: calendar-bundle/composer.json
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@
1919
"contao/core-bundle": "self.version",
2020
"friendsofsymfony/http-cache": "^2.4",
2121
"patchwork/utf8": "^1.2",
22-
"symfony/config": "4.4.*",
23-
"symfony/dependency-injection": "4.4.*",
22+
"symfony/config": "4.4.* || 5.2.*",
23+
"symfony/dependency-injection": "4.4.* || 5.2.*",
2424
"symfony/deprecation-contracts": "^2.1",
25-
"symfony/http-foundation": "4.4.*",
26-
"symfony/http-kernel": "4.4.*",
27-
"symfony/yaml": "4.4.*"
25+
"symfony/http-foundation": "4.4.* || 5.2.*",
26+
"symfony/http-kernel": "4.4.* || 5.2.*",
27+
"symfony/yaml": "4.4.* || 5.2.*"
2828
},
2929
"conflict": {
3030
"contao/core": "*",
3131
"contao/manager-plugin": "<2.0 || >=3.0"
3232
},
3333
"require-dev": {
3434
"contao/manager-plugin": "^2.3.1",
35-
"contao/test-case": "^4.0",
35+
"contao/test-case": "^4.2",
3636
"phpunit/phpunit": "^8.5",
37-
"symfony/http-client": "4.4.*",
38-
"symfony/phpunit-bridge": "4.4.*"
37+
"symfony/http-client": "4.4.* || 5.2.*",
38+
"symfony/phpunit-bridge": "^5.2"
3939
},
4040
"extra": {
4141
"branch-alias": {
4242
"dev-master": "4.11.x-dev"
4343
},
4444
"contao-manager-plugin": "Contao\\CalendarBundle\\ContaoManager\\Plugin",
4545
"symfony": {
46-
"require": "^4.4"
46+
"require": "4.4.* || ^5.2"
4747
}
4848
},
4949
"autoload": {

‎calendar-bundle/src/Resources/contao/dca/tl_calendar.php

Copy file name to clipboardExpand all lines: calendar-bundle/src/Resources/contao/dca/tl_calendar.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
(
116116
'href' => 'act=delete',
117117
'icon' => 'delete.svg',
118-
'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm'] . '\'))return false;Backend.getScrollOffset()"',
118+
'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? null) . '\'))return false;Backend.getScrollOffset()"',
119119
'button_callback' => array('tl_calendar', 'deleteCalendar')
120120
),
121121
'show' => array

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.