Skip to content

Commit 8dbdc16

Browse files
baumannsvenbaumannsven
committed
Merge tag '2.0.3' into master
2 parents 97ea264 + a19315d commit 8dbdc16

File tree

15 files changed

+139
-173
lines changed

15 files changed

+139
-173
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@ php:
55
- "7.1"
66
- "7.0"
77
- "5.6"
8-
- "5.5"
9-
- "5.4"
108

119
env:
1210
- CONTAO_VERSION=~3.5.5
1311

14-
# Exclude impossible Contao Version combinations.
15-
matrix:
16-
exclude:
17-
1812
sudo: false
1913

14+
before_install:
15+
- echo "memory_limit = -1" > travis.php.ini && phpenv config-add travis.php.ini
16+
2017
install:
2118
- travis_retry composer self-update && composer --version
2219
- travis_retry composer require contao/core $CONTAO_VERSION --no-update

‎composer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
"source": "https://github.com/MetaModels/attribute_checkbox"
3333
},
3434
"require": {
35-
"php": "^5.4 | ^7.0",
35+
"php": "^5.6 || ^7.0",
3636
"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"
37+
"contao-community-alliance/composer-plugin": "^2.0",
38+
"contao-community-alliance/dc-general": "^2.0@beta",
39+
"metamodels/core": "^2.0"
4040
},
4141
"require-dev": {
42-
"cyberspectrum/contao-toolbox": "~0.6",
43-
"phpcq/all-tasks": "~1.1"
42+
"cyberspectrum/contao-toolbox": "^0.6",
43+
"phpcq/all-tasks": "^1.2"
4444
},
4545
"autoload": {
4646
"psr-0": {

‎contao/config/autoload.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2016 The MetaModels team.
6+
* (c) 2012-2018 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.
@@ -14,15 +14,17 @@
1414
* @subpackage AttributeCheckbox
1515
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1616
* @author Andreas Isaak <info@andreas-isaak.de>
17-
* @copyright 2012-2016 The MetaModels team.
17+
* @author Sven Baumann <baumann.sv@gmail.com>
18+
* @copyright 2012-2018 The MetaModels team.
1819
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0
1920
* @filesource
2021
*/
2122

2223
/**
2324
* Register the templates
2425
*/
25-
TemplateLoader::addFiles(array
26-
(
26+
TemplateLoader::addFiles(
27+
[
2728
'mm_attr_checkbox' => 'system/modules/metamodelsattribute_checkbox/templates',
28-
));
29+
]
30+
);

‎contao/config/database.sql‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎contao/dca/tl_metamodel_attribute.php‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2016 The MetaModels team.
6+
* (c) 2012-2018 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.
@@ -18,81 +18,75 @@
1818
* @author David Maack <maack@men-at-work.de>
1919
* @author Stefan Heimes <stefan_heimes@hotmail.com>
2020
* @author Sven Baumann <baumann.sv@gmail.com>
21-
* @copyright 2012-2016 The MetaModels team.
21+
* @author Ingolf Steinhardt <info@e-spin.de>
22+
* @copyright 2012-2018 The MetaModels team.
2223
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0
2324
* @filesource
2425
*/
2526

26-
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['metapalettes']['checkbox extends _simpleattribute_'] = array
27-
(
28-
'+advanced' => array('check_publish', 'check_listview')
29-
);
27+
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['metapalettes']['checkbox extends _simpleattribute_'] = [
28+
'+advanced' => ['check_publish', 'check_listview']
29+
];
3030

31-
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['metasubpalettes'] = array
32-
(
33-
'check_listview' => array('check_inverse', 'check_listviewicon', 'check_listviewicondisabled')
34-
);
31+
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['metasubpalettes'] = [
32+
'check_listview' => ['check_inverse', 'check_listviewicon', 'check_listviewicondisabled']
33+
];
3534

36-
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_publish'] = array
37-
(
35+
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_publish'] = [
3836
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_publish'],
3937
'exclude' => true,
4038
'inputType' => 'checkbox',
41-
'eval' => array
42-
(
39+
'sql' => 'char(1) NOT NULL default \'\'',
40+
'eval' => [
4341
'tl_class' => 'w50'
44-
),
45-
);
42+
],
43+
];
4644

47-
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_listview'] = array
48-
(
45+
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_listview'] = [
4946
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_listview'],
5047
'exclude' => true,
5148
'inputType' => 'checkbox',
52-
'eval' => array
53-
(
49+
'sql' => 'char(1) NOT NULL default \'\'',
50+
'eval' => [
5451
'tl_class' => 'w50',
5552
'submitOnChange' => true
56-
),
57-
);
53+
],
54+
];
5855

59-
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_inverse'] = array
60-
(
56+
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_inverse'] = [
6157
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_inverse'],
6258
'exclude' => true,
6359
'inputType' => 'checkbox',
64-
'eval' => array
65-
(
66-
'tl_class' => 'w50 cbx'
67-
),
68-
);
60+
'sql' => 'char(1) NOT NULL default \'\'',
61+
'eval' => [
62+
'tl_class' => 'w50 cbx'
63+
],
64+
];
6965

70-
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_listviewicon'] = array
71-
(
66+
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_listviewicon'] = [
7267
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_listviewicon'],
7368
'exclude' => true,
7469
'inputType' => 'fileTree',
75-
'eval' => array
76-
(
70+
'sql' => 'blob NULL',
71+
'eval' => [
7772
'fieldType' => 'radio',
7873
'files' => true,
7974
'filesOnly' => true,
8075
'extensions' => 'jpg,jpeg,gif,png,tif,tiff,svg',
8176
'tl_class' => 'clr'
82-
)
83-
);
77+
]
78+
];
8479

