Issue #3324801 by Spokje, mondrake: Fix PHPStan L2 error "Property Foo::$bar has unknown class Baz as its type."

(cherry picked from commit 85eeb1bde1)

composer/Plugin/VendorHardening/Config.php

@@ -84,7 +84,7 @@ class Config {
   /**
    * The root package.
    *
-   * @var Composer\Package\RootPackageInterface
+   * @var \Composer\Package\RootPackageInterface
    */
   protected $rootPackage;
 

core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php

@@ -17,7 +17,7 @@ class StaticDiscoveryDecorator extends StaticDiscovery {
   /**
    * A callback or closure used for registering additional definitions.
    *
-   * @var \Callable
+   * @var callable
    */
   protected $registerDefinitions;
 

core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php

@@ -22,7 +22,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface {
    *
    * If this is NULL a rebuild will be triggered.
    *
-   * @var \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface[]
+   * @var \Symfony\Component\Mime\MimeTypeGuesserInterface[]
    *
    * @see \Drupal\Core\File\MimeType\MimeTypeGuesser::addGuesser()
    * @see \Drupal\Core\File\MimeType\MimeTypeGuesser::sortGuessers()

core/lib/Drupal/Core/Routing/LazyRouteCollection.php

@@ -10,7 +10,7 @@ class LazyRouteCollection extends RouteCollection {
   /**
    * The route provider for this generator.
    *
-   * @var \Symfony\Component\Routing\RouteProviderInterface
+   * @var \Drupal\Core\Routing\RouteProviderInterface
    */
   protected $provider;
 

core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php

@@ -42,7 +42,7 @@ trait FunctionalTestSetupTrait {
   /**
    * The class loader to use for installation and initialization of setup.
    *
-   * @var \Symfony\Component\Classloader\Classloader
+   * @var \Composer\Autoload\ClassLoader
    */
   protected $classLoader;
 

core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php

@@ -27,7 +27,7 @@ class Language extends TypedData {
   protected $id;
 
   /**
-   * @var \Drupal\Core\Language
+   * @var \Drupal\Core\Language\Language
    */
   protected $language;
 

core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php

@@ -25,7 +25,7 @@ class BlockViewBuilderTest extends KernelTestBase {
   /**
    * The block being tested.
    *
-   * @var \Drupal\block\Entity\BlockInterface
+   * @var \Drupal\block\BlockInterface
    */
   protected $block;
 

core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php

@@ -18,7 +18,7 @@ abstract class BlockContentTypeResourceTestBase extends ConfigEntityResourceTest
   protected static $entityTypeId = 'block_content_type';
 
   /**
-   * @var \Drupal\block_content\Entity\BlockContentTypeInterface
+   * @var \Drupal\block_content\BlockContentTypeInterface
    */
   protected $entity;
 

core/modules/comment/src/Controller/CommentController.php

@@ -52,7 +52,7 @@ class CommentController extends ControllerBase {
   /**
    * The entity repository.
    *
-   * @var Drupal\Core\Entity\EntityRepositoryInterface
+   * @var \Drupal\Core\Entity\EntityRepositoryInterface
    */
   protected $entityRepository;
 

core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php

@@ -61,7 +61,7 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
   /**
    * Contains the node object used for comments of this test.
    *
-   * @var \Drupal\node\Node
+   * @var \Drupal\node\NodeInterface
    */
   public $node;
 

core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php

@@ -15,7 +15,7 @@ class CommentStatisticsUnitTest extends UnitTestCase {
   /**
    * Mock statement.
    *
-   * @var \Drupal\Core\Database\Statement
+   * @var \Drupal\Core\Database\StatementInterface
    */
   protected $statement;
 

core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php

@@ -28,7 +28,7 @@ class SqlContentEntityStorageSchemaColumnTest extends KernelTestBase {
   /**
    * The created entity.
    *
-   * @var \Drupal\Core\Entity\Entity
+   * @var \Drupal\Core\Entity\EntityInterface
    */
   protected $entity;
 

core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php

@@ -21,7 +21,7 @@ class NodeRevisionsAllTest extends NodeTestBase {
   /**
    * A list of nodes created to be used as starting point of different tests.
    *
-   * @var Drupal\node\NodeInterface[]
+   * @var \Drupal\node\NodeInterface[]
    */
   protected $nodes;
 

core/modules/node/tests/src/Functional/Views/PathPluginTest.php

@@ -33,7 +33,7 @@ class PathPluginTest extends NodeTestBase {
   /**
    * Contains all nodes used by this test.
    *
-   * @var Node[]
+   * @var \Drupal\node\Entity\Node[]
    */
   protected $nodes;
 

core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php

@@ -22,7 +22,7 @@ abstract class OptionsDynamicValuesTestBase extends FieldTestBase {
   /**
    * The created entity.
    *
-   * @var \Drupal\Core\Entity\Entity
+   * @var \Drupal\Core\Entity\EntityInterface
    */
   protected $entity;
 

core/modules/search/src/SearchQuery.php

@@ -110,7 +110,7 @@ class SearchQuery extends SelectExtender {
    * This is always used for the second step in the query, but is not part of
    * the preparation step unless $this->simple is FALSE.
    *
-   * @var Drupal\Core\Database\Query\ConditionInterface[]
+   * @var \Drupal\Core\Database\Query\ConditionInterface[]
    */
   protected $conditions;
 

core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php

@@ -47,7 +47,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
   /**
    * A test user.
    *
-   * @var \Drupal\user\User
+   * @var \Drupal\user\Entity\User
    */
   protected $user;
 
@@ -55,7 +55,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
   /**
    * A test node.
    *
-   * @var \Drupal\node\Node
+   * @var \Drupal\node\Entity\Node
    */
   protected $node;
 
@@ -63,7 +63,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
   /**
    * A test taxonomy term.
    *
-   * @var \Drupal\taxonomy\Term
+   * @var \Drupal\taxonomy\Entity\Term
    */
   protected $term;
 
@@ -71,7 +71,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
   /**
    * A test comment.
    *
-   * @var \Drupal\comment\Comment
+   * @var \Drupal\comment\Entity\Comment
    */
   protected $comment;
 

core/modules/user/tests/src/Functional/UserPasswordResetTest.php

@@ -31,7 +31,7 @@ class UserPasswordResetTest extends BrowserTestBase {
   /**
    * Language manager object.
    *
-   * @var \Drupal\language\LanguageManagerInterface
+   * @var \Drupal\Core\Language\LanguageManagerInterface
    */
   protected $languageManager;
 

core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php

@@ -39,7 +39,7 @@ class UserRoleConditionTest extends KernelTestBase {
   /**
    * A custom role for testing purposes.
    *
-   * @var \Drupal\user\Entity\RoleInterface
+   * @var \Drupal\user\RoleInterface
    */
   protected $role;
 

core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php

@@ -21,7 +21,7 @@ class WhosOnlineBlockTest extends KernelTestBase {
   /**
    * The block being tested.
    *
-   * @var \Drupal\block\Entity\BlockInterface
+   * @var \Drupal\block\BlockInterface
    */
   protected $block;
 

core/modules/views/src/Plugin/views/filter/Combine.php

@@ -14,7 +14,7 @@ use Drupal\Core\Form\FormStateInterface;
 class Combine extends StringFilter {
 
   /**
-   * @var views_plugin_query_default
+   * @var \Drupal\views\Plugin\views\query\QueryPluginBase
    */
   public $query;
 

core/modules/views/src/Plugin/views/query/QueryPluginBase.php

@@ -36,7 +36,7 @@ abstract class QueryPluginBase extends PluginBase implements CacheableDependency
   /**
    * A pager plugin that should be provided by the display.
    *
-   * @var views_plugin_pager
+   * @var \Drupal\views\Plugin\views\pager\PagerPluginBase|null
    */
   public $pager = NULL;
 

core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php

@@ -30,7 +30,7 @@ class RouteSubscriberTest extends UnitTestCase {
   /**
    * The mocked view storage.
    *
-   * @var \Drupal\views\ViewStorage|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Tests\views\Kernel\ViewStorageTest|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $viewStorage;
 

core/modules/views_ui/tests/src/Functional/ReportTest.php

@@ -24,7 +24,7 @@ class ReportTest extends UITestBase {
   /**
    * Stores an admin user used by the different tests.
    *
-   * @var \Drupal\user\User
+   * @var \Drupal\user\Entity\User
    */
   protected $adminUser;
 

core/modules/views_ui/tests/src/Functional/SettingsTest.php

@@ -14,7 +14,7 @@ class SettingsTest extends UITestBase {
   /**
    * Stores an admin user used by the different tests.
    *
-   * @var \Drupal\user\User
+   * @var \Drupal\user\Entity\User
    */
   protected $adminUser;
 

core/tests/Drupal/TestSite/Commands/TestSiteUserLoginCommand.php

@@ -22,7 +22,7 @@ class TestSiteUserLoginCommand extends Command {
   /**
    * The class loader to use for installation and initialization of setup.
    *
-   * @var \Symfony\Component\Classloader\Classloader
+   * @var \Composer\Autoload\ClassLoader
    */
   protected $classLoader;
 

core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php

@@ -31,7 +31,7 @@ class CsrfAccessCheckTest extends UnitTestCase {
   /**
    * The mock route match.
    *
-   * @var \Drupal\Core\RouteMatch\RouteMatchInterface|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Routing\RouteMatchInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $routeMatch;
 

core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php

@@ -28,7 +28,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
   /**
    * The file URL generator mock.
    *
-   * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $fileUrlGenerator;
 

core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php

@@ -13,7 +13,7 @@ class BarClass {
   /**
    * Storage for a protected BazClass object.
    *
-   * @var Drupal\Tests\Core\DependencyInjection\Fixture\BazClass
+   * @var \Drupal\Tests\Core\DependencyInjection\Fixture\BazClass
    */
   protected $baz;
 

core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php

@@ -16,7 +16,7 @@ use Symfony\Component\Routing\Route;
 class EntityRevisionRouteEnhancerTest extends UnitTestCase {
 
   /**
-   * @var \Drupal\Core\Routing\RouteEnhancer\EntityRevisionRouteEnhancer
+   * @var \Drupal\Core\Routing\Enhancer\EntityRevisionRouteEnhancer
    */
   protected $routeEnhancer;
 

core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php

@@ -23,7 +23,7 @@ class EntityUnitTest extends UnitTestCase {
   /**
    * The entity under test.
    *
-   * @var \Drupal\Core\Entity\Entity|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Entity\EntityInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $entity;
 

core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php

@@ -54,7 +54,7 @@ class CustomPageExceptionHtmlSubscriberTest extends UnitTestCase {
   /**
    * The tested custom page exception subscriber.
    *
-   * @var \Drupal\Core\EventSubscriber\CustomPageExceptionHtmlSubscriber|\Drupal\Tests\Core\EventSubscriber\TestCustomPageExceptionHtmlSubscriber
+   * @var \Drupal\Core\EventSubscriber\CustomPageExceptionHtmlSubscriber|\Drupal\Tests\Core\EventSubscriber\CustomPageExceptionHtmlSubscriberTest
    */
   protected $customPageSubscriber;
 

core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php

@@ -17,7 +17,7 @@ class ModuleRouteSubscriberTest extends UnitTestCase {
   /**
    * The mock module handler.
    *
-   * @var Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $moduleHandler;
 

core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php

@@ -66,7 +66,7 @@ class TwigExtensionTest extends UnitTestCase {
   /**
    * The file URL generator mock.
    *
-   * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $fileUrlGenerator;
 

core/tests/Drupal/Tests/Core/Theme/RegistryTest.php

@@ -16,7 +16,7 @@ class RegistryTest extends UnitTestCase {
   /**
    * The mocked theme registry.
    *
-   * @var \Drupal\Core\Theme\Registry|PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Theme\Registry|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $registry;