Run compare script to see diffs

janedbal · janedbal · commit 2552afc40f17 · 2024-09-03T15:36:52.000+02:00
diff --git a/tests/Rule/data/DeadMethodRule/array-map-1.php b/tests/Rule/data/DeadMethodRule/array-map-1.php
@@ -15,10 +15,10 @@ public function __construct()
     }
 
     public function method1(string $foo): void {} // error: Unused DeadMap\ArrayMapTest::method1
-    public function method2(): void {}
-    public function method3(): void {}
-    public function method4(): void {}
-    public static function method5(): void {}
+    public function method2(): void {} // error: Unused DeadMap\ArrayMapTest::method2
+    public function method3(): void {} // error: Unused DeadMap\ArrayMapTest::method3
+    public function method4(): void {} // error: Unused DeadMap\ArrayMapTest::method4
+    public static function method5(): void {} // error: Unused DeadMap\ArrayMapTest::method5
     public static function method6(): void {} // error: Unused DeadMap\ArrayMapTest::method6
 }
 
@@ -28,7 +28,7 @@ public function method2(): void {}
     public function method3(): void {}
     public function method4(): void {}
     public static function method5(): void {} // should be reported (https://github.com/phpstan/phpstan-src/pull/3372)
-    public static function method6(): void {} // error: Unused DeadMap\Child::method6
+    public static function method6(): void {}
 
 }
 
diff --git a/tests/Rule/data/DeadMethodRule/basic.php b/tests/Rule/data/DeadMethodRule/basic.php
@@ -62,7 +62,7 @@ abstract class TestParent {
 
     use TestTrait;
 
-    public function __construct() // error: Unused DeadBasic\TestParent::__construct
+    public function __construct()
     {
     }
 
@@ -72,7 +72,7 @@ public function parentMethodUsed(TestChild $child): void
         $this->traitMethodUsed();
     }
 
-    public function overwrittenParentMethodUsedByChild(): void // error: Unused DeadBasic\TestParent::overwrittenParentMethodUsedByChild
+    public function overwrittenParentMethodUsedByChild(): void
     {
 
     }
@@ -85,7 +85,7 @@ public function parentMethodUnused(): void  // error: Unused DeadBasic\TestParen
 
 trait TestTrait {
 
-    public function __construct() // error: Unused DeadBasic\TestTrait::__construct
+    public function __construct()
     {
     }
 
@@ -94,7 +94,7 @@ public function traitMethodUsed(): void
 
     }
 
-    public function traitMethodUnused(): void // error: Unused DeadBasic\TestTrait::traitMethodUnused
+    public function traitMethodUnused(): void
     {
 
     }
diff --git a/tests/Rule/data/DeadMethodRule/class-string.php b/tests/Rule/data/DeadMethodRule/class-string.php
@@ -4,7 +4,7 @@
 
 class ClassWithMethod {
 
-    public static function someMethod(): void {}
+    public static function someMethod(): void {} // error: Unused ClassStringCall\ClassWithMethod::someMethod
 }
 
 /**
diff --git a/tests/Rule/data/DeadMethodRule/ctor-interface.php b/tests/Rule/data/DeadMethodRule/ctor-interface.php
@@ -4,7 +4,7 @@
 
 interface MyInterface
 {
-    public function __construct(); // error: Unused CtorInterface\MyInterface::__construct
+    public function __construct();
 }
 
 class Child1 implements MyInterface
diff --git a/tests/Rule/data/DeadMethodRule/ctor.php b/tests/Rule/data/DeadMethodRule/ctor.php
@@ -11,7 +11,7 @@ public function __construct()
 
 class Child1 extends ParentClass
 {
-    public function __construct() // error: Unused Ctor\Child1::__construct
+    public function __construct()
     {
     }
 }
diff --git a/tests/Rule/data/DeadMethodRule/dead-in-parent-1.php b/tests/Rule/data/DeadMethodRule/dead-in-parent-1.php
@@ -20,7 +20,7 @@ class B extends A
     /**
      * @inheritDoc
      */
-    public function __construct() // error: Unused DeadParent\B::__construct
+    public function __construct()
     {
         parent::__construct();
     }
