Skip to content

Commit c585610

Browse files
committed
[BCB] Remove options that existed only for performance reasons
1 parent c17a736 commit c585610

7 files changed

+3
-210
lines changed

Diff for: extension.neon

-6
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ parameters:
99
queryBuilderClass: null
1010
allCollectionsSelectable: true
1111
objectManagerLoader: null
12-
searchOtherMethodsForQueryBuilderBeginning: true
13-
queryBuilderFastAlgorithm: false
1412
literalString: false
1513
featureToggles:
1614
skipCheckGenericClasses:
@@ -79,8 +77,6 @@ parametersSchema:
7977
queryBuilderClass: schema(string(), nullable())
8078
allCollectionsSelectable: bool()
8179
objectManagerLoader: schema(string(), nullable())
82-
searchOtherMethodsForQueryBuilderBeginning: bool()
83-
queryBuilderFastAlgorithm: bool()
8480
reportDynamicQueryBuilders: bool()
8581
reportUnknownTypes: bool()
8682
allowNullablePropertyForRequiredField: bool()
@@ -117,7 +113,6 @@ services:
117113
class: PHPStan\Type\Doctrine\QueryBuilder\CreateQueryBuilderDynamicReturnTypeExtension
118114
arguments:
119115
queryBuilderClass: %doctrine.queryBuilderClass%
120-
fasterVersion: %doctrine.queryBuilderFastAlgorithm%
121116
tags:
122117
- phpstan.broker.dynamicMethodReturnTypeExtension
123118
-
@@ -194,7 +189,6 @@ services:
194189
-
195190
class: PHPStan\Type\Doctrine\QueryBuilder\OtherMethodQueryBuilderParser
196191
arguments:
197-
descendIntoOtherMethods: %doctrine.searchOtherMethodsForQueryBuilderBeginning%
198192
parser: @defaultAnalysisParser
199193

200194
-

Diff for: rules.neon

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ parametersSchema:
1212
queryBuilderClass: schema(string(), nullable())
1313
allCollectionsSelectable: bool()
1414
objectManagerLoader: schema(string(), nullable())
15-
searchOtherMethodsForQueryBuilderBeginning: bool()
16-
queryBuilderFastAlgorithm: bool()
1715
reportDynamicQueryBuilders: bool()
1816
reportUnknownTypes: bool()
1917
allowNullablePropertyForRequiredField: bool()

Diff for: src/Type/Doctrine/QueryBuilder/CreateQueryBuilderDynamicReturnTypeExtension.php

+2-11
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,11 @@ class CreateQueryBuilderDynamicReturnTypeExtension implements DynamicMethodRetur
1313

1414
private ?string $queryBuilderClass = null;
1515

16-
private bool $fasterVersion;
17-
1816
public function __construct(
19-
?string $queryBuilderClass,
20-
bool $fasterVersion
17+
?string $queryBuilderClass
2118
)
2219
{
2320
$this->queryBuilderClass = $queryBuilderClass;
24-
$this->fasterVersion = $fasterVersion;
2521
}
2622

2723
public function getClass(): string
@@ -40,12 +36,7 @@ public function getTypeFromMethodCall(
4036
Scope $scope
4137
): Type
4238
{
43-
$class = SimpleQueryBuilderType::class;
44-
if (!$this->fasterVersion) {
45-
$class = BranchingQueryBuilderType::class;
46-
}
47-
48-
return new $class(
39+
return new BranchingQueryBuilderType(
4940
$this->queryBuilderClass ?? 'Doctrine\ORM\QueryBuilder',
5041
);
5142
}

Diff for: src/Type/Doctrine/QueryBuilder/OtherMethodQueryBuilderParser.php

+1-8
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
class OtherMethodQueryBuilderParser
2929
{
3030

31-
private bool $descendIntoOtherMethods;
32-
3331
private Parser $parser;
3432

3533
private Container $container;
@@ -41,9 +39,8 @@ class OtherMethodQueryBuilderParser
4139
*/
4240
private array $cache = [];
4341

44-
public function __construct(bool $descendIntoOtherMethods, Parser $parser, Container $container)
42+
public function __construct(Parser $parser, Container $container)
4543
{
46-
$this->descendIntoOtherMethods = $descendIntoOtherMethods;
4744
$this->parser = $parser;
4845
$this->container = $container;
4946
}
@@ -53,10 +50,6 @@ public function __construct(bool $descendIntoOtherMethods, Parser $parser, Conta
5350
*/
5451
public function findQueryBuilderTypesInCalledMethod(Scope $scope, MethodReflection $methodReflection): array
5552
{
56-
if (!$this->descendIntoOtherMethods) {
57-
return [];
58-
}
59-
6053
$methodName = $methodReflection->getName();
6154
$className = $methodReflection->getDeclaringClass()->getName();
6255
$fileName = $methodReflection->getDeclaringClass()->getFileName();

Diff for: src/Type/Doctrine/QueryBuilder/SimpleQueryBuilderType.php

-33
This file was deleted.

Diff for: tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleSlowTest.php

-147
This file was deleted.

Diff for: tests/Rules/Doctrine/ORM/slow.neon

-3
This file was deleted.

0 commit comments

Comments
 (0)