From 74781068ecab83101fd27845d33e2a4b9fcd947a Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 21 Nov 2022 14:14:04 +0000
Subject: [PATCH] Issue #3322763 by Spokje: Fix PHPStan L2 error "PHPDoc tag
 @return with type Foo is incompatible with native type void."

(cherry picked from commit 81b8c8690950b360692a7bc1accc7ef5acb43077)
---
 composer/Composer.php                               | 6 ------
 core/modules/views/tests/src/Unit/ViewsDataTest.php | 2 --
 2 files changed, 8 deletions(-)

diff --git a/composer/Composer.php b/composer/Composer.php
index 1c868ccac0de..448e5d8ad384 100644
--- a/composer/Composer.php
+++ b/composer/Composer.php
@@ -50,9 +50,6 @@ public static function generateComponentPackages(Event $event): void {
    * @param string $version
    *   Semver version to set Drupal's version to.
    *
-   * @return string
-   *   Stability level of the provided version (stable, RC, alpha, etc.)
-   *
    * @throws \UnexpectedValueException
    */
   public static function setDrupalVersion(string $root, string $version): void {
@@ -78,9 +75,6 @@ public static function setDrupalVersion(string $root, string $version): void {
    *   Path to root of drupal/drupal repository.
    * @param string $version
    *   Semver version that Drupal was set to.
-   *
-   * @return string
-   *   Stability level of the provided version (stable, RC, alpha, etc.)
    */
   protected static function setTemplateProjectStability(string $root, string $version): void {
     $stability = VersionParser::parseStability($version);
diff --git a/core/modules/views/tests/src/Unit/ViewsDataTest.php b/core/modules/views/tests/src/Unit/ViewsDataTest.php
index b30ff6480535..0177af2b7ab2 100644
--- a/core/modules/views/tests/src/Unit/ViewsDataTest.php
+++ b/core/modules/views/tests/src/Unit/ViewsDataTest.php
@@ -128,8 +128,6 @@ protected function viewsDataWithProvider() {
 
   /**
    * Mocks the basic module handler used for the test.
-   *
-   * @return \Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected function setupMockedModuleHandler(): void {
     $this->moduleHandler->expects($this->atLeastOnce())
-- 
GitLab