Skip to content

Commit d213f1a

Browse files
discordierdiscordier
committed
Merge tag '2.0.4'
Maintenance release Code and build cosmetics
2 parents de8fe82 + 93e9825 commit d213f1a

File tree

11 files changed

+110
-75
lines changed

11 files changed

+110
-75
lines changed

‎.check-author.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ignore:
2-
# Mini Model <minimodel@metamodel.me>
2+
- 'Mini Model <minimodel@metamodel.me>'
33

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

77
mapping:
8-
"Andreas Isaak <info@andreas-isaak.de>": "Andreas Isaak <andy.jared@googlemail.com>"
8+
'Andreas Isaak <info@andreas-isaak.de>': 'Andreas Isaak <andy.jared@googlemail.com>'

‎.gitattributes‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.check-author.yml
1+
.check-author.yml export-ignore
22
.gitattributes export-ignore
33
.gitignore export-ignore
44
.travis.yml export-ignore
@@ -7,3 +7,4 @@ build.xml export-ignore
77
phpunit.xml.dist export-ignore
88
/.github export-ignore
99
/tests export-ignore
10+
ctb.json export-ignore

‎.travis.yml‎

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

310
php:
11+
- "7.3"
412
- "7.2"
513
- "7.1"
614
- "7.0"
@@ -9,18 +17,31 @@ php:
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: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@
3232
},
3333
"require": {
3434
"php": "^5.6 || ^7.0",
35+
"contao-community-alliance/composer-plugin": "^2.4",
36+
"contao-community-alliance/dc-general": "^2.0.0",
3537
"contao/core": "^3.5.5",
36-
"contao-community-alliance/composer-plugin": "~2.0",
37-
"contao-community-alliance/dc-general": "~2.0@beta",
38-
"metamodels/core": "~2.0@alpha"
38+
"metamodels/core": "^2.0"
3939
},
4040
"require-dev": {
41-
"cyberspectrum/contao-toolbox": "~0.6",
42-
"phpcq/all-tasks": "~1.1"
41+
"phpcq/all-tasks": "^1.2"
4342
},
4443
"autoload": {
4544
"psr-0": {
@@ -50,17 +49,14 @@
5049
"contao": {
5150
"sources": {
5251
"contao": "system/modules/metamodelsfilter_checkbox"
53-
},
54-
"transifex": {
55-
"project": "metamodels",
56-
"prefix": "filter_checkbox-",
57-
"languages_cto": "contao/languages",
58-
"languages_tx": ".tx"
5952
}
6053
},
6154
"branch-alias": {
6255
"dev-master": "2.0.x-dev",
6356
"dev-develop": "2.1.x-dev"
6457
}
58+
},
59+
"config": {
60+
"sort-packages": true
6561
}
6662
}

‎contao/config/event_listeners.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
/**
44
* This file is part of MetaModels/filter_checkbox.
55
*
6-
* (c) 2012-2016 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
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage FilterCheckbox
13+
* @package MetaModels/filter_checkbox
1514
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
16-
* @copyright 2012-2016 The MetaModels team.
17-
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0
15+
* @copyright 2012-2019 The MetaModels team.
16+
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0-or-later
1817
* @filesource
1918
*/
2019

‎contao/dca/tl_metamodel_filtersetting.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@
33
/**
44
* This file is part of MetaModels/filter_checkbox.
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
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage FilterCheckbox
13+
* @package MetaModels/filter_checkbox
1514
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1615
* @author Andreas Isaak <info@andreas-isaak.de>
1716
* @author David Molineus <mail@netzmacht.de>
1817
* @author Christian de la Haye <service@delahaye.de>
1918
* @author Ingolf Steinhardt <info@e-spin.de>
20-
* @copyright 2012-2018 The MetaModels team.
19+
* @copyright 2012-2019 The MetaModels team.
2120
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0-or-later
2221
* @filesource
2322
*/

‎ctb.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"transifex": {
3+
"project": "metamodels",
4+
"prefix": "filter_checkbox-",
5+
"languages_cto": "contao/languages",
6+
"languages_tx": ".tx",
7+
"php-file-header": [
8+
"This file is part of MetaModels/filter_checkbox.",
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/filter_checkbox/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‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +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-
syntaxCheck="false"
12-
bootstrap="tests/bootstrap.php"
13-
>
14-
<testsuites>
15-
<testsuite name="MetaModels filter checkbox tests">
16-
<directory>./tests/MetaModels/</directory>
17-
</testsuite>
18-
</testsuites>
19-
20-
<groups>
21-
<exclude>
22-
<group>slow</group>
23-
</exclude>
24-
</groups>
25-
26-
<filter>
27-
<whitelist>
28-
<directory>./src/</directory>
29-
</whitelist>
30-
</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 filter for checkbox tests">
17+
<directory>./tests</directory>
18+
</testsuite>
19+
</testsuites>
20+
<filter>
21+
<whitelist>
22+
<directory>./src</directory>
23+
</whitelist>
24+
</filter>
3125
</phpunit>

‎src/MetaModels/Filter/Setting/Checkbox.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,23 @@
33
/**
44
* This file is part of MetaModels/filter_checkbox.
55
*
6-
* (c) 2012-2017 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
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage FilterCheckbox
13+
* @package MetaModels/filter_checkbox
1514
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1615
* @author Christian de la Haye <service@delahaye.de>
1716
* @author Andreas Isaak <info@andreas-isaak.de>
1817
* @author Andreas Nölke <zero@brothers-project.de>
1918
* @author David Molineus <mail@netzmacht.de>
2019
* @author Stefan Heimes <stefan_heimes@hotmail.com>
2120
* @author Ingolf Steinhardt <info@e-spin.de>
22-
* @copyright 2012-2017 The MetaModels team.
23-
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0
21+
* @copyright 2012-2019 The MetaModels team.
22+
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0-or-later
2423
* @filesource
2524
*/
2625

‎src/MetaModels/Filter/Setting/CheckboxFilterSettingTypeFactory.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
/**
44
* This file is part of MetaModels/filter_checkbox.
55
*
6-
* (c) 2012-2016 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
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage FilterCheckbox
13+
* @package MetaModels/filter_checkbox
1514
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
16-
* @copyright 2012-2016 The MetaModels team.
17-
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0
15+
* @copyright 2012-2019 The MetaModels team.
16+
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0-or-later
1817
* @filesource
1918
*/
2019

0 commit comments

Comments
 (0)