Skip to content

Commit e5ccafb

Browse files
ondrejmirtesondrejmirtes
committed
Improve compatibility with PHPStan 1.0
1 parent a6a1ed5 commit e5ccafb

27 files changed

+90
-111
lines changed

‎phpstan.neon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ includes:
33
- vendor/phpstan/phpstan/conf/bleedingEdge.neon
44

55
parameters:
6-
excludes_analyse:
6+
excludePaths:
77
- tests/*/data/*

‎src/Rules/Deprecations/AccessDeprecatedPropertyRule.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use PhpParser\Node\Expr\PropertyFetch;
77
use PhpParser\Node\Identifier;
88
use PHPStan\Analyser\Scope;
9-
use PHPStan\Broker\Broker;
9+
use PHPStan\Reflection\ReflectionProvider;
1010
use PHPStan\Type\TypeUtils;
1111

1212
/**
@@ -15,12 +15,12 @@
1515
class AccessDeprecatedPropertyRule implements \PHPStan\Rules\Rule
1616
{
1717

18-
/** @var Broker */
19-
private $broker;
18+
/** @var ReflectionProvider */
19+
private $reflectionProvider;
2020

21-
public function __construct(Broker $broker)
21+
public function __construct(ReflectionProvider $reflectionProvider)
2222
{
23-
$this->broker = $broker;
23+
$this->reflectionProvider = $reflectionProvider;
2424
}
2525

2626
public function getNodeType(): string
@@ -44,7 +44,7 @@ public function processNode(Node $node, Scope $scope): array
4444

