Skip to content

Commit acc7abf

Browse files
authored
Merge pull request #1561 from nextcloud/fix/upgrade-node
fix: Upgrade node version
2 parents 80ad6a1 + 50fbf12 commit acc7abf

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

lib/BackgroundJobs/ClusterFacesJob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected function run($argument): void {
3636
$userId = (string)$argument['userId'];
3737
try {
3838
$iniValue = ini_get('memory_limit');
39-
if ($iniValue === false) {
39+
if ($iniValue === false || $iniValue === '') {
4040
$batchSize = 10_000;
4141
} else {
4242
$memoryBytes = ini_parse_quantity($iniValue);

lib/Migration/InstallDeps.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
use Psr\Log\LoggerInterface;
3636

3737
final class InstallDeps implements IRepairStep {
38-
public const NODE_VERSION = 'v20.9.0';
38+
public const NODE_VERSION = 'v22.23.2';
3939
public const NODE_SERVER_OFFICIAL = 'https://nodejs.org/dist/';
4040
public const NODE_SERVER_UNOFFICIAL = 'https://unofficial-builds.nodejs.org/download/release/';
4141

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
"vue": "3.x"
6262
},
6363
"engines": {
64-
"node": "20.x",
65-
"npm": "10.x"
64+
"node": "22.x",
65+
"npm": "11.x"
6666
},
6767
"browserslist": [
6868
"extends @nextcloud/browserslist-config"

psalm-baseline.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
<code><![CDATA[$jobClass === static::class]]></code>
1111
</TypeDoesNotContainType>
1212
</file>
13+
<file src="lib/BackgroundJobs/ClusterFacesJob.php">
14+
<RedundantCastGivenDocblockType>
15+
<code><![CDATA[(string)$argument['userId']]]></code>
16+
</RedundantCastGivenDocblockType>
17+
</file>
1318
<file src="lib/Classifiers/Classifier.php">
1419
<MixedAssignment>
1520
<code><![CDATA[$results]]></code>
@@ -942,6 +947,9 @@
942947
</PossiblyFalseArgument>
943948
</file>
944949
<file src="lib/Service/FsActionService.php">
950+
<RedundantCastGivenDocblockType>
951+
<code><![CDATA[(string)$userId]]></code>
952+
</RedundantCastGivenDocblockType>
945953
<UndefinedClass>
946954
<code><![CDATA[$e]]></code>
947955
<code><![CDATA[NoUserException]]></code>

0 commit comments

Comments
 (0)