Skip to content

Commit 30526a1

Browse files
baumannsvenbaumannsven
committed
Merge tag '2.0.6' into master
Maintenance release Code and build cosmetics
2 parents ed4cb61 + c708219 commit 30526a1

File tree

18 files changed

+143
-133
lines changed

18 files changed

+143
-133
lines changed

‎.check-author.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
# Paths to exclude from scanning (equivalent to cmd line parameter --exclude=...)
21
exclude:
32
- contao/languages
3+
- /^contao\/languages/
4+
5+
ignore:
6+
- 'Mini Model <minimodel@metamodel.me>'

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
.gitattributes export-ignore
33
.gitignore export-ignore
44
.travis.yml export-ignore
5-
travis.php.ini export-ignore
65
build.default.properties export-ignore
76
build.xml export-ignore
87
phpunit.xml.dist export-ignore
98
/.github export-ignore
109
/tests export-ignore
10+
ctb.json export-ignore

‎.travis.yml‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,47 @@
1+
dist: xenial
2+
3+
addons:
4+
apt:
5+
packages:
6+
- ant-optional
7+
18
language: php
29

310
php:
4-
- "5.6"
5-
- "7.0"
6-
- "7.1"
11+
- "7.3"
712
- "7.2"
13+
- "7.1"
14+
- "7.0"
15+
- "5.6"
816

917
env:
1018
- CONTAO_VERSION=~3.5.5
1119

12-
sudo: false
13-
14-
before_install:
15-
- echo "memory_limit = -1" > travis.php.ini && phpenv config-add travis.php.ini
16-
17-
install:
20+
before_script:
21+
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
1822
- travis_retry composer self-update && composer --version
1923
- travis_retry composer require contao/core $CONTAO_VERSION --no-update
24+
- >
25+
if [ "x${TRAVIS_TAG}" != "x" ]; then
26+
export COMPOSER_ROOT_VERSION=${TRAVIS_TAG}
27+
else
28+
export COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ hotfix/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
29+
&& echo ${BASH_REMATCH[1]} \
30+
|| echo dev-${TRAVIS_BRANCH})
31+
fi
32+
- echo "Using root version ${COMPOSER_ROOT_VERSION}"
2033
- travis_retry composer update --prefer-dist --no-interaction
2134

2235
script: ant -keep-going
2336

2437
# Hack to make things work again - we can not use a shallow repository.
2538
git:
2639
depth: 2147483647
40+
41+
branches:
42+
except:
43+
- /.*-translation/
44+
45+
cache:
46+
directories:
47+
- vendor

‎composer.json‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,14 @@
3333
},
3434
"require": {
3535
"php": "^5.6 || ^7.0",
36+
"contao-community-alliance/composer-plugin": "^2.4",
37+
"contao-community-alliance/dc-general": "^2.0.0",
3638
"contao/core": "^3.5.5",
37-
"contao-community-alliance/composer-plugin": "~2.0",
38-
"contao-community-alliance/dc-general": "~2.0@beta",
39-
"metamodels/core": "~2.0@alpha"
39+
"metamodels/core": "^2.0"
4040
},
4141
"require-dev": {
42-
"cyberspectrum/contao-toolbox": "~0.6",
43-
"phpcq/all-tasks": "~1.1",
44-
"metamodels/base-unit-tests": "^1.0.4"
42+
"metamodels/base-unit-tests": "^1.0.4",
43+
"phpcq/all-tasks": "^1.2"
4544
},
4645
"autoload": {
4746
"psr-0": {
@@ -52,18 +51,15 @@
5251
"contao": {
5352
"symlinks": {
5453
"contao": "system/modules/metamodelsattribute_translatedfile"
55-
},
56-
"transifex": {
57-
"project": "metamodels",
58-
"prefix": "attribute_translatedfile-",
59-
"languages_cto": "contao/languages",
60-
"languages_tx": ".tx"
6154
}
6255
},
6356
"branch-alias": {
6457
"dev-master": "2.0.x-dev",
6558
"dev-develop": "2.1.x-dev"
6659
}
6760
},
68-
"prefer-stable": true
61+
"prefer-stable": true,
62+
"config": {
63+
"sort-packages": true
64+
}
6965
}

‎contao/config/autoload.php‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,19 @@
33
/**
44
* This file is part of MetaModels/attribute_translatedfile.
55
*
6-
* (c) 2012-2018 The MetaModels team.
6+
* (c) 2012-2019 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
1010
*
11-
* The MetaModels extension allows the creation of multiple collections of custom items,
12-
* each with its own unique set of selectable attributes, with attribute extendability.
13-
* The Front-End modules allow you to build powerful listing and filtering of the
14-
* data in each collection.
11+
* This project is provided in good faith and hope to be usable by anyone.
1512
*
16-
* @package MetaModels
17-
* @subpackage AttributeTranslatedFile
13+
* @package MetaModels/attribute_translatedfile
1814
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1915
* @author Andreas Isaak <andy.jared@googlemail.com>
2016
* @author David Greminger <david.greminger@1up.io>
2117
* @author Sven Baumann <baumann.sv@gmail.com>
22-
* @copyright 2012-2018 The MetaModels team.
18+
* @copyright 2012-2019 The MetaModels team.
2319
* @license https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
2420
* @filesource
2521
*/