4545
foreach ($referencedClasses as $referencedClass) {
4646
try {
47-
$classReflection = $this->broker->getClass($referencedClass);
47+
$classReflection = $this->reflectionProvider->getClass($referencedClass);
4848
$propertyReflection = $classReflection->getProperty($propertyName, $scope);
4949

5050
if ($propertyReflection->isDeprecated()->yes()) {

‎src/Rules/Deprecations/AccessDeprecatedStaticPropertyRule.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use PhpParser\Node\Identifier;
88
use PhpParser\Node\Name;
99
use PHPStan\Analyser\Scope;
10-
use PHPStan\Broker\Broker;
10+
use PHPStan\Reflection\ReflectionProvider;
1111
use PHPStan\Rules\RuleLevelHelper;
1212
use PHPStan\Type\ErrorType;
1313
use PHPStan\Type\Type;
@@ -18,15 +18,15 @@
1818
class AccessDeprecatedStaticPropertyRule implements \PHPStan\Rules\Rule
1919
{
2020

21-
/** @var Broker */
22-
private $broker;
21+
/** @var ReflectionProvider */
22+
private $reflectionProvider;
2323

2424
/** @var RuleLevelHelper */
2525
private $ruleLevelHelper;
2626

27-
public function __construct(Broker $broker, RuleLevelHelper $ruleLevelHelper)
27+
public function __construct(ReflectionProvider $reflectionProvider, RuleLevelHelper $ruleLevelHelper)
2828
{
29-
$this->broker = $broker;
29+
$this->reflectionProvider = $reflectionProvider;
3030
$this->ruleLevelHelper = $ruleLevelHelper;
3131
}
3232

@@ -69,7 +69,7 @@ function (Type $type) use ($propertyName): bool {
6969

7070
foreach ($referencedClasses as $referencedClass) {
7171
try {
72-
$class = $this->broker->getClass($referencedClass);
72+
$class = $this->reflectionProvider->getClass($referencedClass);
7373
$property = $class->getProperty($propertyName, $scope);
7474
} catch (\PHPStan\Broker\ClassNotFoundException $e) {
7575
continue;

‎src/Rules/Deprecations/CallToDeprecatedFunctionRule.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Expr\FuncCall;
77
use PHPStan\Analyser\Scope;
8-
use PHPStan\Broker\Broker;
8+
use PHPStan\Reflection\ReflectionProvider;
99

1010
/**
1111
* @implements \PHPStan\Rules\Rule<FuncCall>
1212
*/
1313
class CallToDeprecatedFunctionRule implements \PHPStan\Rules\Rule
1414
{
1515

16-
/** @var Broker */
17-
private $broker;
16+
/** @var ReflectionProvider */
17+
private $reflectionProvider;
1818

19-
public function __construct(Broker $broker)
19+
public function __construct(ReflectionProvider $reflectionProvider)
2020
{
21-
$this->broker = $broker;
21+
$this->reflectionProvider = $reflectionProvider;
2222
}
2323

2424
public function getNodeType(): string
@@ -37,7 +37,7 @@ public function processNode(Node $node, Scope $scope): array
3737
}
3838

3939
try {
40-
$function = $this->broker->getFunction($node->name, $scope);
40+
$function = $this->reflectionProvider->getFunction($node->name, $scope);
4141
} catch (\PHPStan\Broker\FunctionNotFoundException $e) {
4242
// Other rules will notify if the function is not found
4343
return [];

‎src/Rules/Deprecations/CallToDeprecatedMethodRule.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use PhpParser\Node\Expr\MethodCall;
77
use PhpParser\Node\Identifier;
88
use PHPStan\Analyser\Scope;
9-
use PHPStan\Broker\Broker;
9+
use PHPStan\Reflection\ReflectionProvider;
1010
use PHPStan\Type\TypeUtils;
1111

1212
/**
@@ -15,12 +15,12 @@
1515
class CallToDeprecatedMethodRule implements \PHPStan\Rules\Rule
1616
{
1717

18-
/** @var Broker */
19-
private $broker;
18+
/** @var ReflectionProvider */
19+
private $reflectionProvider;
2020

21-
public function __construct(Broker $broker)
21+
public function __construct(ReflectionProvider $reflectionProvider)
2222
{
23-
$this->broker = $broker;
23+
$this->reflectionProvider = $reflectionProvider;
2424
}
2525

2626
public function getNodeType(): string
@@ -44,7 +44,7 @@ public function processNode(Node $node, Scope $scope): array
4444

4545
foreach ($referencedClasses as $referencedClass) {
4646
try {
47-
$classReflection = $this->broker->getClass($referencedClass);
47+
$classReflection = $this->reflectionProvider->getClass($referencedClass);
4848
$methodReflection = $classReflection->getMethod($methodName, $scope);
4949

5050
if (!$methodReflection->isDeprecated()->yes()) {

‎src/Rules/Deprecations/CallToDeprecatedStaticMethodRule.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use PhpParser\Node\Identifier;
88
use PhpParser\Node\Name;
99
use PHPStan\Analyser\Scope;
10-
use PHPStan\Broker\Broker;
10+
use PHPStan\Reflection\ReflectionProvider;
1111
use PHPStan\Rules\RuleLevelHelper;
1212
use PHPStan\Type\ErrorType;
1313
use PHPStan\Type\Type;
@@ -18,15 +18,15 @@
1818
class CallToDeprecatedStaticMethodRule implements \PHPStan\Rules\Rule
1919
{
2020

21-
/** @var Broker */
22-
private $broker;
21+
/** @var ReflectionProvider */
22+
private $reflectionProvider;
2323

2424
/** @var RuleLevelHelper */
2525
private $ruleLevelHelper;
2626

27-
public function __construct(Broker $broker, RuleLevelHelper $ruleLevelHelper)
27+
public function __construct(ReflectionProvider $reflectionProvider, RuleLevelHelper $ruleLevelHelper)
2828
{
29-
$this->broker = $broker;
29+
$this->reflectionProvider = $reflectionProvider;
3030
$this->ruleLevelHelper = $ruleLevelHelper;
3131
}
3232

@@ -71,7 +71,7 @@ function (Type $type) use ($methodName): bool {
7171

7272
foreach ($referencedClasses as $referencedClass) {
7373
try {
74-
$class = $this->broker->getClass($referencedClass);
74+
$class = $this->reflectionProvider->getClass($referencedClass);
7575
$methodReflection = $class->getMethod($methodName, $scope);
7676
} catch (\PHPStan\Broker\ClassNotFoundException $e) {
7777
continue;

‎src/Rules/Deprecations/DeprecatedClassHelper.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
namespace PHPStan\Rules\Deprecations;
44

5-
use PHPStan\Broker\Broker;
65
use PHPStan\Reflection\ClassReflection;
6+
use PHPStan\Reflection\ReflectionProvider;
77

88
class DeprecatedClassHelper
99
{
1010

11-
/** @var Broker */
12-
private $broker;
11+
/** @var ReflectionProvider */
12+
private $reflectionProvider;
1313

14-
public function __construct(Broker $broker)
14+
public function __construct(ReflectionProvider $reflectionProvider)
1515
{
16-
$this->broker = $broker;
16+
$this->reflectionProvider = $reflectionProvider;
1717
}
1818

1919
public function getClassType(ClassReflection $class): string
@@ -44,7 +44,7 @@ public function filterDeprecatedClasses(array $referencedClasses): array
4444
$deprecatedClasses = [];
4545
foreach ($referencedClasses as $referencedClass) {
4646
try {
47-
$class = $this->broker->getClass($referencedClass);
47+
$class = $this->reflectionProvider->getClass($referencedClass);
4848
} catch (\PHPStan\Broker\ClassNotFoundException $e) {
4949
continue;
5050
}

‎src/Rules/Deprecations/FetchingClassConstOfDeprecatedClassRule.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use PhpParser\Node\Identifier;
88
use PhpParser\Node\Name;
99
use PHPStan\Analyser\Scope;
10-
use PHPStan\Broker\Broker;
10+
use PHPStan\Reflection\ReflectionProvider;
1111
use PHPStan\Rules\RuleLevelHelper;
1212
use PHPStan\Type\ErrorType;
1313
use PHPStan\Type\Type;
@@ -18,15 +18,15 @@
1818
class FetchingClassConstOfDeprecatedClassRule implements \PHPStan\Rules\Rule
1919
{
2020

21-
/** @var Broker */
22-
private $broker;
21+
/** @var ReflectionProvider */
22+
private $reflectionProvider;
2323

2424
/** @var RuleLevelHelper */
2525
private $ruleLevelHelper;
2626

27-
public function __construct(Broker $broker, RuleLevelHelper $ruleLevelHelper)
27+
public function __construct(ReflectionProvider $reflectionProvider, RuleLevelHelper $ruleLevelHelper)
2828
{
29-
$this->broker = $broker;
29+
$this->reflectionProvider = $reflectionProvider;
3030
$this->ruleLevelHelper = $ruleLevelHelper;
3131
}
3232

@@ -71,7 +71,7 @@ function (Type $type) use ($constantName): bool {
7171

7272
foreach ($referencedClasses as $referencedClass) {
7373
try {
74-
$class = $this->broker->getClass($referencedClass);
74+
$class = $this->reflectionProvider->getClass($referencedClass);
7575
} catch (\PHPStan\Broker\ClassNotFoundException $e) {
7676
continue;
7777
}

‎src/Rules/Deprecations/ImplementationOfDeprecatedInterfaceRule.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Stmt\Class_;
77
use PHPStan\Analyser\Scope;
8-
use PHPStan\Broker\Broker;
8+
use PHPStan\Reflection\ReflectionProvider;
99

1010
/**
1111
* @implements \PHPStan\Rules\Rule<Class_>
1212
*/
1313
class ImplementationOfDeprecatedInterfaceRule implements \PHPStan\Rules\Rule
1414
{
1515

16-
/** @var Broker */
17-
private $broker;
16+
/** @var ReflectionProvider */
17+
private $reflectionProvider;
1818

19-
public function __construct(Broker $broker)
19+
public function __construct(ReflectionProvider $reflectionProvider)
2020
{
21-
$this->broker = $broker;
21+
$this->reflectionProvider = $reflectionProvider;
2222
}
2323

2424
public function getNodeType(): string
@@ -39,7 +39,7 @@ public function processNode(Node $node, Scope $scope): array
3939
: (string) $node->name;
4040

4141
try {
42-
$class = $this->broker->getClass($className);
42+
$class = $this->reflectionProvider->getClass($className);
4343
} catch (\PHPStan\Broker\ClassNotFoundException $e) {
4444
return [];
4545
}
@@ -52,7 +52,7 @@ public function processNode(Node $node, Scope $scope): array
5252
$interfaceName = (string) $implement;
5353

5454
try {
55-
$interface = $this->broker->getClass($interfaceName);
55+
$interface = $this->reflectionProvider->getClass($interfaceName);
5656

5757
if ($interface->isDeprecated()) {
5858
$description = $interface->getDeprecatedDescription();

‎src/Rules/Deprecations/InheritanceOfDeprecatedClassRule.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Stmt\Class_;
77
use PHPStan\Analyser\Scope;
8-
use PHPStan\Broker\Broker;
8+
use PHPStan\Reflection\ReflectionProvider;
99

1010
/**
1111
* @implements \PHPStan\Rules\Rule<Class_>
1212
*/
1313
class InheritanceOfDeprecatedClassRule implements \PHPStan\Rules\Rule
1414
{
1515

16-
/** @var Broker */
17-
private $broker;
16+
/** @var ReflectionProvider */
17+
private $reflectionProvider;
1818

19-
public function __construct(Broker $broker)
19+
public function __construct(ReflectionProvider $reflectionProvider)
2020
{
21-
$this->broker = $broker;
21+
$this->reflectionProvider = $reflectionProvider;
2222
}
2323

2424
public function getNodeType(): string
@@ -43,15 +43,15 @@ public function processNode(Node $node, Scope $scope): array
4343
: (string) $node->name;
4444

4545
try {
46-
$class = $this->broker->getClass($className);
46+
$class = $this->reflectionProvider->getClass($className);
4747
} catch (\PHPStan\Broker\ClassNotFoundException $e) {
4848
return [];
4949
}
5050

5151
$parentClassName = (string) $node->extends;
5252

5353
try {
54-
$parentClass = $this->broker->getClass($parentClassName);
54+
$parentClass = $this->reflectionProvider->getClass($parentClassName);
5555
$description = $parentClass->getDeprecatedDescription();
5656
if ($parentClass->isDeprecated()) {
5757
if (!$class->isAnonymous()) {

0 commit comments

Comments
 (0)