Ignore all deprecation errors in deprecated scopes

iluuu1994 · iluuu1994 · commit b88079ba2e63 · 2018-05-06T18:31:37.000+02:00
diff --git a/src/Rules/Deprecations/AccessDeprecatedPropertyRule.php b/src/Rules/Deprecations/AccessDeprecatedPropertyRule.php
@@ -31,6 +31,10 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {
+			return [];
+		}
+
 		if (!is_string($node->name)) {
 			return [];
 		}
diff --git a/src/Rules/Deprecations/AccessDeprecatedStaticPropertyRule.php b/src/Rules/Deprecations/AccessDeprecatedStaticPropertyRule.php
@@ -37,6 +37,10 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {
+			return [];
+		}
+
 		if (!is_string($node->name)) {
 			return [];
 		}
diff --git a/src/Rules/Deprecations/CallToDeprecatedFunctionRule.php b/src/Rules/Deprecations/CallToDeprecatedFunctionRule.php
@@ -30,6 +30,10 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {
+			return [];
+		}
+
 		if (!($node->name instanceof \PhpParser\Node\Name)) {
 			return [];
 		}
diff --git a/src/Rules/Deprecations/CallToDeprecatedMethodRule.php b/src/Rules/Deprecations/CallToDeprecatedMethodRule.php
@@ -31,6 +31,10 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {
+			return [];
+		}
+
 		if (!is_string($node->name)) {
 			return [];
 		}
diff --git a/src/Rules/Deprecations/CallToDeprecatedStaticMethodRule.php b/src/Rules/Deprecations/CallToDeprecatedStaticMethodRule.php
@@ -33,6 +33,10 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {
+			return [];
+		}
+
 		if (!is_string($node->name)) {
 			return [];
 		}
diff --git a/src/Rules/Deprecations/DeprecatedScopeHelper.php b/src/Rules/Deprecations/DeprecatedScopeHelper.php
@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Deprecations;
+
+use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\DeprecatableReflection;
+
+class DeprecatedScopeHelper
+{
+
+	public static function isScopeDeprecated(Scope $scope): bool
+	{
+		$class = $scope->getClassReflection();
+		if ($class !== null && $class->isDeprecated()) {
+			return true;
+		}
+
+		$function = $scope->getFunction();
+		if ($function instanceof DeprecatableReflection && $function->isDeprecated()) {
+			return true;
+		}
+
+		return false;
+	}
+
+}
diff --git a/src/Rules/Deprecations/FetchingClassConstOfDeprecatedClassRule.php b/src/Rules/Deprecations/FetchingClassConstOfDeprecatedClassRule.php
@@ -31,6 +31,10 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {
+			return [];
+		}
+
 		if (!$node->class instanceof Name) {
 			return [];
 		}
