Replace deprecated PHPUnit code coverage annotations.

See sebastianbergmann/phpunit#3631.

Author: slucero

modules/patternkit_usage_tracking/src/LayoutUsageTracker.php

@@ -3,12 +3,10 @@
 namespace Drupal\patternkit_usage_tracking;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Config\ImmutableConfig;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\layout_builder\SectionStorage\SectionStorageManagerInterface;
 use Drupal\patternkit\LayoutHelper;
 use Drupal\patternkit\Utility\PatternDetector;
 
@@ -20,80 +18,36 @@ class LayoutUsageTracker {
   use PatternLayoutDiscoveryTrait;
   use PatternLayoutUsageInsertTrait;
 
-  /**
-   * Entity type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected EntityTypeManagerInterface $entityTypeManager;
-
-  /**
-   * Entity field manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
-   */
-  protected EntityFieldManagerInterface $entityFieldManager;
-
-  /**
-   * The configuration factory service.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected ConfigFactoryInterface $configFactory;
-
-  /**
-   * The track config.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected ImmutableConfig $config;
-
-  /**
-   * The pattern usage revision helper service.
-   *
-   * @var \Drupal\patternkit_usage_tracking\UsageRevisionHelper
-   */
-  protected UsageRevisionHelper $revisionHelper;
-
   /**
    * Create a new instance of a LayoutUsageDetector.
    *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   The EntityTypeManager service.
-   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entityFieldManager
    *   The EntityFieldManager service.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
    *   The factory for configuration objects.
-   * @param \Drupal\patternkit_usage_tracking\PatternUsageManager $tracking_storage
+   * @param \Drupal\patternkit_usage_tracking\PatternUsageManager $trackingStorage
    *   The pattern usage tracking storage.
-   * @param \Drupal\patternkit\LayoutHelper $layout_helper
+   * @param \Drupal\patternkit\LayoutHelper $layoutHelper
    *   The patternkit layout helper service.
-   * @param \Drupal\patternkit\Utility\PatternDetector $pattern_detector
+   * @param \Drupal\patternkit\Utility\PatternDetector $patternDetector
    *   The pattern detector service.
-   * @param \Drupal\layout_builder\SectionStorage\SectionStorageManagerInterface $section_storage_manager
+   * @param \Drupal\layout_builder\SectionStorage\SectionStorageManagerInterface $sectionStorageManager
    *   The section storage manager service.
-   * @param \Drupal\patternkit_usage_tracking\UsageRevisionHelper $revision_helper
+   * @param \Drupal\patternkit_usage_tracking\UsageRevisionHelper $revisionHelper
    *   The pattern usage revision helper service.
    */
   public function __construct(
-    EntityTypeManagerInterface $entity_type_manager,
-    EntityFieldManagerInterface $entity_field_manager,
-    ConfigFactoryInterface $config_factory,
-    PatternUsageManager $tracking_storage,
-    LayoutHelper $layout_helper,
-    PatternDetector $pattern_detector,
-    SectionStorageManagerInterface $section_storage_manager,
-    UsageRevisionHelper $revision_helper,
-  ) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityFieldManager = $entity_field_manager;
-    $this->configFactory = $config_factory;
-    $this->trackingStorage = $tracking_storage;
-    $this->layoutHelper = $layout_helper;
-    $this->patternDetector = $pattern_detector;
-    $this->sectionStorageManager = $section_storage_manager;
-    $this->revisionHelper = $revision_helper;
-  }
+    protected EntityTypeManagerInterface $entityTypeManager,
+    protected EntityFieldManagerInterface $entityFieldManager,
+    protected ConfigFactoryInterface $configFactory,
+    protected PatternUsageManager $trackingStorage,
+    protected LayoutHelper $layoutHelper,
+    protected PatternDetector $patternDetector,
+    protected $sectionStorageManager,
+    protected UsageRevisionHelper $revisionHelper,
+  ) {}
 
   /**
    * Test whether an entity should be tracked by this plugin.

modules/patternkit_usage_tracking/tests/src/Unit/LayoutUsageTrackerTest.php

@@ -187,7 +187,6 @@ public function testShouldTrackEntity(): void {
   /**
    * @covers ::trackOnEntityUpdate
    * @covers ::__construct
-   * @covers ::<protected>
    */
   public function testTrackOnEntityUpdate(): void {
     $mock = $this->getPartialMock([
@@ -211,7 +210,6 @@ public function testTrackOnEntityUpdate(): void {
   /**
    * @covers ::trackOnEntityUpdate
    * @covers ::__construct
-   * @covers ::<protected>
    */
   public function testTrackOnEntityUpdateOnlyLatestRevision(): void {
     $mock = $this->getPartialMock([
@@ -242,7 +240,7 @@ public function testTrackOnEntityUpdateOnlyLatestRevision(): void {
    * @covers ::getPatternsByLayoutComponentByEntity
    * @covers ::shouldTrackEntity
    * @covers ::__construct
-   * @covers ::<protected>
+   * @covers \Drupal\patternkit_usage_tracking\PatternLayoutDiscoveryTrait::getNestedPatterns
    */
   public function testTrackOnEntityCreation(): void {
     $layout = $this->prophesize(SectionListInterface::class)
@@ -311,13 +309,9 @@ public function testTrackOnEntityCreation(): void {
 
   /**
    * @covers ::trackOnEntityCreation
-   * @covers ::getNestedPatterns
-   * @covers ::identifyPatternsByComponent
-   * @covers ::getPatternsByLayoutComponent
-   * @covers ::getPatternsByLayoutComponentByEntity
    * @covers ::shouldTrackEntity
    * @covers ::__construct
-   * @covers ::<protected>
+   * @covers \Drupal\patternkit_usage_tracking\PatternLayoutDiscoveryTrait
    */
   public function testTrackOnEntityCreationWithNestedPatterns(): void {
     $layout = $this->prophesize(SectionListInterface::class)

modules/patternkit_usage_tracking/tests/src/Unit/UsageRevisionHelperTest.php

@@ -387,14 +387,9 @@ public static function providerLoadPreviouslyTrackedPatterns(): array {
   }
 
   /**
-   * @covers ::trackOnEntityUpdate
-   * @covers ::loadPreviouslyTrackedPatterns
-   * @covers ::trackChanges
-   * @covers ::shouldTrackEntity
-   * @covers ::updateRelatedTranslations
-   * @covers ::__construct
-   * @covers ::<protected>
+   * @covers \Drupal\patternkit_usage_tracking\UsageRevisionHelper
    * @covers \Drupal\patternkit_usage_tracking\PatternLayoutDiscoveryTrait
+   * @covers \Drupal\patternkit_usage_tracking\PatternLayoutUsageInsertTrait
    *
    * @dataProvider providerTrackOnEntityUpdate
    */

tests/src/Unit/Asset/PatternLibraryParser/TwigPatternLibraryParserTest.php

@@ -125,7 +125,7 @@ public static function providerCreatePattern(): array {
 
   /**
    * @covers ::parsePatternLibraryInfo
-   * @covers ::<protected>
+   * @covers \Drupal\patternkit\Asset\PatternLibraryParser\TwigPatternLibraryParser
    * @uses \Drupal\patternkit\Asset\PatternLibraryParser\TwigPatternLibraryParser::createPattern()
    * @uses \Drupal\patternkit\Asset\PatternLibraryParserBase
    */

tests/src/Unit/PatternLibraryPluginManagerTest.php

@@ -99,6 +99,7 @@ protected function getPluginManager(iterable $namespaces = []): PatternLibraryPl
    *   The plugin ID to generate a fallback for.
    *
    * @covers ::getFallbackPluginId
+   * @covers \Drupal\patternkit\PatternLibraryPluginManager
    *
    * @dataProvider providerGetFallbackPluginId()
    */
@@ -121,6 +122,7 @@ public static function providerGetFallbackPluginId(): array {
    * Test getFallbackPluginId() behavior with no successful result available.
    *
    * @covers ::getFallbackPluginId()
+   * @covers \Drupal\patternkit\PatternLibraryPluginManager
    */
   public function testGetFallbackPluginIdFailure(): void {
     $pluginManager = $this->getPluginManager();
@@ -135,6 +137,7 @@ public function testGetFallbackPluginIdFailure(): void {
    * Test valid calls to createInstance().
    *
    * @covers ::createInstance
+   * @covers \Drupal\patternkit\PatternLibraryPluginManager
    */
   public function testCreateInstance(): void {
     $pluginManager = $this->getPluginManager();
@@ -160,6 +163,7 @@ public function testCreateInstance(): void {
    * @covers ::createInstance
    * @covers ::handlePluginNotFound
    * @covers ::getFallbackPluginId
+   * @covers \Drupal\patternkit\PatternLibraryPluginManager
    */
   public function testCreateInstanceWithFallback(): void {
     $pluginManager = $this->getPluginManager();
@@ -213,6 +217,7 @@ public function testCreateInstanceWithFallback(): void {
    * @covers ::createInstance
    * @covers ::handlePluginNotFound
    * @covers ::getFallbackPluginId
+   * @covers \Drupal\patternkit\PatternLibraryPluginManager
    */
   public function testCreateInstanceWithFallbackFailure(): void {
     $pluginManager = $this->getPluginManager();

tests/src/Unit/Schema/SchemaIteratorTest.php

@@ -326,8 +326,7 @@ public function testGetChildren() {
 
   /**
    * @covers ::getPropertySchema
-   * @covers ::<public>
-   * @uses \Drupal\patternkit\Schema\SchemaIterator::__construct
+   * @covers \Drupal\patternkit\Schema\SchemaIterator
    */
   public function testGetPropertySchema() {
     $schema_json = $this->loadFixture('schemas/composed_component.json');