Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions lib/NodeConfigurationDetector.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,12 @@ private function getNodeVersion(string $baseUri, ?string $subFolder = null): ?st

private function getVersionRequirements(string $baseUri, ?string $subFolder = null): ?string
{
/** @var array<array, mixed> $packageJsonContent */
$packageJsonContent = $this->packageJsonProvider->getPackageJsonConfig(
$baseUri,
$subFolder,
);

if (null === $packageJsonContent) {
return null;
}

return $packageJsonContent['engines']['node'] ?? null;
}

Expand Down Expand Up @@ -122,21 +119,13 @@ private function getPackageManagerType(
return $yarnType;
}

/** @var string $packageJsonContent */
$packageJsonContent = $this->getFileContent(
/** @var array<array, mixed> $packageJsonContent */
$packageJsonContent = $this->packageJsonProvider->getPackageJsonConfig(
$baseUri,
$subFolder,
'package.json'
);

$packageData = json_decode(
$packageJsonContent,
true,
512,
\JSON_THROW_ON_ERROR
);

$packageManager = $packageData['packageManager'] ?? null;
$packageManager = $packageJsonContent['packageManager'] ?? null;
if (null !== $packageManager) {
$packageManagerParts = explode('@', $packageManager);
$managerName = $packageManagerParts[0];
Expand Down
Loading