‎contao/config/event_listeners.php‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,18 @@
33
/**
44
* This file is part of MetaModels/attribute_translatedfile.
55
*
6-
* (c) 2012-2018 The MetaModels team.
6+
* (c) 2012-2019 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
1010
*
11-
* The MetaModels extension allows the creation of multiple collections of custom items,
12-
* each with its own unique set of selectable attributes, with attribute extendability.
13-
* The Front-End modules allow you to build powerful listing and filtering of the
14-
* data in each collection.
11+
* This project is provided in good faith and hope to be usable by anyone.
1512
*
16-
* @package MetaModels
17-
* @subpackage AttributeTranslatedFile
18-
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
19-
* @author Sven Baumann <baumann.sv@gmail.com>
20-
* @copyright 2012-2018 The MetaModels team.
21-
* @license https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
13+
* @package MetaModels/attribute_translatedfile
14+
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
15+
* @author Sven Baumann <baumann.sv@gmail.com>
16+
* @copyright 2012-2019 The MetaModels team.
17+
* @license https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
2218
* @filesource
2319
* @filesource
2420
*/

‎contao/dca/tl_metamodel_attribute.php‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,20 @@
33
/**
44
* This file is part of MetaModels/attribute_translatedfile.
55
*
6-
* (c) 2012-2018 The MetaModels team.
6+
* (c) 2012-2019 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
1010
*
11-
* The MetaModels extension allows the creation of multiple collections of custom items,
12-
* each with its own unique set of selectable attributes, with attribute extendability.
13-
* The Front-End modules allow you to build powerful listing and filtering of the
14-
* data in each collection.
11+
* This project is provided in good faith and hope to be usable by anyone.
1512
*
16-
* @package MetaModels
17-
* @subpackage AttributeTranslatedFile
13+
* @package MetaModels/attribute_translatedfile
1814
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1915
* @author Stefan heimes <stefan_heimes@hotmail.com>
2016
* @author Andreas Isaak <andy.jared@googlemail.com>
2117
* @author David Greminger <david.greminger@1up.io>
2218
* @author Sven Baumann <baumann.sv@gmail.com>
23-
* @copyright 2012-2018 The MetaModels team.
19+
* @copyright 2012-2019 The MetaModels team.
2420
* @license https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
2521
* @filesource
2622
* @filesource

‎contao/dca/tl_metamodel_dcasetting.php‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,20 @@
33
/**
44
* This file is part of MetaModels/attribute_translatedfile.
55
*
6-
* (c) 2012-2018 The MetaModels team.
6+
* (c) 2012-2019 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
1010
*
11-
* The MetaModels extension allows the creation of multiple collections of custom items,
12-
* each with its own unique set of selectable attributes, with attribute extendability.
13-
* The Front-End modules allow you to build powerful listing and filtering of the
14-
* data in each collection.
11+
* This project is provided in good faith and hope to be usable by anyone.
1512
*
16-
* @package MetaModels
17-
* @subpackage AttributeTranslatedFile
13+
* @package MetaModels/attribute_translatedfile
1814
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
19-
* @author Stefan heimes <stefan_heimes@hotmail.com>
15+
* @author Stefan Heimes <stefan_heimes@hotmail.com>
2016
* @author Andreas Isaak <andy.jared@googlemail.com>
21-
* @author Carolina M. Koehn <office@kikmedia.de>
2217
* @author David Greminger <david.greminger@1up.io>
2318
* @author Sven Baumann <baumann.sv@gmail.com>
24-
* @copyright 2012-2018 The MetaModels team.
19+
* @copyright 2012-2019 The MetaModels team.
2520
* @license https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
2621
* @filesource
2722
* @filesource

‎contao/dca/tl_metamodel_rendersetting.php‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,20 @@
33
/**
44
* This file is part of MetaModels/attribute_translatedfile.
55
*
6-
* (c) 2012-2018 The MetaModels team.
6+
* (c) 2012-2019 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
1010
*
11-
* The MetaModels extension allows the creation of multiple collections of custom items,
12-
* each with its own unique set of selectable attributes, with attribute extendability.
13-
* The Front-End modules allow you to build powerful listing and filtering of the
14-
* data in each collection.
11+
* This project is provided in good faith and hope to be usable by anyone.
1512
*
16-
* @package MetaModels
17-
* @subpackage AttributeTranslatedFile
13+
* @package MetaModels/attribute_translatedfile
1814
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1915
* @author Stefan heimes <stefan_heimes@hotmail.com>
2016
* @author Andreas Isaak <andy.jared@googlemail.com>
2117
* @author David Greminger <david.greminger@1up.io>
2218
* @author Sven Baumann <baumann.sv@gmail.com>
23-
* @copyright 2012-2018 The MetaModels team.
19+
* @copyright 2012-2019 The MetaModels team.
2420
* @license https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
2521
* @filesource
2622
*/

‎contao/dca/tl_metamodel_translatedlongblob.php‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,16 @@
33
/**
44
* This file is part of MetaModels/attribute_translatedfile.
55
*
6-
* (c) 2012-2018 The MetaModels team.
6+
* (c) 2012-2019 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
1010
*
11-
* The MetaModels extension allows the creation of multiple collections of custom items,
12-
* each with its own unique set of selectable attributes, with attribute extendability.
13-
* The Front-End modules allow you to build powerful listing and filtering of the
14-
* data in each collection.
11+
* This project is provided in good faith and hope to be usable by anyone.
1512
*
16-
* @package MetaModels
17-
* @subpackage AttributeTranslatedFile
13+
* @package MetaModels/attribute_translatedfile
1814
* @author Sven Baumann <baumann.sv@gmail.com>
19-
* @copyright 2012-2018 The MetaModels team.
15+
* @copyright 2012-2019 The MetaModels team.
2016
* @license https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
2117
* @filesource
2218
* @filesource

0 commit comments

Comments
 (0)