diff --git a/tests/Rule/data/DeadMethodRule/dynamic-method.php b/tests/Rule/data/DeadMethodRule/dynamic-method.php
@@ -4,11 +4,11 @@
 
 class Test {
 
-    public static function a(): void {}
-    public static function b(): void {}
+    public static function a(): void {} // error: Unused DynamicMethod\Test::a
+    public static function b(): void {} // error: Unused DynamicMethod\Test::b
 
-    public function c(): void {}
-    public function d(): void {}
+    public function c(): void {} // error: Unused DynamicMethod\Test::c
+    public function d(): void {} // error: Unused DynamicMethod\Test::d
 }
 
 /**
diff --git a/tests/Rule/data/DeadMethodRule/entrypoint.php b/tests/Rule/data/DeadMethodRule/entrypoint.php
@@ -9,7 +9,7 @@ public function __construct()
     {
     }
 
-    public function someUnused(): void
+    public function someUnused(): void // error: Unused DeadEntrypoint\Entrypoint::someUnused
     {
         Dead::usedMethod();
     }
diff --git a/tests/Rule/data/DeadMethodRule/indirect-interface.php b/tests/Rule/data/DeadMethodRule/indirect-interface.php
@@ -4,7 +4,7 @@
 
 interface FooInterface
 {
-    public function foo(): void; // error: Unused DeadIndirect\FooInterface::foo
+    public function foo(): void;
 }
 
 abstract class FooAbstract
diff --git a/tests/Rule/data/DeadMethodRule/nullsafe.php b/tests/Rule/data/DeadMethodRule/nullsafe.php
@@ -12,7 +12,7 @@ public function second(): self {
         return $this;
     }
 
-    public static function secondStatic(): self {
+    public static function secondStatic(): self { // error: Unused Nullsafe\A::secondStatic
         return new self();
     }
 }
diff --git a/tests/Rule/data/DeadMethodRule/overwriting-methods-1.php b/tests/Rule/data/DeadMethodRule/overwriting-methods-1.php
@@ -4,12 +4,12 @@
 
 interface Interface1
 {
-    public function foo(): void; // error: Unused DeadOver1\Interface1::foo
+    public function foo(): void;
 }
 
 interface Interface2
 {
-    public function foo(): void; // error: Unused DeadOver1\Interface2::foo
+    public function foo(): void;
 }
 
 abstract class AbstractClass implements Interface1, Interface2
diff --git a/tests/Rule/data/DeadMethodRule/overwriting-methods-2.php b/tests/Rule/data/DeadMethodRule/overwriting-methods-2.php
@@ -4,17 +4,17 @@
 
 interface Interface1
 {
-    public function foo(): void; // error: Unused DeadOver2\Interface1::foo
+    public function foo(): void;
 }
 
 interface Interface2
 {
-    public function foo(): void; // error: Unused DeadOver2\Interface2::foo
+    public function foo(): void;
 }
 
 abstract class AbstractClass implements Interface1, Interface2
 {
-    public abstract function foo(): void; // error: Unused DeadOver2\AbstractClass::foo
+    public abstract function foo(): void;
 }
 
 class Child1 extends AbstractClass
@@ -24,7 +24,7 @@ public function foo(): void {}
 
 class Child2 extends AbstractClass
 {
-    public function foo(): void {} // error: Unused DeadOver2\Child2::foo
+    public function foo(): void {}
 }
 
 function testIt(Child1 $child1): void
diff --git a/tests/Rule/data/DeadMethodRule/overwriting-methods-3.php b/tests/Rule/data/DeadMethodRule/overwriting-methods-3.php
@@ -4,22 +4,22 @@
 
 interface Interface1
 {
-    public function foo(): void; // error: Unused DeadOver3\Interface1::foo
+    public function foo(): void;
 }
 
 interface Interface2
 {
-    public function foo(): void; // error: Unused DeadOver3\Interface2::foo
+    public function foo(): void;
 }
 
 abstract class AbstractClass implements Interface1, Interface2
 {
-    public abstract function foo(): void; // error: Unused DeadOver3\AbstractClass::foo
+    public abstract function foo(): void;
 }
 
 class Child1 extends AbstractClass
 {
-    public function foo(): void {} // error: Unused DeadOver3\Child1::foo
+    public function foo(): void {}
 }
 
 class Child2 extends AbstractClass
diff --git a/tests/Rule/data/DeadMethodRule/overwriting-methods-4.php b/tests/Rule/data/DeadMethodRule/overwriting-methods-4.php
@@ -9,7 +9,7 @@ public function foo(): void;
 
 interface Interface2
 {
-    public function foo(): void; // error: Unused DeadOver4\Interface2::foo
+    public function foo(): void;
 }
 
 abstract class AbstractClass implements Interface1, Interface2
diff --git a/tests/Rule/data/DeadMethodRule/overwriting-methods-5.php b/tests/Rule/data/DeadMethodRule/overwriting-methods-5.php
@@ -4,7 +4,7 @@
 
 interface Interface1
 {
-    public function foo(): void; // error: Unused DeadOver5\Interface1::foo
+    public function foo(): void;
 }
 
 interface Interface2
diff --git a/tests/Rule/data/DeadMethodRule/parent-call-1.php b/tests/Rule/data/DeadMethodRule/parent-call-1.php
@@ -19,7 +19,7 @@ public function foo(): void {
 
 class Child2 extends AbstractClass
 {
-    public function foo(): void {} // error: Unused ParentCall1\Child2::foo
+    public function foo(): void {}
 }
 
 function testIt(Child1 $child1): void
diff --git a/tests/Rule/data/DeadMethodRule/parent-call-2.php b/tests/Rule/data/DeadMethodRule/parent-call-2.php
@@ -4,7 +4,7 @@
 
 abstract class AbstractClass
 {
-    public function foo(): void {} // error: Unused ParentCall2\AbstractClass::foo
+    public function foo(): void {}
 }
 
 class Child1 extends AbstractClass
diff --git a/tests/Rule/data/DeadMethodRule/parent-call-4.php b/tests/Rule/data/DeadMethodRule/parent-call-4.php
@@ -11,7 +11,7 @@ public function __construct()
 
 class AbstractClass extends RootClass
 {
-    public function __construct() // error: Unused ParentCall4\AbstractClass::__construct
+    public function __construct()
     {
     }
 }
diff --git a/tests/Rule/data/DeadMethodRule/traits-1.php b/tests/Rule/data/DeadMethodRule/traits-1.php
@@ -5,7 +5,7 @@
 trait Trait1 {
 
     public static function used(): void {}
-    public static function unused(): void {} // error: Unused DeadTrait1\Trait1::unused
+    public static function unused(): void {}
 }
 
 class User1
diff --git a/tests/Rule/data/DeadMethodRule/traits-3.php b/tests/Rule/data/DeadMethodRule/traits-3.php
@@ -5,12 +5,12 @@
 trait MyTrait1 {
 
     public function used(): void {}
-    public function unused(): void {} // error: Unused DeadTrait3\MyTrait1::unused
+    public function unused(): void {}
 }
 
 interface TraitInterface
 {
-    public function used(): void; // error: Unused DeadTrait3\TraitInterface::used
+    public function used(): void;
 }
 
 class MyUser1 implements TraitInterface
diff --git a/tests/Rule/data/DeadMethodRule/traits-4.php b/tests/Rule/data/DeadMethodRule/traits-4.php
@@ -4,7 +4,7 @@
 
 trait MyTrait1 {
 
-    public function __construct() // error: Unused DeadTrait4\MyTrait1::__construct
+    public function __construct()
     {
     }
 }
diff --git a/tests/Rule/data/DeadMethodRule/traits-5.php b/tests/Rule/data/DeadMethodRule/traits-5.php
@@ -5,7 +5,7 @@
 trait MyTrait1 {
 
     // because all children override this method, it is unused
-    public function used(): void {} // error: Unused DeadTrait5\MyTrait1::used
+    public function used(): void {}
 }
 
 interface TraitInterface
diff --git a/tests/Rule/data/DeadMethodRule/traits-7.php b/tests/Rule/data/DeadMethodRule/traits-7.php
@@ -3,7 +3,7 @@
 namespace DeadTrait7;
 
 trait HelloWorld {
-    public function sayHello() { // error: Unused DeadTrait7\HelloWorld::sayHello
+    public function sayHello() {
         echo 'Hello World!';
     }
 }
diff --git a/tests/Rule/data/DeadMethodRule/traits-8.php b/tests/Rule/data/DeadMethodRule/traits-8.php
@@ -3,7 +3,7 @@
 namespace DeadTrait8;
 
 trait A {
-    public function smallTalk() { // error: Unused DeadTrait8\A::smallTalk
+    public function smallTalk() {
         echo 'a';
     }
     public function bigTalk() {

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ public function __construct()`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public function method1(string $foo): void {} // error: Unused DeadMap\ArrayMapTest::method1`
`18`		`- public function method2(): void {}`
`19`		`- public function method3(): void {}`
`20`		`- public function method4(): void {}`
`21`		`- public static function method5(): void {}`
	`18`	`+ public function method2(): void {} // error: Unused DeadMap\ArrayMapTest::method2`
	`19`	`+ public function method3(): void {} // error: Unused DeadMap\ArrayMapTest::method3`
	`20`	`+ public function method4(): void {} // error: Unused DeadMap\ArrayMapTest::method4`
	`21`	`+ public static function method5(): void {} // error: Unused DeadMap\ArrayMapTest::method5`
`22`	`22`	`public static function method6(): void {} // error: Unused DeadMap\ArrayMapTest::method6`
`23`	`23`	`}`
`24`	`24`
`@@ -28,7 +28,7 @@ public function method2(): void {}`
`28`	`28`	`public function method3(): void {}`
`29`	`29`	`public function method4(): void {}`
`30`	`30`	`public static function method5(): void {} // should be reported (https://github.com/phpstan/phpstan-src/pull/3372)`
`31`		`- public static function method6(): void {} // error: Unused DeadMap\Child::method6`
	`31`	`+ public static function method6(): void {}`
`32`	`32`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ abstract class TestParent {`
`62`	`62`
`63`	`63`	`use TestTrait;`
`64`	`64`
`65`		`- public function __construct() // error: Unused DeadBasic\TestParent::__construct`
	`65`	`+ public function __construct()`
`66`	`66`	`{`
`67`	`67`	`}`
`68`	`68`
`@@ -72,7 +72,7 @@ public function parentMethodUsed(TestChild $child): void`
`72`	`72`	`$this->traitMethodUsed();`
`73`	`73`	`}`
`74`	`74`
`75`		`- public function overwrittenParentMethodUsedByChild(): void // error: Unused DeadBasic\TestParent::overwrittenParentMethodUsedByChild`
	`75`	`+ public function overwrittenParentMethodUsedByChild(): void`
`76`	`76`	`{`
`77`	`77`
`78`	`78`	`}`
`@@ -85,7 +85,7 @@ public function parentMethodUnused(): void // error: Unused DeadBasic\TestParen`
`85`	`85`
`86`	`86`	`trait TestTrait {`
`87`	`87`
`88`		`- public function __construct() // error: Unused DeadBasic\TestTrait::__construct`
	`88`	`+ public function __construct()`
`89`	`89`	`{`
`90`	`90`	`}`
`91`	`91`
`@@ -94,7 +94,7 @@ public function traitMethodUsed(): void`
`94`	`94`
`95`	`95`	`}`
`96`	`96`
`97`		`- public function traitMethodUnused(): void // error: Unused DeadBasic\TestTrait::traitMethodUnused`
	`97`	`+ public function traitMethodUnused(): void`
`98`	`98`	`{`
`99`	`99`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`class ClassWithMethod {`
`6`	`6`
`7`		`- public static function someMethod(): void {}`
	`7`	`+ public static function someMethod(): void {} // error: Unused ClassStringCall\ClassWithMethod::someMethod`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`interface MyInterface`
`6`	`6`	`{`
`7`		`- public function __construct(); // error: Unused CtorInterface\MyInterface::__construct`
	`7`	`+ public function __construct();`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`class Child1 implements MyInterface`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public function __construct()`
`11`	`11`
`12`	`12`	`class Child1 extends ParentClass`
`13`	`13`	`{`
`14`		`- public function __construct() // error: Unused Ctor\Child1::__construct`
	`14`	`+ public function __construct()`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class B extends A`
`20`	`20`	`/**`
`21`	`21`	`* @inheritDoc`
`22`	`22`	`*/`
`23`		`- public function __construct() // error: Unused DeadParent\B::__construct`
	`23`	`+ public function __construct()`
`24`	`24`	`{`
`25`	`25`	`parent::__construct();`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public function __construct()`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
`12`		`- public function someUnused(): void`
	`12`	`+ public function someUnused(): void // error: Unused DeadEntrypoint\Entrypoint::someUnused`
`13`	`13`	`{`
`14`	`14`	`Dead::usedMethod();`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`interface FooInterface`
`6`	`6`	`{`
`7`		`- public function foo(): void; // error: Unused DeadIndirect\FooInterface::foo`
	`7`	`+ public function foo(): void;`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`abstract class FooAbstract`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public function second(): self {`
`12`	`12`	`return $this;`
`13`	`13`	`}`
`14`	`14`
`15`		`- public static function secondStatic(): self {`
	`15`	`+ public static function secondStatic(): self { // error: Unused Nullsafe\A::secondStatic`
`16`	`16`	`return new self();`
`17`	`17`	`}`
`18`	`18`	`}`