diff --git a/src/Rules/Deprecations/ImplementationOfDeprecatedInterfaceRule.php b/src/Rules/Deprecations/ImplementationOfDeprecatedInterfaceRule.php
@@ -42,6 +42,10 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
+		if ($class->isDeprecated()) {
+			return [];
+		}
+
 		foreach ($node->implements as $implement) {
 			$interfaceName = (string) $implement;
 
diff --git a/src/Rules/Deprecations/InheritanceOfDeprecatedClassRule.php b/src/Rules/Deprecations/InheritanceOfDeprecatedClassRule.php
@@ -30,6 +30,10 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {
+			return [];
+		}
+
 		if ($node->extends === null) {
 			return [];
 		}
diff --git a/src/Rules/Deprecations/InstantiationOfDeprecatedClassRule.php b/src/Rules/Deprecations/InstantiationOfDeprecatedClassRule.php
@@ -31,6 +31,10 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {
+			return [];
+		}
+
 		if (!$node->class instanceof Name) {
 			return [];
 		}
diff --git a/src/Rules/Deprecations/UsageOfDeprecatedTraitRule.php b/src/Rules/Deprecations/UsageOfDeprecatedTraitRule.php
@@ -30,6 +30,10 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {
+			return [];
+		}
+
 		$errors = [];
 		$className = $scope->getClassReflection()->getName();
 
diff --git a/tests/Rules/Deprecations/data/access-deprecated-property.php b/tests/Rules/Deprecations/data/access-deprecated-property.php
@@ -16,3 +16,47 @@
 $foo->deprecatedFooFromTrait = 'deprecatedFooFromTrait';
 echo $foo->deprecatedFooFromTrait;
 
+/**
+ * @deprecated
+ */
+function deprecated_scope()
+{
+	$foo = new Foo();
+
+	$foo->foo = 'foo';
+	echo $foo->foo;
+
+	$foo->deprecatedFoo = 'deprecatedFoo';
+	echo $foo->deprecatedFoo;
+
+	$foo->fooFromTrait = 'fooFromTrait';
+	echo $foo->fooFromTrait;
+
+	$foo->deprecatedFooFromTrait = 'deprecatedFooFromTrait';
+	echo $foo->deprecatedFooFromTrait;
+}
+
+/**
+ * @deprecated
+ */
+class DeprecatedScope
+{
+
+	public function foo()
+	{
+		$foo = new Foo();
+
+		$foo->foo = 'foo';
+		echo $foo->foo;
+
+		$foo->deprecatedFoo = 'deprecatedFoo';
+		echo $foo->deprecatedFoo;
+
+		$foo->fooFromTrait = 'fooFromTrait';
+		echo $foo->fooFromTrait;
+
+		$foo->deprecatedFooFromTrait = 'deprecatedFooFromTrait';
+		echo $foo->deprecatedFooFromTrait;
+	}
+
+}
diff --git a/tests/Rules/Deprecations/data/access-deprecated-static-property.php b/tests/Rules/Deprecations/data/access-deprecated-static-property.php
@@ -30,3 +30,75 @@
 $foo::$deprecatedFooFromTrait = 'foo';
 echo $foo::$deprecatedFooFromTrait;
 
+/**
+ * @deprecated
+ */
+function deprecated_scope()
+{
+	Foo::$foo = 'foo';
+	echo Foo::$foo;
+
+	Foo::$deprecatedFoo = 'foo';
+	echo Foo::$deprecatedFoo;
+
+	$foo = new Foo();
+
+	$foo::$foo = 'foo';
+	echo $foo::$foo;
+
+	$foo::$deprecatedFoo = 'foo';
+	echo $foo::$deprecatedFoo;
+
+	FooTrait::$fooFromTrait = 'foo';
+	echo FooTrait::$fooFromTrait;
+
+	FooTrait::$deprecatedFooFromTrait = 'foo';
+	echo FooTrait::$deprecatedFooFromTrait;
+
+	$foo = new Foo();
+
+	$foo::$fooFromTrait = 'foo';
+	echo $foo::$fooFromTrait;
+
+	$foo::$deprecatedFooFromTrait = 'foo';
+	echo $foo::$deprecatedFooFromTrait;
+}
+
+/**
+ * @deprecated
+ */
+class DeprecatedScope
+{
+
+	public function foo()
+	{
+		Foo::$foo = 'foo';
+		echo Foo::$foo;
+
+		Foo::$deprecatedFoo = 'foo';
+		echo Foo::$deprecatedFoo;
+
+		$foo = new Foo();
+
+		$foo::$foo = 'foo';
+		echo $foo::$foo;
+
+		$foo::$deprecatedFoo = 'foo';
+		echo $foo::$deprecatedFoo;
+
+		FooTrait::$fooFromTrait = 'foo';
+		echo FooTrait::$fooFromTrait;
+
+		FooTrait::$deprecatedFooFromTrait = 'foo';
+		echo FooTrait::$deprecatedFooFromTrait;
+
+		$foo = new Foo();
+
+		$foo::$fooFromTrait = 'foo';
+		echo $foo::$fooFromTrait;
+
+		$foo::$deprecatedFooFromTrait = 'foo';
+		echo $foo::$deprecatedFooFromTrait;
+	}
+
+}
diff --git a/tests/Rules/Deprecations/data/call-to-deprecated-function.php b/tests/Rules/Deprecations/data/call-to-deprecated-function.php
@@ -8,4 +8,25 @@
 deprecated_foo();
 \CheckDeprecatedFunctionCall\deprecated_foo();
 
-non_existent_func();
+/**
+ * @deprecated
+ */
+function deprecated_scope()
+{
+	deprecated_foo();
+	\CheckDeprecatedFunctionCall\deprecated_foo();
+}
+
+/**
+ * @deprecated
+ */
+class DeprecatedScope
+{
+
+	function foo()
+	{
+		deprecated_foo();
+		\CheckDeprecatedFunctionCall\deprecated_foo();
+	}
+
+}
diff --git a/tests/Rules/Deprecations/data/call-to-deprecated-method.php b/tests/Rules/Deprecations/data/call-to-deprecated-method.php
@@ -12,3 +12,43 @@
 
 $foo->fooFromTrait();
 $foo->deprecatedFooFromTrait();
+
+/**
+ * @deprecated
+ */
+function deprecated_scope()
+{
+	$foo = new Foo();
+	$foo->foo();
+	$foo->deprecatedFoo();
+
+	$bar = new Bar();
+	$bar->deprecatedFoo();
+	$bar->deprecatedFoo2();
+
+	$foo->fooFromTrait();
+	$foo->deprecatedFooFromTrait();
+
+}
+
+/**
+ * @deprecated
+ */
+class DeprecatedScope
+{
+
+	public function foo()
+	{
+		$foo = new Foo();
+		$foo->foo();
+		$foo->deprecatedFoo();
+
+		$bar = new Bar();
+		$bar->deprecatedFoo();
+		$bar->deprecatedFoo2();
+
+		$foo->fooFromTrait();
+		$foo->deprecatedFooFromTrait();
+	}
+
+}
diff --git a/tests/Rules/Deprecations/data/call-to-deprecated-static-method.php b/tests/Rules/Deprecations/data/call-to-deprecated-static-method.php
@@ -22,3 +22,28 @@ public static function deprecatedFoo()
 	}
 
 }