85-
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_listviewicondisabled'] = array
86-
(
80+
$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_listviewicondisabled'] = [
8781
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_listviewicondisabled'],
8882
'exclude' => true,
8983
'inputType' => 'fileTree',
90-
'eval' => array
91-
(
84+
'sql' => 'blob NULL',
85+
'eval' => [
9286
'fieldType' => 'radio',
9387
'files' => true,
9488
'filesOnly' => true,
9589
'extensions' => 'jpg,jpeg,gif,png,tif,tiff,svg',
9690
'tl_class' => 'clr'
97-
)
98-
);
91+
]
92+
];

‎contao/dca/tl_metamodel_dcasetting.php‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2016 The MetaModels team.
6+
* (c) 2012-2018 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.
@@ -17,24 +17,21 @@
1717
* @author Carolina M. Koehn <office@kikmedia.de>
1818
* @author David Maack <maack@men-at-work.de>
1919
* @author Stefan Heimes <stefan_heimes@hotmail.com>
20-
* @copyright 2012-2016 The MetaModels team.
20+
* @author Sven Baumann <baumann.sv@gmail.com>
21+
* @copyright 2012-2018 The MetaModels team.
2122
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0
2223
* @filesource
2324
*/
2425

25-
$GLOBALS['TL_DCA']['tl_metamodel_dcasetting']['metasubselectpalettes']['attr_id']['checkbox'] = array
26-
(
27-
'presentation' => array
28-
(
26+
$GLOBALS['TL_DCA']['tl_metamodel_dcasetting']['metasubselectpalettes']['attr_id']['checkbox'] = [
27+
'presentation' => [
2928
'tl_class'
30-
),
31-
'functions' => array
32-
(
29+
],
30+
'functions' => [
3331
'mandatory',
3432
'submitOnChange'
35-
),
36-
'overview' => array
37-
(
33+
],
34+
'overview' => [
3835
'filterable',
39-
)
40-
);
36+
]
37+
];

‎contao/dca/tl_metamodel_filtersetting.php‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2016 The MetaModels team.
6+
* (c) 2012-2018 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.
@@ -16,38 +16,37 @@
1616
* @author Andreas Isaak <info@andreas-isaak.de>
1717
* @author David Maack <maack@men-at-work.de>
1818
* @author Stefan Heimes <stefan_heimes@hotmail.com>
19-
* @copyright 2012-2016 The MetaModels team.
19+
* @author Ingolf Steinhardt <info@e-spin.de>
20+
* @author Sven Baumann <baumann.sv@gmail.com>
21+
* @copyright 2012-2018 The MetaModels team.
2022
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0
2123
* @filesource
2224
*/
2325

2426
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox_published extends _attribute_']['+config'] =
25-
array
26-
(
27+
[
2728
'check_ignorepublished',
2829
'check_allowpreview'
29-
);
30+
];
3031

31-
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['check_ignorepublished'] = array
32-
(
32+
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['check_ignorepublished'] = [
3333
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['check_ignorepublished'],
3434
'exclude' => true,
3535
'inputType' => 'checkbox',
36-
'eval' => array
37-
(
36+
'sql' => 'char(1) NOT NULL default \'\'',
37+
'eval' => [
3838
'alwaysSave' => true,
3939
'tl_class' => 'w50 m12',
40-
),
41-
);
40+
],
41+
];
4242

43-
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['check_allowpreview'] = array
44-
(
43+
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['check_allowpreview'] = [
4544
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['check_allowpreview'],
4645
'exclude' => true,
4746
'inputType' => 'checkbox',
48-
'eval' => array
49-
(
47+
'sql' => 'char(1) NOT NULL default \'\'',
48+
'eval' => [
5049
'alwaysSave' => true,
5150
'tl_class' => 'w50 m12',
52-
),
53-
);
51+
],
52+
];

‎contao/languages/de/tl_metamodel_attribute.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
1010
*
11-
* last-updated: 2018-02-06T02:49:29+01:00
11+
* last-updated: 2018-03-29T01:35:33+02:00
1212
*/
1313

1414
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_inverse']['0'] = 'Invertierte Anzeigeoption';
@@ -21,5 +21,5 @@
2121
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_listviewicondisabled']['1'] = 'Dieses Icon wird in der Listenanzeige des Backends für den Status "inaktiv" gezeigt.';
2222
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_publish']['0'] = 'Veröffentlichen';
2323
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_publish']['1'] = 'Falls aktiviert, werden die Datensätze im Frontend angezeigt. Gleichzeitig ist in der Backend-Ansicht das Symbol \'Auge\' verfügbar, mit dem die Veröffentlichung eines Datensatzes ebenfalls gesteuert werden kann.';
24-
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['typeOptions']['checkbox'] = 'Kontrollkästchen (Checkbox)';
24+
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['typeOptions']['checkbox'] = 'Checkbox';
2525

‎src/MetaModels/Attribute/Checkbox/AttributeTypeFactory.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2016 The MetaModels team.
6+
* (c) 2012-2018 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.
@@ -13,7 +13,8 @@
1313
* @package MetaModels
1414
* @subpackage AttributeCheckbox
1515
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
16-
* @copyright 2012-2016 The MetaModels team.
16+
* @author Sven Baumann <baumann.sv@gmail.com>
17+
* @copyright 2012-2018 The MetaModels team.
1718
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0
1819
* @filesource
1920
*/
@@ -36,6 +37,6 @@ public function __construct()
3637

3738
$this->typeName = 'checkbox';
3839
$this->typeIcon = 'system/modules/metamodelsattribute_checkbox/html/checkbox.png';
39-
$this->typeClass = 'MetaModels\Attribute\Checkbox\Checkbox';
40+
$this->typeClass = Checkbox::class;
4041
}
4142
}

0 commit comments

Comments
 (0)