Skip to content

Commit 618dd7c

Browse files
committed
[TASK] Raise dev dependencies
> composer req --dev phpstan/phpstan:^2.1.42 > composer req --dev phpstan/phpstan-phpunit:^2.0.16 > composer req --dev friendsofphp/php-cs-fixer:^3.94.2 Adapt a ActionService detail to happify phpstan. Also adapt workflows to use ubuntu-24.04 and actions/checkout@v6.
1 parent dfc296e commit 618dd7c

5 files changed

Lines changed: 12 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99

1010
testsuite:
1111
name: all tests
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-24.04
1313
strategy:
1414
matrix:
1515
php: [ '8.2', '8.3', '8.4', '8.5' ]
1616
steps:
1717

1818
- name: Checkout ${{ github.event_name == 'workflow_dispatch' && github.head_ref || '' }}
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020
with:
2121
ref: ${{ github.event_name == 'workflow_dispatch' && github.head_ref || '' }}
2222

.github/workflows/nightly-8.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
jobs:
99
nightly-8:
1010
name: "dispatch-nightly-8"
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
permissions:
1313
actions: write
1414
steps:
1515
- name: Checkout '8'
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
with:
1818
ref: '8'
1919

.github/workflows/nightly-main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
jobs:
99
nightly-main:
1010
name: "dispatch-nightly-main"
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
permissions:
1313
actions: write
1414
steps:
1515
- name: Checkout 'main'
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
with:
1818
ref: 'main'
1919

Classes/Core/Functional/Framework/DataHandling/ActionService.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public function createNewRecords(int $pageId, array $tableRecordData): array
7272
$currentUid = null;
7373
$previousTableName = null;
7474
$previousUid = null;
75+
$hasPrevious = false;
7576
foreach ($tableRecordData as $tableName => $recordData) {
7677
$recordData = $this->resolvePreviousUid($recordData, $currentUid);
7778
if (!isset($recordData['pid'])) {
@@ -80,14 +81,15 @@ public function createNewRecords(int $pageId, array $tableRecordData): array
8081
$currentUid = $this->getUniqueIdForNewRecords();
8182
$newTableIds[$tableName][] = $currentUid;
8283
$dataMap[$tableName][$currentUid] = $recordData;
83-
if ($previousTableName !== null && $previousUid !== null) {
84+
if ($hasPrevious) {
8485
$dataMap[$previousTableName][$previousUid] = $this->resolveNextUid(
8586
$dataMap[$previousTableName][$previousUid],
8687
$currentUid
8788
);
8889
}
8990
$previousTableName = $tableName;
9091
$previousUid = $currentUid;
92+
$hasPrevious = true;
9193
}
9294
$this->createDataHandler();
9395
$this->dataHandler->start($dataMap, []);

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
}
6060
},
6161
"require-dev": {
62-
"friendsofphp/php-cs-fixer": "^3.65.0",
63-
"phpstan/phpstan": "^2.0.2",
64-
"phpstan/phpstan-phpunit": "^2.0.1",
62+
"friendsofphp/php-cs-fixer": "^3.94.2",
63+
"phpstan/phpstan": "^2.1.42",
64+
"phpstan/phpstan-phpunit": "^2.0.16",
6565
"typo3/cms-workspaces": "13.*.*@dev || 14.*.*@dev"
6666
},
6767
"replace": {

0 commit comments

Comments
 (0)