Skip to content

Commit 5226068

Browse files
discordierdiscordier
committed
Merge autofixes by @MiniModel 
2 parents 799481c + efefa57 commit 5226068

File tree

249 files changed

+344
-572
lines changed

Some content is hidden

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

249 files changed

+344
-572
lines changed

‎.check-author.yml

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
ignore:
2-
# Mini Model <[email protected]>
2+
- 'Mini Model <[email protected]>'
33

44
exclude:
5-
languages
5+
- /^contao\/languages/
66

77
mapping:
8-
"Andreas Isaak <[email protected]>": "Andreas Isaak <[email protected]>"
9-
"Stefan Heimes <[email protected]>":
10-
- "Stefan heimes <[email protected]>"
11-
- "chibineko <[email protected]>"
12-
- "stefanheimes <[email protected]>"
13-
- "Stefan Heimes <[email protected]>"
14-
"David Maack <[email protected]>":
15-
- "David Maack <[email protected]>"
16-
- "davidmaack <[email protected]>"
17-
"Christopher Boelter <[email protected]>":
18-
- "cogizz <[email protected]>"
19-
- "cboelter <[email protected]>"
20-
- "Christopher Boelter <[email protected]>"
21-
- "Christopher Bölter <[email protected]>"
22-
"Martin Treml <[email protected]>": "MrTool <[email protected]>"
23-
"Andreas Nölke <[email protected]>": "Zeromax <[email protected]>"
24-
"Ondrej Brinkel <[email protected]>": "Ondrej <[email protected]>"
25-
"Tim Becker <[email protected]>": "Tim Becker <[email protected]>"
26-
"Ingolf Steinhardt <[email protected]>":
27-
- "xantippe <[email protected]>"
28-
- "zonky2 <[email protected]>"
29-
"binron <[email protected]>": "binron <[email protected]>"
30-
"Jeremie Constant <[email protected]>":
31-
- "JeremieConstant <[email protected]>"
8+
'Andreas Isaak <[email protected]>': 'Andreas Isaak <[email protected]>'
9+
'Stefan Heimes <[email protected]>':
10+
- 'Stefan heimes <[email protected]>'
11+
- 'chibineko <[email protected]>'
12+
- 'stefanheimes <[email protected]>'
13+
- 'Stefan Heimes <[email protected]>'
14+
'David Maack <[email protected]>':
15+
- 'David Maack <[email protected]>'
16+
- 'davidmaack <[email protected]>'
17+
'Christopher Boelter <[email protected]>':
18+
- 'cogizz <[email protected]>'
19+
- 'cboelter <[email protected]>'
20+
- 'Christopher Boelter <[email protected]>'
21+
- 'Christopher Bölter <[email protected]>'
22+
'Martin Treml <[email protected]>': 'MrTool <[email protected]>'
23+
'Andreas Nölke <[email protected]>': 'Zeromax <[email protected]>'
24+
'Ondrej Brinkel <[email protected]>': 'Ondrej <[email protected]>'
25+
'Tim Becker <[email protected]>': 'Tim Becker <[email protected]>'
26+
'Ingolf Steinhardt <[email protected]>':
27+
- 'xantippe <[email protected]>'
28+
- 'zonky2 <[email protected]>'
29+
'binron <[email protected]>': 'binron <[email protected]>'
30+
'Jeremie Constant <[email protected]>':
31+
- 'JeremieConstant <[email protected]>'
3232

3333
copy-left:
34-
"Christoph Wiechert <[email protected]>": MetaModels/Widgets/PickerWidget.php
35-
"Andreas Nölke <[email protected]>": MetaModels/Widgets/PickerWidget.php
34+
'Christoph Wiechert <[email protected]>': MetaModels/Widgets/PickerWidget.php
35+
'Andreas Nölke <[email protected]>': MetaModels/Widgets/PickerWidget.php

‎.gitattributes

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
.check-author.yml export-ignore
22
.gitattributes export-ignore
3-
.github export-ignore
43
.gitignore export-ignore
54
.travis.yml export-ignore
65
build.default.properties export-ignore
76
build.xml export-ignore
87
phpunit.xml.dist export-ignore
8+
/.github export-ignore
99
/tests export-ignore
10+
ctb.json export-ignore

‎.travis.yml

+11-14
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,39 @@
11
language: php
2-
2+
33
php:
44
- "7.2"
55
- "7.1"
66
- "7.0"
77
- "5.6"
88

99
env:
10-
- CONTAO_VERSION=~3.5.0
10+
- CONTAO_VERSION=~3.5.5
1111

12-
sudo: false
13-
1412
before_script:
1513
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
1614
- travis_retry composer self-update && composer --version
1715
- travis_retry composer require contao/core $CONTAO_VERSION --no-update
18-
# We have to supply the branch alias here again as travis checks out a commit hash and therefore destroys the
19-
# circular dependency metamodels/base-unit-tests -> metamodels/core -> metamodels/base-unit-tests.
2016
- >
2117
if [ "x${TRAVIS_TAG}" != "x" ]; then
22-
COMPOSER_ROOT_VERSION=${TRAVIS_TAG} travis_retry composer update --prefer-dist --no-interaction;
18+
export COMPOSER_ROOT_VERSION=${TRAVIS_TAG}
2319
else
24-
COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ hotfix/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
20+
export COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ hotfix/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
2521
&& echo ${BASH_REMATCH[1]} \
26-
|| echo dev-${TRAVIS_BRANCH}) \
27-
travis_retry composer update --prefer-dist --no-interaction;
22+
|| echo dev-${TRAVIS_BRANCH})
2823
fi
24+
- echo "Using root version ${COMPOSER_ROOT_VERSION}"
25+
- travis_retry composer update --prefer-dist --no-interaction
2926

