Skip to content

Commit 13cd975

Browse files
committed
use separate feature toggle
1 parent d97463d commit 13cd975

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

conf/bleedingEdge.neon

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ parameters:
33
bleedingEdge: true
44
skipCheckGenericClasses!: []
55
stricterFunctionMap: true
6+
narrowPhpVersionFromComposerJson: true
7+

conf/config.neon

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ parameters:
2424
bleedingEdge: false
2525
skipCheckGenericClasses: []
2626
stricterFunctionMap: false
27+
narrowPhpVersionFromComposerJson: false
2728
fileExtensions:
2829
- php
2930
checkAdvancedIsset: false
@@ -341,14 +342,14 @@ services:
341342
arguments:
342343
phpVersion: %phpVersion%
343344
composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
344-
bleedingEdge: %featureToggles.bleedingEdge%
345+
narrowPhpVersionFromComposerJson: %featureToggles.narrowPhpVersionFromComposerJson%
345346

346347
-
347348
class: PHPStan\Php\ComposerPhpVersionFactory
348349
arguments:
349350
phpVersion: %phpVersion%
350351
composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
351-
bleedingEdge: %featureToggles.bleedingEdge%
352+
narrowPhpVersionFromComposerJson: %featureToggles.narrowPhpVersionFromComposerJson%
352353

353354
-
354355
class: PHPStan\PhpDocParser\ParserConfig

conf/parametersSchema.neon

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ parametersSchema:
3030
bleedingEdge: bool(),
3131
skipCheckGenericClasses: listOf(string()),
3232
stricterFunctionMap: bool()
33+
narrowPhpVersionFromComposerJson: bool()
3334
])
3435
fileExtensions: listOf(string())
3536
checkAdvancedIsset: bool()

src/Php/ComposerPhpVersionFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class ComposerPhpVersionFactory
3131
public function __construct(
3232
private array $composerAutoloaderProjectPaths,
3333
int|array|null $phpVersion,
34-
bool $bleedingEdge,
34+
bool $narrowPhpVersionFromComposerJson,
3535
)
3636
{
3737
if (is_int($phpVersion)) {
@@ -49,7 +49,7 @@ public function __construct(
4949
return;
5050
}
5151

52-
if (!$bleedingEdge) {
52+
if (!$narrowPhpVersionFromComposerJson) {
5353
return;
5454
}
5555

src/Php/PhpVersionFactoryFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final class PhpVersionFactoryFactory
2323
public function __construct(
2424
private int|array|null $phpVersion,
2525
private array $composerAutoloaderProjectPaths,
26-
private bool $bleedingEdge,
26+
private bool $narrowPhpVersionFromComposerJson,
2727
)
2828
{
2929
}
@@ -53,7 +53,7 @@ public function create(): PhpVersionFactory
5353
$versionId = $this->phpVersion;
5454
}
5555

56-
if ($this->bleedingEdge && is_array($this->phpVersion)) {
56+
if ($this->narrowPhpVersionFromComposerJson && is_array($this->phpVersion)) {
5757
$versionId = $this->phpVersion['min'];
5858
}
5959

0 commit comments

Comments
 (0)