Skip to content

Commit 1f85582

Browse files
committed
removed feature toggle
1 parent 13cd975 commit 1f85582

File tree

5 files changed

+1
-12
lines changed

5 files changed

+1
-12
lines changed

conf/bleedingEdge.neon

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

conf/config.neon

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ parameters:
2424
bleedingEdge: false
2525
skipCheckGenericClasses: []
2626
stricterFunctionMap: false
27-
narrowPhpVersionFromComposerJson: false
2827
fileExtensions:
2928
- php
3029
checkAdvancedIsset: false
@@ -342,14 +341,12 @@ services:
342341
arguments:
343342
phpVersion: %phpVersion%
344343
composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
345-
narrowPhpVersionFromComposerJson: %featureToggles.narrowPhpVersionFromComposerJson%
346344

347345
-
348346
class: PHPStan\Php\ComposerPhpVersionFactory
349347
arguments:
350348
phpVersion: %phpVersion%
351349
composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
352-
narrowPhpVersionFromComposerJson: %featureToggles.narrowPhpVersionFromComposerJson%
353350

354351
-
355352
class: PHPStan\PhpDocParser\ParserConfig

conf/parametersSchema.neon

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ parametersSchema:
3030
bleedingEdge: bool(),
3131
skipCheckGenericClasses: listOf(string()),
3232
stricterFunctionMap: bool()
33-
narrowPhpVersionFromComposerJson: bool()
3433
])
3534
fileExtensions: listOf(string())
3635
checkAdvancedIsset: bool()

src/Php/ComposerPhpVersionFactory.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ final class ComposerPhpVersionFactory
3131
public function __construct(
3232
private array $composerAutoloaderProjectPaths,
3333
int|array|null $phpVersion,
34-
bool $narrowPhpVersionFromComposerJson,
3534
)
3635
{
3736
if (is_int($phpVersion)) {
@@ -49,10 +48,6 @@ public function __construct(
4948
return;
5049
}
5150

52-
if (!$narrowPhpVersionFromComposerJson) {
53-
return;
54-
}
55-
5651
// fallback to composer.json based php-version constraint
5752
$composerPhpVersion = $this->getComposerRequireVersion();
5853
if ($composerPhpVersion === null) {

src/Php/PhpVersionFactoryFactory.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ final class PhpVersionFactoryFactory
2323
public function __construct(
2424
private int|array|null $phpVersion,
2525
private array $composerAutoloaderProjectPaths,
26-
private bool $narrowPhpVersionFromComposerJson,
2726
)
2827
{
2928
}
@@ -53,7 +52,7 @@ public function create(): PhpVersionFactory
5352
$versionId = $this->phpVersion;
5453
}
5554

56-
if ($this->narrowPhpVersionFromComposerJson && is_array($this->phpVersion)) {
55+
if (is_array($this->phpVersion)) {
5756
$versionId = $this->phpVersion['min'];
5857
}
5958

0 commit comments

Comments
 (0)