3027
script: ant -keep-going
3128

32-
after_success:
33-
- bash <(curl -s https://copilot.blackducksoftware.com/ci/travis/scripts/upload)
34-
3529
# Hack to make things work again - we can not use a shallow repository.
3630
git:
3731
depth: 2147483647
3832

39-
# This used to cause corruption due to travis bug travis-ci/travis-ci#4393 - hopefully it works out now.
33+
branches:
34+
except:
35+
- /.*-translation/
36+
4037
cache:
4138
directories:
4239
- vendor

‎composer.json

+6-10
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
},
3232
"require": {
3333
"php": "^5.6 || ^7.0",
34-
"contao-community-alliance/composer-plugin": "~2.4",
35-
"contao-community-alliance/dc-general": "^2.0.0-beta42@beta",
34+
"contao-community-alliance/composer-plugin": "^2.4",
35+
"contao-community-alliance/dc-general": "^2.0.0-beta49@beta",
3636
"contao-community-alliance/dependency-container": "^1.8",
3737
"contao-community-alliance/event-dispatcher": "~1.3",
3838
"contao-community-alliance/events-contao-bindings": "^3.5",
@@ -44,10 +44,9 @@
4444
"menatwork/contao-multicolumnwizard": "^3.3.16"
4545
},
4646
"require-dev": {
47-
"cyberspectrum/contao-toolbox": "~0.7",
4847
"metamodels/base-unit-tests": "^1.0.4",
4948
"metamodels/phpunit-contao-database": "^1.0.1",
50-
"phpcq/all-tasks": "~1.2"
49+
"phpcq/all-tasks": "^1.2"
5150
},
5251
"autoload": {
5352
"psr-0": {
@@ -64,12 +63,6 @@
6463
"sources": {
6564
"contao": "system/modules/metamodels"
6665
},
67-
"transifex": {
68-
"project": "metamodels",
69-
"prefix": "core-",
70-
"languages_cto": "contao/languages",
71-
"languages_tx": ".tx"
72-
},
7366
"runonce": [
7467
"runonce/runonce.php"
7568
]
@@ -78,5 +71,8 @@
7871
"dev-master": "2.0.x-dev",
7972
"dev-develop": "2.1.x-dev"
8073
}
74+
},
75+
"config": {
76+
"sort-packages": true
8177
}
8278
}

‎contao/config/autoload.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author Christopher Bölter <[email protected]>

‎contao/config/config.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author David Maack <[email protected]>

‎contao/config/event_listeners.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Christopher Boelter <[email protected]>
1716
* @author Stefan Heimes <[email protected]>

‎contao/config/services.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Sven Baumann <[email protected]>
1716
* @copyright 2012-2018 The MetaModels team.

‎contao/dca/tl_content.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author David Maack <[email protected]>

‎contao/dca/tl_metamodel.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Christian de la Haye <[email protected]>
1716
* @author Andreas Isaak <[email protected]>

‎contao/dca/tl_metamodel_attribute.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author David Maack <[email protected]>

‎contao/dca/tl_metamodel_dca.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author David Maack <[email protected]>

‎contao/dca/tl_metamodel_dca_combine.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author Stefan Heimes <[email protected]>

‎contao/dca/tl_metamodel_dca_sortgroup.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author David Molineus <[email protected]>
1716
* @author Sven Baumann <[email protected]>

‎contao/dca/tl_metamodel_dcasetting.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author Christopher Boelter <[email protected]>

‎contao/dca/tl_metamodel_dcasetting_condition.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Stefan Heimes <[email protected]>
1716
* @author Christopher Boelter <[email protected]>

‎contao/dca/tl_metamodel_filter.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author David Maack <[email protected]>

‎contao/dca/tl_metamodel_filtersetting.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author Andreas Nölke <[email protected]>

‎contao/dca/tl_metamodel_item.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author Oliver Lohoff <[email protected]>

‎contao/dca/tl_metamodel_rendersetting.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author Christopher Boelter <[email protected]>

‎contao/dca/tl_metamodel_rendersettings.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author David Maack <[email protected]>

‎contao/dca/tl_metamodel_searchable_pages.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Tim Becker <[email protected]>
1716
* @author Stefan Heimes <[email protected]>

‎contao/dca/tl_module.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Andreas Isaak <[email protected]>
1716
* @author David Maack <[email protected]>

‎contao/popup.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage Core
13+
* @package MetaModels/core
1514
* @author Christian Schiffler <[email protected]>
1615
* @author Stefan Heimes <[email protected]>
1716
* @author David Maack <[email protected]>
1817
* @author Andreas Nölke <[email protected]>
1918
* @author Sven Baumann <[email protected]>
2019
* @copyright 2012-2018 The MetaModels team.
21-
* @license https://github.com/MetaModels/core/LICENSE LGPL-3.0-or-later
20+
* @license https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
2221
* @filesource
2322
*/
2423

0 commit comments

Comments
 (0)