+
+/**
+ * @deprecated
+ */
+function deprecated_scope()
+{
+	Foo::foo();
+	Foo::deprecatedFoo();
+	Foo::deprecatedFoo2();
+}
+
+/**
+ * @deprecated
+ */
+class DeprecatedScope
+{
+
+	public static function foo()
+	{
+		Foo::foo();
+		Foo::deprecatedFoo();
+		Foo::deprecatedFoo2();
+	}
+
+}
diff --git a/tests/Rules/Deprecations/data/fetching-class-const-of-deprecated-class.php b/tests/Rules/Deprecations/data/fetching-class-const-of-deprecated-class.php
@@ -4,3 +4,26 @@
 
 echo Foo::class;
 echo DeprecatedFoo::class;
+
+/**
+ * @deprecated
+ */
+function deprecated_scope()
+{
+	echo Foo::class;
+	echo DeprecatedFoo::class;
+}
+
+/**
+ * @deprecated
+ */
+class DeprecatedScope
+{
+
+	function foo()
+	{
+		echo Foo::class;
+		echo DeprecatedFoo::class;
+	}
+
+}
diff --git a/tests/Rules/Deprecations/data/implementation-of-deprecated-interface-in-anonymous-classes.php b/tests/Rules/Deprecations/data/implementation-of-deprecated-interface-in-anonymous-classes.php
diff --git a/tests/Rules/Deprecations/data/implementation-of-deprecated-interface-in-classes.php b/tests/Rules/Deprecations/data/implementation-of-deprecated-interface-in-classes.php
diff --git a/tests/Rules/Deprecations/data/inheritance-of-deprecated-class-in-anonymous-classes.php b/tests/Rules/Deprecations/data/inheritance-of-deprecated-class-in-anonymous-classes.php
diff --git a/tests/Rules/Deprecations/data/instantiation-of-deprecated-class.php b/tests/Rules/Deprecations/data/instantiation-of-deprecated-class.php
diff --git a/tests/Rules/Deprecations/data/usage-of-deprecated-trait.php b/tests/Rules/Deprecations/data/usage-of-deprecated-trait.php

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ public function getNodeType(): string`
`31`	`31`	`*/`
`32`	`32`	`public function processNode(Node $node, Scope $scope): array`
`33`	`33`	`{`
	`34`	`+ if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {`
	`35`	`+ return [];`
	`36`	`+ }`
	`37`	`+`
`34`	`38`	`if (!is_string($node->name)) {`
`35`	`39`	`return [];`
`36`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ public function getNodeType(): string`
`37`	`37`	`*/`
`38`	`38`	`public function processNode(Node $node, Scope $scope): array`
`39`	`39`	`{`
	`40`	`+ if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {`
	`41`	`+ return [];`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`if (!is_string($node->name)) {`
`41`	`45`	`return [];`
`42`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ public function getNodeType(): string`
`30`	`30`	`*/`
`31`	`31`	`public function processNode(Node $node, Scope $scope): array`
`32`	`32`	`{`
	`33`	`+ if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {`
	`34`	`+ return [];`
	`35`	`+ }`
	`36`	`+`
`33`	`37`	`if (!($node->name instanceof \PhpParser\Node\Name)) {`
`34`	`38`	`return [];`
`35`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,10 @@ public function getNodeType(): string`
`33`	`33`	`*/`
`34`	`34`	`public function processNode(Node $node, Scope $scope): array`
`35`	`35`	`{`
	`36`	`+ if (DeprecatedScopeHelper::isScopeDeprecated($scope)) {`
	`37`	`+ return [];`
	`38`	`+ }`
	`39`	`+`
`36`	`40`	`if (!is_string($node->name)) {`
`37`	`41`	`return [];`
`38`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,10 @@ public function processNode(Node $node, Scope $scope): array`
`42`	`42`	`return [];`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ if ($class->isDeprecated()) {`
	`46`	`+ return [];`
	`47`	`+ }`
	`48`	`+`
`45`	`49`	`foreach ($node->implements as $implement) {`
`46`	`50`	`$interfaceName = (string) $implement;`
`47`	`51`