report deprecated properties accessed by self

phpstan · Mar 17, 2023 · a22b36b · a22b36b
1 parent e3761ea
commit a22b36b
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 3 deletions.
diff --git a/src/Rules/Deprecations/AccessDeprecatedStaticPropertyRule.php b/src/Rules/Deprecations/AccessDeprecatedStaticPropertyRule.php
@@ -53,7 +53,7 @@ public function processNode(Node $node, Scope $scope): array
  $referencedClasses = [];
 
  if ($node->class instanceof Name) {
- $referencedClasses[] = (string) $node->class;
+ $referencedClasses[] = $scope->resolveName($node->class);
  } else {
  $classTypeResult = $this->ruleLevelHelper->findTypeToCheck(
  $scope,
@@ -87,14 +87,14 @@ static function (Type $type) use ($propertyName): bool {
  return [sprintf(
  'Access to deprecated static property $%s of class %s.',
  $propertyName,
- $referencedClass
+ $property->getDeclaringClass()->getName()
  )];
  }
 
  return [sprintf(
  "Access to deprecated static property $%s of class %s:\n%s",
  $propertyName,
- $referencedClass,
+ $property->getDeclaringClass()->getName(),
  $description
  )];
  }

diff --git a/tests/Rules/Deprecations/AccessDeprecatedStaticPropertyRuleTest.php b/tests/Rules/Deprecations/AccessDeprecatedStaticPropertyRuleTest.php
@@ -59,6 +59,22 @@ public function testAccessDeprecatedStaticProperty(): void
  "Access to deprecated static property \$deprecatedWithDescription of class AccessDeprecatedStaticProperty\Foo:\nThis is probably a singleton.",
  33,
  ],
+ [
+ 'Access to deprecated static property $deprecatedFoo of class AccessDeprecatedStaticProperty\Foo.',
+ 117,
+ ],
+ [
+ 'Access to deprecated static property $deprecatedOtherFoo of class AccessDeprecatedStaticProperty\Child.',
+ 118,
+ ],
+ [
+ 'Access to deprecated static property $deprecatedFoo of class AccessDeprecatedStaticProperty\Foo.',
+ 119,
+ ],
+ [
+ 'Access to deprecated static property $deprecatedOtherFoo of class AccessDeprecatedStaticProperty\Child.',
+ 120,
+ ],
  ]
  );
  }

diff --git a/tests/Rules/Deprecations/CallToDeprecatedStaticMethodRuleTest.php b/tests/Rules/Deprecations/CallToDeprecatedStaticMethodRuleTest.php
@@ -67,6 +67,22 @@ public function testDeprecatedStaticMethodCall(): void
  'Call to deprecated method deprecatedFoo() of class CheckDeprecatedStaticMethodCall\Foo.',
  33,
  ],
+ [
+ 'Call to deprecated method deprecatedFoo() of class CheckDeprecatedStaticMethodCall\Foo.',
+ 74,
+ ],
+ [
+ 'Call to deprecated method deprecatedOtherFoo() of class CheckDeprecatedStaticMethodCall\Child.',
+ 75,
+ ],
+ [
+ 'Call to deprecated method deprecatedFoo() of class CheckDeprecatedStaticMethodCall\Foo.',
+ 76,
+ ],
+ [
+ 'Call to deprecated method deprecatedOtherFoo() of class CheckDeprecatedStaticMethodCall\Child.',
+ 77,
+ ],
  ]
  );
  }

diff --git a/tests/Rules/Deprecations/data/access-deprecated-static-property.php b/tests/Rules/Deprecations/data/access-deprecated-static-property.php
@@ -104,3 +104,19 @@ public function foo()
  }
 
 }
+
+class Child extends Foo
+{
+ /**
+ * @deprecated
+ */
+ public static $deprecatedOtherFoo;
+
+ public static function foo()
+ {
+ self::$deprecatedFoo;
+ self::$deprecatedOtherFoo;
+ static::$deprecatedFoo;
+ static::$deprecatedOtherFoo;
+ }
+}
diff --git a/tests/Rules/Deprecations/data/call-to-deprecated-static-method.php b/tests/Rules/Deprecations/data/call-to-deprecated-static-method.php
@@ -58,3 +58,22 @@ public static function foo()
  }
 
 }
+
+class Child extends Foo
+{
+ /**
+ * @deprecated
+ */
+ public static function deprecatedOtherFoo()
+ {
+
+ }
+
+ public static function foo()
+ {
+ self::deprecatedFoo();
+ self::deprecatedOtherFoo();
+ static::deprecatedFoo();
+ static::deprecatedOtherFoo();
+ }
+}