Skip to content

Commit e5fff68

Browse files
discordierdiscordier
committed
Merge tag '2.0.6' into feature/contao4
Maintenance build Final preprarations for 2.1 Conflicts: .check-author.yml .travis.yml composer.json contao/config/autoload.php contao/config/event_listeners.php contao/config/services.php contao/popup.php phpunit.xml.dist src/Attribute/IInternal.php src/FrontendIntegration/HybridFilterBlock.php src/MetaModels/BackendIntegration/BackendModuleBuilder.php src/MetaModels/BackendIntegration/Boot.php src/MetaModels/BackendIntegration/PurgeCache.php src/MetaModels/ContaoIntegration/Boot.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbAttributes.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbBase.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbDcaCombine.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbFilter.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbFilterSetting.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbInputScreenCondition.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbInputScreenSetting.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbInputScreenSortGroup.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbInputScreens.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbMetaModels.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbRenderSetting.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbRenderSettings.php src/MetaModels/DcGeneral/Events/BreadCrumb/BreadCrumbSearchablePages.php src/MetaModels/DcGeneral/Events/Subscriber.php src/MetaModels/DcGeneral/Events/Table/AbstractAddAllHandler.php src/MetaModels/DcGeneral/Events/Table/Attribute/Subscriber.php src/MetaModels/DcGeneral/Events/Table/DcaCombine/Subscriber.php src/MetaModels/DcGeneral/Events/Table/FilterSetting/Subscriber.php src/MetaModels/DcGeneral/Events/Table/InputScreen/Subscriber.php src/MetaModels/DcGeneral/Events/Table/InputScreenCondition/Subscriber.php src/MetaModels/DcGeneral/Events/Table/InputScreenSortGroup/Subscriber.php src/MetaModels/DcGeneral/Events/Table/InputScreens/InputScreenAddAllHandler.php src/MetaModels/DcGeneral/Events/Table/InputScreens/Subscriber.php src/MetaModels/DcGeneral/Events/Table/MetaModels/Subscriber.php src/MetaModels/DcGeneral/Events/Table/RenderSetting/RenderSettingAddAllHandler.php src/MetaModels/DcGeneral/Events/Table/RenderSetting/Subscriber.php src/MetaModels/DcGeneral/Events/Table/RenderSettings/Subscriber.php src/MetaModels/DcGeneral/Events/Table/SearchablePages/Subscriber.php src/MetaModels/Dca/Content.php src/MetaModels/Dca/ContentElementModuleBase.php src/MetaModels/Dca/MetaModelDcaBuilder.php src/MetaModels/Dca/Module.php src/MetaModels/Dca/RenderSettings.php src/MetaModels/Events/DatabaseBackedListener.php src/MetaModels/Events/DefaultPropertyConditionCreator.php src/MetaModels/Filter/Rules/SimpleQuery.php src/MetaModels/Filter/Setting/FilterSettingFactory.php src/MetaModels/Helper/LoadDataContainerHookListener.php src/MetaModels/Helper/OperationButtonCallbackListener.php src/MetaModels/Helper/SubSystemBoot.php src/MetaModels/MetaModelsServiceContainer.php src/MetaModels/Render/Setting/RenderSettingFactory.php src/Widgets/PickerWidget.php tests/MetaModels/Test/FactoryTest.php tests/MetaModels/Test/Helper/SubSystemBootTest.php tests/MetaModels/Test/ServicesTest.php
2 parents 875eb8c + 6f8196d commit e5fff68

File tree

212 files changed

+344
-514
lines changed

Some content is hidden

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

212 files changed

+344
-514
lines changed

‎.check-author.yml

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

44
exclude:
5-
languages
5+
- /^src\/CoreBundle\/Resources\/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]>": Widgets/PickerWidget.php
35-
"Andreas Nölke <[email protected]>": Widgets/PickerWidget.php
34+
'Christoph Wiechert <[email protected]>': Widgets/PickerWidget.php
35+
'Andreas Nölke <[email protected]>': Widgets/PickerWidget.php
3636
"Christian Schiffler <[email protected]>":
3737
- src/CoreBundle/EventListener/DcGeneral/Table/DcaSetting/RemoveOverrideButtonListener.php
3838
- src/CoreBundle/EventListener/DcGeneral/Table/FilterSetting/SubPaletteSubscriber.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
@@ -8,36 +8,33 @@ php:
88
- "nightly"
99

1010
env:
11-
- CONTAO_VERSION=~4.4.0
12-
13-
sudo: false
11+
- CONTAO_VERSION=~4.4.0
1412

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

