Skip to content

Commit af78e97

Browse files
doishubdoishub
authored
Merge pull request #46 from rabauss/feature/php8
Fix php8 compat
2 parents b51a5f3 + b0eaf4c commit af78e97

10 files changed

+123
-7
lines changed

‎src/Resources/contao/classes/StyleManager.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public static function updateClasses($varValue, $dc)
145145

146146
if(self::isMultipleField($dc->field))
147147
{
148-
$varValue = array($cssID[0], $varValue);
148+
$varValue = serialize(array($cssID[0], $varValue));
149149
}
150150

151151
return $varValue;

‎src/Resources/contao/classes/Sync.php

+6
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,12 @@ public function exportStyleManager(\DataContainer $dc)
330330
// Archives
331331
$objArchive = StyleManagerArchiveModel::findAll(['order' => 'groupAlias,sorting']);
332332

333+
if (null === $objArchive)
334+
{
335+
\Message::addError($GLOBALS['TL_LANG']['ERR']['noStyleManagerConfigFound']);
336+
self::redirect(self::getReferer());
337+
}
338+
333339
// Root element
334340
$archives = $xml->createElement('archives');
335341
$archives = $xml->appendChild($archives);

‎src/Resources/contao/dca/tl_style_manager_archive.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@
4949
(
5050
'import' => array
5151
(
52+
'label' => &$GLOBALS['TL_LANG']['tl_style_manager_archive']['import'],
5253
'href' => 'key=import',
5354
'class' => 'header_style_manager_import',
5455
'icon' => 'theme_import.svg'
5556
),
5657
'export' => array
5758
(
59+
'label' => &$GLOBALS['TL_LANG']['tl_style_manager_archive']['export'],
5860
'href' => 'key=export',
5961
'class' => 'header_style_manager_export',
6062
'icon' => 'theme_export.svg'
@@ -71,6 +73,7 @@
7173
(
7274
'edit' => array
7375
(
76+
'label' => &$GLOBALS['TL_LANG']['tl_style_manager_archive']['edit'],
7477
'href' => 'table=tl_style_manager',
7578
'icon' => 'edit.svg'
7679
),
@@ -219,7 +222,7 @@ public function addIdentifierInfo($row, $label, DataContainer $dc, $args)
219222
public function checkIdentifier($dc){
220223
$objArchive = StyleManagerArchiveModel::findById($dc->id);
221224

222-
if($objArchive->identifier)
225+
if(null !== $objArchive && $objArchive->identifier)
223226
{
224227
$GLOBALS['TL_DCA']['tl_style_manager_archive']['fields']['identifier']['eval']['mandatory'] = false;
225228
$GLOBALS['TL_DCA']['tl_style_manager_archive']['fields']['identifier']['eval']['disabled'] = true;

‎src/Resources/contao/languages/de/default.xlf

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<source>The Alias &quot;%s&quot; already exists within this category!</source>
1010
<target>Der Alias &quot;%s&quot; existiert bereits innerhalb dieser Kategorie!</target>
1111
</trans-unit>
12+
<trans-unit id="ERR.noStyleManagerConfigFound">
13+
<source>No style manager config found!</source>
14+
<target>Keine Konfiguration für den Style-Manager gefunden!</target>
15+
</trans-unit>
1216
</body>
1317
</file>
1418
</xliff>

‎src/Resources/contao/languages/de/tl_style_manager.xlf

+20
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,38 @@
3434
<source>New css group</source>
3535
<target>Neue CSS-Gruppe</target>
3636
</trans-unit>
37+
<trans-unit id="tl_style_manager.new.1">
38+
<source>Create a new css group.</source>
39+
<target>Neue CSS-Gruppe erstellen.</target>
40+
</trans-unit>
41+
<trans-unit id="tl_style_manager.editheader.0">
42+
<source>Edit group</source>
43+
<target>Gruppe bearbeiten</target>
44+
</trans-unit>
3745
<trans-unit id="tl_style_manager.editheader.1">
3846
<source>Edit group</source>
3947
<target>Gruppe bearbeiten</target>
4048
</trans-unit>
49+
<trans-unit id="tl_style_manager.copy.0">
50+
<source>Copy group</source>
51+
<target>Gruppe kopieren</target>
52+
</trans-unit>
4153
<trans-unit id="tl_style_manager.copy.1">
4254
<source>Copy group</source>
4355
<target>Gruppe kopieren</target>
4456
</trans-unit>
57+
<trans-unit id="tl_style_manager.delete.0">
58+
<source>Delete group</source>
59+
<target>Gruppe löschen</target>
60+
</trans-unit>
4561
<trans-unit id="tl_style_manager.delete.1">
4662
<source>Delete group</source>
4763
<target>Gruppe löschen</target>
4864
</trans-unit>
65+
<trans-unit id="tl_style_manager.show.0">
66+
<source>Show group info</source>
67+
<target>Gruppeinformationen anzeigen</target>
68+
</trans-unit>
4969
<trans-unit id="tl_style_manager.show.1">
5070
<source>Show group info</source>
5171
<target>Gruppeinformationen anzeigen</target>

‎src/Resources/contao/languages/de/tl_style_manager_archive.xlf

+36
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,26 @@
1414
<source>Add category</source>
1515
<target>Neue Kategorie</target>
1616
</trans-unit>
17+
<trans-unit id="tl_style_manager_archive.new.1">
18+
<source>Create new category</source>
19+
<target>Neue Kategorie erstellen.</target>
20+
</trans-unit>
1721
<trans-unit id="tl_style_manager_archive.import.0">
1822
<source>Import</source>
1923
<target>Importieren</target>
2024
</trans-unit>
25+
<trans-unit id="tl_style_manager_archive.import.1">
26+
<source>Import a config</source>
27+
<target>Konfiguration importieren</target>
28+
</trans-unit>
2129
<trans-unit id="tl_style_manager_archive.export.0">
2230
<source>Export</source>
2331
<target>Exportieren</target>
2432
</trans-unit>
33+
<trans-unit id="tl_style_manager_archive.export.1">
34+
<source>Export a config</source>
35+
<target>Konfiguration exportieren</target>
36+
</trans-unit>
2537
<trans-unit id="tl_style_manager_archive.source.0">
2638
<source>Source files</source>
2739
<target>Quelldateien</target>
@@ -30,18 +42,42 @@
3042
<source>Here you can upload one .xml file to be imported.</source>
3143
<target>Hier können Sie eine .xml-Datei für den Import hochladen.</target>
3244
</trans-unit>
45+
<trans-unit id="tl_style_manager_archive.editheader.0">
46+
<source>Edit category</source>
47+
<target>Kategorie bearbeiten</target>
48+
</trans-unit>
3349
<trans-unit id="tl_style_manager_archive.editheader.1">
3450
<source>Edit category</source>
3551
<target>Kategorie bearbeiten</target>
3652
</trans-unit>
53+
<trans-unit id="tl_style_manager_archive.edit.0">
54+
<source>Edit group</source>
55+
<target>Gruppe bearbeiten</target>
56+
</trans-unit>
57+
<trans-unit id="tl_style_manager_archive.edit.1">
58+
<source>Edit group</source>
59+
<target>Gruppe bearbeiten</target>
60+
</trans-unit>
61+
<trans-unit id="tl_style_manager_archive.copy.0">
62+
<source>Copy category</source>
63+
<target>Kategorie kopieren</target>
64+
</trans-unit>
3765
<trans-unit id="tl_style_manager_archive.copy.1">
3866
<source>Copy category</source>
3967
<target>Kategorie kopieren</target>
4068
</trans-unit>
69+
<trans-unit id="tl_style_manager_archive.delete.0">
70+
<source>Delete category</source>
71+
<target>Kategorie löschen</target>
72+
</trans-unit>
4173
<trans-unit id="tl_style_manager_archive.delete.1">
4274
<source>Delete category</source>
4375
<target>Kategorie löschen</target>
4476
</trans-unit>
77+
<trans-unit id="tl_style_manager_archive.show.0">
78+
<source>Show category info</source>
79+
<target>Kategorieinformatinoen anzeigen</target>
80+
</trans-unit>
4581
<trans-unit id="tl_style_manager_archive.show.1">
4682
<source>Show category info</source>
4783
<target>Kategorieinformatinoen anzeigen</target>

‎src/Resources/contao/languages/en/default.xlf

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
<trans-unit id="ERR.identifierExists">
55
<source>The Identifier &quot;%s&quot; already exists!</source>
66
</trans-unit>
7+
<trans-unit id="ERR.groupAliasExists">
8+
<source>The Alias &quot;%s&quot; already exists within this category!</source>
9+
</trans-unit>
10+
<trans-unit id="ERR.noStyleManagerConfigFound">
11+
<source>No style manager config found!</source>
12+
</trans-unit>
713
</body>
814
</file>
915
</xliff>

‎src/Resources/contao/languages/en/tl_style_manager.xlf

+16-1
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,35 @@
2121
<source>Title / Description</source>
2222
</trans-unit>
2323
<trans-unit id="tl_style_manager.noStylesDefined">
24-
<source>No styles have yet been defined yet for this area.</source>
24+
<source>No styles are defined for this area.</source>
2525
</trans-unit>
2626
<trans-unit id="tl_style_manager.new.0">
2727
<source>New css group</source>
2828
</trans-unit>
29+
<trans-unit id="tl_style_manager.new.1">
30+
<source>Create a new css group.</source>
31+
</trans-unit>
32+
<trans-unit id="tl_style_manager.editheader.0">
33+
<source>Edit group</source>
34+
</trans-unit>
2935
<trans-unit id="tl_style_manager.editheader.1">
3036
<source>Edit group</source>
3137
</trans-unit>
38+
<trans-unit id="tl_style_manager.copy.0">
39+
<source>Copy group</source>
40+
</trans-unit>
3241
<trans-unit id="tl_style_manager.copy.1">
3342
<source>Copy group</source>
3443
</trans-unit>
44+
<trans-unit id="tl_style_manager.delete.0">
45+
<source>Delete group</source>
46+
</trans-unit>
3547
<trans-unit id="tl_style_manager.delete.1">
3648
<source>Delete group</source>
3749
</trans-unit>
50+
<trans-unit id="tl_style_manager.show.0">
51+
<source>Show group info</source>
52+
</trans-unit>
3853
<trans-unit id="tl_style_manager.show.1">
3954
<source>Show group info</source>
4055
</trans-unit>

‎src/Resources/contao/languages/en/tl_style_manager_archive.xlf

+28-1
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,62 @@
1111
<trans-unit id="tl_style_manager_archive.new.0">
1212
<source>Add category</source>
1313
</trans-unit>
14+
<trans-unit id="tl_style_manager_archive.new.1">
15+
<source>Create new category</source>
16+
</trans-unit>
1417
<trans-unit id="tl_style_manager_archive.import.0">
1518
<source>Import</source>
1619
</trans-unit>
20+
<trans-unit id="tl_style_manager_archive.import.1">
21+
<source>Import a config</source>
22+
</trans-unit>
1723
<trans-unit id="tl_style_manager_archive.export.0">
1824
<source>Export</source>
1925
</trans-unit>
26+
<trans-unit id="tl_style_manager_archive.export.1">
27+
<source>Export a config</source>
28+
</trans-unit>
2029
<trans-unit id="tl_style_manager_archive.source.0">
2130
<source>Source files</source>
2231
</trans-unit>
2332
<trans-unit id="tl_style_manager_archive.source.1">
2433
<source>Here you can upload one .xml file to be imported.</source>
2534
</trans-unit>
35+
<trans-unit id="tl_style_manager_archive.editheader.0">
36+
<source>Edit category</source>
37+
</trans-unit>
2638
<trans-unit id="tl_style_manager_archive.editheader.1">
2739
<source>Edit category</source>
2840
</trans-unit>
41+
<trans-unit id="tl_style_manager_archive.edit.0">
42+
<source>Edit group</source>
43+
</trans-unit>
44+
<trans-unit id="tl_style_manager_archive.edit.1">
45+
<source>Edit group</source>
46+
</trans-unit>
47+
<trans-unit id="tl_style_manager_archive.copy.0">
48+
<source>Copy category</source>
49+
</trans-unit>
2950
<trans-unit id="tl_style_manager_archive.copy.1">
3051
<source>Copy category</source>
3152
</trans-unit>
53+
<trans-unit id="tl_style_manager_archive.delete.0">
54+
<source>Delete category</source>
55+
</trans-unit>
3256
<trans-unit id="tl_style_manager_archive.delete.1">
3357
<source>Delete category</source>
3458
</trans-unit>
59+
<trans-unit id="tl_style_manager_archive.show.0">
60+
<source>Show category info</source>
61+
</trans-unit>
3562
<trans-unit id="tl_style_manager_archive.show.1">
3663
<source>Show category info</source>
3764
</trans-unit>
3865
<trans-unit id="tl_style_manager_archive.title.0">
3966
<source>Title</source>
4067
</trans-unit>
4168
<trans-unit id="tl_style_manager_archive.title.1">
42-
<source>Title or group name of the statements.</source>
69+
<source>Title or category name.</source>
4370
</trans-unit>
4471
<trans-unit id="tl_style_manager_archive.identifier.0">
4572
<source>Identifier</source>

‎src/Resources/contao/widgets/ComponentStyleSelect.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function generate()
155155
StringUtil::specialchars($arrOption['value']),
156156

157157
// @deprecated: to be removed in Version 3.0. (interception of storage based on the alias. In future, only the ID must be set)
158-
static::optionSelected($arrOption['value'], $this->varValue[ $objStyleGroups->id ]) ?: static::optionSelected($arrOption['value'], $this->varValue[ $objStyleGroups->alias ]),
158+
static::optionSelected($arrOption['value'], $this->varValue[ $objStyleGroups->id ] ?? '') ?: static::optionSelected($arrOption['value'], $this->varValue[ $objStyleGroups->alias ] ?? ''),
159159

160160
$arrOption['label']);
161161
}
@@ -169,7 +169,7 @@ public function generate()
169169
StringUtil::specialchars($arrOptgroup['value']),
170170

171171
// @deprecated: to be removed in Version 3.0. (interception of storage based on the alias. In future, only the ID must be set)
172-
static::optionSelected($arrOption['value'], $this->varValue[ $objStyleGroups->id ]) ?: static::optionSelected($arrOption['value'], $this->varValue[ $objStyleGroups->alias ]),
172+
static::optionSelected($arrOption['value'], $this->varValue[ $objStyleGroups->id ] ?? '') ?: static::optionSelected($arrOption['value'], $this->varValue[ $objStyleGroups->alias ] ?? ''),
173173

174174
$arrOptgroup['label']);
175175
}
@@ -316,7 +316,6 @@ public function validate()
316316

317317
$value = StyleManager::resetClasses($this->activeRecord->{$field}, $stdClass, $this->strTable);
318318
$value = StyleManager::updateClasses($value, $stdClass);
319-
$value = StyleManager::isMultipleField($field) ? serialize($value) : $value;
320319

321320
// Update css class field
322321
Database::getInstance()->prepare('UPDATE ' . $this->strTable . ' SET ' . $field . '=? WHERE id=?')

0 commit comments

Comments
 (0)