fix merge

Author: nicolas-grekas

Tests/Extractor/PhpDocExtractorTest.php

@@ -830,9 +830,8 @@ public function testPropertiesParentType(string $class, string $property, ?Type
     /**
      * @param class-string $class
      * @param class-string $expectedResolvedClass
-     *
-     * @dataProvider selfDocBlockResolutionProvider
      */
+    #[DataProvider('selfDocBlockResolutionProvider')]
     public function testSelfDocBlockResolvesToDeclaringClass(string $class, string $property, string $expectedResolvedClass)
     {
         $this->assertEquals(Type::object($expectedResolvedClass), $this->extractor->getType($class, $property));