Rebase and manually check

Author: mglaman

src/Rules/Deprecations/AccessDeprecatedConstant.php

@@ -5,18 +5,15 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Broker\Broker;
-use PHPStan\Rules\RuleLevelHelper;
+use PHPStan\Reflection\DeprecatableReflection;
 
 class AccessDeprecatedConstant implements \PHPStan\Rules\Rule
 {
     /** @var Broker */
     private $broker;
-    /** @var RuleLevelHelper */
-    private $ruleLevelHelper;
-    public function __construct(Broker $broker, RuleLevelHelper $ruleLevelHelper)
+    public function __construct(Broker $broker)
     {
         $this->broker = $broker;
-        $this->ruleLevelHelper = $ruleLevelHelper;
     }
 
     public function getNodeType(): string
@@ -26,13 +23,33 @@ public function getNodeType(): string
 
     public function processNode(Node $node, Scope $scope): array
     {
-        if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {
+        assert($node instanceof Node\Expr\ConstFetch);
+        $class = $scope->getClassReflection();
+        if ($class !== null && $class->isDeprecated()) {
+            return [];
+        }
+        $trait = $scope->getTraitReflection();
+        if ($trait !== null && $trait->isDeprecated()) {
+            return [];
+        }
+        $function = $scope->getFunction();
+        if ($function instanceof DeprecatableReflection && $function->isDeprecated()) {
             return [];
         }
 
-        // comment is not resolved.
-        $comment = $node->getDocComment();
-        $constnatName = $this->broker->resolveConstantName($node->name, $scope);
+        // nikic/php-parser does not have any comments above the comment.
+        // possibly due to PHP's internal reflection capabilities?
+        $deprecatedConstants = [
+            'DATETIME_STORAGE_TIMEZONE' => 'Deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.x. Use \Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface::STORAGE_TIMEZONE instead.',
+            'DATETIME_DATETIME_STORAGE_FORMAT' => 'Deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.x. Use \Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface::DATETIME_STORAGE_FORMAT instead.',
+            'DATETIME_DATE_STORAGE_FORMAT' => 'Deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.x. Use \Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface::DATE_STORAGE_FORMAT instead.',
+        ];
+        $constantName = $this->broker->resolveConstantName($node->name, $scope);
+        if (isset($deprecatedConstants[$constantName])) {
+            return [
+                sprintf('Call to deprecated constant %s: %s', $constantName, $deprecatedConstants[$constantName])
+            ];
+        }
         return [];
     }
 

tests/src/DeprecationRulesTest.php

@@ -19,21 +19,6 @@ public function testDeprecationRules(string $path, int $count, array $errorMessa
 
     public function dataDeprecatedSamples(): \Generator
     {
-//        yield [
-//            __DIR__ . '/../fixtures/drupal/modules/phpstan_fixtures/src/UsesDeprecatedUrlFunction.php',
-//            2,
-//            [
-//                '\Drupal calls should be avoided in classes, use dependency injection instead',
-//                'Call to deprecated method url() of class Drupal.'
-//            ]
-//        ];
-//        yield [
-//            __DIR__ . '/../fixtures/drupal/core/lib/Drupal/Core/Entity/EntityManager.php',
-//            1,
-//            [
-//                'Class Drupal\Core\Entity\EntityManager implements deprecated interface Drupal\Core\Entity\EntityManagerInterface.'
-//            ]
-//        ];
         yield [
             __DIR__ . '/../fixtures/drupal/modules/phpstan_fixtures/src/UsesDeprecatedUrlFunction.php',
             2,
@@ -57,8 +42,8 @@ public function dataDeprecatedSamples(): \Generator
             __DIR__ . '/../fixtures/drupal/modules/phpstan_fixtures/src/DeprecatedGlobalConstants.php',
             2,
             [
-                'Call to deprecated constant DATETIME_STORAGE_TIMEZONE.',
-                'Call to deprecated constant DATETIME_DATE_STORAGE_FORMAT.',
+                'Call to deprecated constant DATETIME_STORAGE_TIMEZONE: Deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.x. Use \Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface::STORAGE_TIMEZONE instead.',
+                'Call to deprecated constant DATETIME_DATE_STORAGE_FORMAT: Deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.x. Use \Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface::DATE_STORAGE_FORMAT instead.',
             ]
         ];
     }