Skip to content

Commit 253aa40

Browse files
committed
Merge tag '2.3.1'
Hotfix release 2.3.1 Deep copy fix
2 parents d533bba + 17bd28d commit 253aa40

4 files changed

Lines changed: 23 additions & 6 deletions

File tree

.github/workflows/diagnostics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
php: [ '8.1', '8.2', '8.3' ]
15+
php: [ '8.2', '8.3' ]
1616
contao: [ '~4.13.0' ]
1717
phpcq_install: [ 'update' ]
1818
output: [ '-o github-action -o default' ]

.phpcq.yaml.dist

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ phpcq:
1212
phpunit:
1313
version: ^1.0
1414
signed: false
15+
requirements:
16+
phpunit:
17+
version: ^11.5.48
1518
psalm:
1619
version: ^1.0
1720
signed: false
@@ -39,22 +42,30 @@ phpcq:
3942
trusted-keys:
4043
# composer-require-checker
4144
- 033E5F8D801A2F8D
45+
- B2BDAAAC6F1FDE528CD9EEC9033E5F8D801A2F8D
4246
# sb@sebastian-bergmann.de
4347
- 4AA394086372C20A
48+
- D8406D0D82947747293778314AA394086372C20A
4449
# psalm
4550
- 8A03EA3B385DBAA1
4651
- 12CE0F1D262429A5
52+
- 2DE50EB60C013FFFA831040D12CE0F1D262429A5
4753
# magl@magll.net
4854
- D2CCAC42F6295E7D
4955
# PHP_CodeSniffer
5056
- 31C7E470E2138192
5157
- 5E6DDE998AB73B8E
5258
- A978220305CD5C32
59+
- 689DAD778FF08760E046228BA978220305CD5C32
60+
- 97B02DD8E5071466
61+
- D91D86963AF3A29B6520462297B02DD8E5071466
5362
# Composer normalize
5463
- C00543248C87FB13
64+
- 0FDE18AE1D09E19F60F6B1CBC00543248C87FB13
5565
# phpmd
5666
- A4E55EA12C7C085C
5767
- 9093F8B32E4815AA
68+
- E7A745102ECC980F7338B3079093F8B32E4815AA
5869

5970
tasks:
6071
fix:

src/EventListener/BackendEventListener.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,18 @@ private function duplicateContentEntries(string $strTable, int $intSourceId, int
145145
$arrContent['pid'] = $intDestinationId;
146146
unset($arrContent['id']);
147147

148+
$parameters = [];
149+
foreach (array_keys($arrContent) as $key) {
150+
$parameters[$key] = '?';
151+
}
152+
148153
$this->connection
149154
->createQueryBuilder()
150155
->insert('tl_content')
151-
->setParameters($arrContent)
152-
->executeQuery();
156+
->values($parameters)
157+
->setParameters(array_values($arrContent))
158+
->executeStatement()
159+
;
153160
}
154161
}
155162
}

tests/Widgets/ContentArticleWidgetTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ public function testNewInstance(): void
6363
->getMock();
6464

6565
$widget
66-
->expects(self::any())
67-
->method('import')
68-
->withConsecutive([Config::class, 'Config']);
66+
->expects($this->never())
67+
->method('import');
6968

7069
self::assertEmpty($widget->getAttributes());
7170
}

0 commit comments

Comments
 (0)