3128
script: ant -keep-going
3229

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

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

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
[![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/core.svg)](https://github.com/MetaModels/core/tags)
33
[![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/core.svg)](https://packagist.org/packages/MetaModels/core)
44
[![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/core.svg)](https://packagist.org/packages/MetaModels/core)
5-
[![Dependency Status](https://www.versioneye.com/php/metamodels:core/badge.svg)](https://www.versioneye.com/php/metamodels:core)
65

76
MetaModels
87
==========

‎composer.json

+13-17
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,26 @@
3131
},
3232
"require": {
3333
"php": "^5.6 || ^7.0",
34-
"contao/core-bundle": "^4.4.8",
3534
"contao-community-alliance/dc-general": "~2.1@dev",
36-
"menatwork/contao-multicolumnwizard": "^3.3.16",
37-
"contao-community-alliance/meta-palettes": "~2.0",
38-
"discordier/justtextwidgets": "^1.1.0",
39-
"contao-community-alliance/url-builder": "~1.3",
4035
"contao-community-alliance/dependency-container": "~2.0",
4136
"contao-community-alliance/event-dispatcher": "~2.0",
4237
"contao-community-alliance/events-contao-bindings": "~4.0",
38+
"contao-community-alliance/meta-palettes": "~2.0",
4339
"contao-community-alliance/translator": "~2.1",
40+
"contao-community-alliance/url-builder": "~1.3",
41+
"contao/core-bundle": "^4.4.8",
42+
"discordier/justtextwidgets": "^1.1.0",
4443
"doctrine/cache": "~1.6",
45-
"webmozart/path-util": "~2.3",
44+
"menatwork/contao-multicolumnwizard": "^3.3.16",
45+
"ocramius/proxy-manager": "^1.0 || ^2.1",
46+
"symfony/config": "^3.3 || ^4.0",
47+
"symfony/dependency-injection": "^3.3 || ^4.0",
48+
"symfony/filesystem": "^3.3 || ^4.0",
4649
"symfony/finder": "^3.3 || ^4.0",
4750
"symfony/proxy-manager-bridge": "^3.3 || ^4.0",
48-
"symfony/filesystem": "^3.3 || ^4.0",
49-
"symfony/dependency-injection": "^3.3 || ^4.0",
50-
"symfony/config": "^3.3 || ^4.0",
51-
"ocramius/proxy-manager": "^1.0 || ^2.1"
51+
"webmozart/path-util": "~2.3"
5252
},
5353
"require-dev": {
54-
"cyberspectrum/contao-toolbox": "~0.7",
5554
"phpcq/all-tasks": "~1.2",
5655
"contao/manager-bundle": "~4.4"
5756
},
@@ -68,12 +67,6 @@
6867
"extra": {
6968
"contao-manager-plugin": "MetaModels\\CoreBundle\\ContaoManager\\Plugin",
7069
"contao": {
71-
"transifex": {
72-
"project": "metamodels",
73-
"prefix": "core-",
74-
"languages_cto": "src/CoreBundle/Resources/contao/languages",
75-
"languages_tx": ".tx"
76-
},
7770
"runonce": [
7871
"runonce/runonce.php"
7972
]
@@ -82,5 +75,8 @@
8275
"dev-master": "2.0.x-dev",
8376
"dev-feature/contao4": "2.1.x-dev"
8477
}
78+
},
79+
"config": {
80+
"sort-packages": true
8581
}
8682
}

‎ctb.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"transifex": {
3+
"project": "metamodels",
4+
"prefix": "core-",
5+
"languages_cto": "src/CoreBundle/Resources/contao/languages",
6+
"languages_tx": ".tx",
7+
"php-file-header": [
8+
"This file is part of MetaModels/core.",
9+
"",
10+
"(c) 2012-$$year$$ The MetaModels team.",
11+
"",
12+
"For the full copyright and license information, please view the LICENSE",
13+
"file that was distributed with this source code.",
14+
"",
15+
"This project is provided in good faith and hope to be usable by anyone.",
16+
"",
17+
"Translations are managed automatically using Transifex. To create a new translation",
18+
"or to help to maintain an existing one, please register at transifex.com.",
19+
"",
20+
"Last-updated: $$lastchanged$$",
21+
"",
22+
"@copyright 2012-$$year$$ The MetaModels team.",
23+
"@license https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later",
24+
"@link https://www.transifex.com/metamodels/public/",
25+
"@link https://www.transifex.com/signup/?join_project=metamodels"
26+
]
27+
}
28+
}

‎phpunit.xml.dist

+24-29
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
bootstrap="vendor/autoload.php"
12-
>
13-
<testsuites>
14-
<testsuite name="MetaModels core tests">
15-
<directory>./tests/</directory>
16-
</testsuite>
17-
</testsuites>
18-
19-
<groups>
20-
<exclude>
21-
<group>slow</group>
22-
</exclude>
23-
</groups>
24-
25-
<filter>
26-
<whitelist>
27-
<directory>./src/</directory>
28-
</whitelist>
29-
</filter>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
3+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
5+
colors="true"
6+
forceCoversAnnotation="true"
7+
failOnRisky="true"
8+
failOnWarning="true"
9+
beStrictAboutChangesToGlobalState="true"
10+
beStrictAboutOutputDuringTests="true"
11+
beStrictAboutResourceUsageDuringSmallTests="true"
12+
beStrictAboutTodoAnnotatedTests="true"
13+
bootstrap="vendor/autoload.php"
14+
>
15+
<testsuites>
16+
<testsuite name="MetaModels core tests">
17+
<directory>./tests</directory>
18+
</testsuite>
19+
</testsuites>
20+
<filter>
21+
<whitelist>
22+
<directory>./src</directory>
23+
</whitelist>
24+
</filter>
3025
</phpunit>

‎runonce/runonce.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
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 Sven Baumann <[email protected]>
1817
* @copyright 2012-2018 The MetaModels team.
19-
* @license https://github.com/MetaModels/core/LICENSE LGPL-3.0-or-later
18+
* @license https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
2019
* @filesource
2120
*/
2221

‎src/Attribute/AbstractAttributeTypeFactory.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
* @author David Molineus <[email protected]>

‎src/Attribute/AbstractHybrid.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.

‎src/Attribute/AttributeFactory.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.

‎src/Attribute/Base.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 David Maack <[email protected]>

‎src/Attribute/BaseComplex.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.

‎src/Attribute/BaseSimple.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 Maack <[email protected]>
1716
* @author Stefan Heimes <[email protected]>

‎src/Attribute/Events/CollectMetaModelAttributeInformationEvent.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.

‎src/Attribute/Events/CreateAttributeEvent.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.

‎src/Attribute/Events/CreateAttributeFactoryEvent.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.

‎src/Attribute/IAttribute.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 Maack <[email protected]>
1716
* @author Stefan Heimes <[email protected]>

0 commit comments

Comments
 (0)