From 9d64e97e4606be98fcf6ff2890b4746e2f5ab4d3 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Sat, 11 Nov 2023 11:39:22 +0000
Subject: [PATCH] =?UTF-8?q?Issue=20#3301205=20by=20Spokje,=20mondrake,=20G?=
 =?UTF-8?q?=C3=A1bor=20Hojtsy,=20quietone,=20catch,=20xjm:=20Replace=20the?=
 =?UTF-8?q?=20test=20class=20protected=20$modules=20deprecation=20error=20?=
 =?UTF-8?q?with=20a=20phpstan-drupal=20rule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                                        | 2 +-
 composer.lock                                        | 2 +-
 composer/Metapackage/DevDependencies/composer.json   | 2 +-
 core/tests/Drupal/Tests/Listeners/DrupalListener.php | 5 -----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 0a6844407abf..88c3ce7643e6 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "drupal/coder": "^8.3.10",
         "instaclick/php-webdriver": "^1.4.1",
         "justinrainbow/json-schema": "^5.2",
-        "mglaman/phpstan-drupal": "^1.2",
+        "mglaman/phpstan-drupal": "^1.2.1",
         "micheh/phpcs-gitlab": "^1.1",
         "mikey179/vfsstream": "^1.6.11",
         "open-telemetry/exporter-otlp": "^1",
diff --git a/composer.lock b/composer.lock
index c6f907ad51a6..c56b81aaca3a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6de6a531a498d73d06d78800399c841f",
+    "content-hash": "a13d08162bfae1cd2d3e808e6765474a",
     "packages": [
         {
             "name": "asm89/stack-cors",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index 9d1b900a15ee..addcf3951e15 100644
--- a/composer/Metapackage/DevDependencies/composer.json
+++ b/composer/Metapackage/DevDependencies/composer.json
@@ -15,7 +15,7 @@
         "drupal/coder": "^8.3.10",
         "instaclick/php-webdriver": "^1.4.1",
         "justinrainbow/json-schema": "^5.2",
-        "mglaman/phpstan-drupal": "^1.2",
+        "mglaman/phpstan-drupal": "^1.2.1",
         "micheh/phpcs-gitlab": "^1.1",
         "mikey179/vfsstream": "^1.6.11",
         "open-telemetry/exporter-otlp": "^1",
diff --git a/core/tests/Drupal/Tests/Listeners/DrupalListener.php b/core/tests/Drupal/Tests/Listeners/DrupalListener.php
index b1c895e02a6a..1a1a9db32f2b 100644
--- a/core/tests/Drupal/Tests/Listeners/DrupalListener.php
+++ b/core/tests/Drupal/Tests/Listeners/DrupalListener.php
@@ -51,11 +51,6 @@ public function addSkippedTest(Test $test, \Throwable $t, float $time): void {
    */
   public function startTest(Test $test): void {
     $this->symfonyListener->startTest($test);
-    // Check for incorrect visibility of the $modules property.
-    $class = new \ReflectionClass($test);
-    if ($class->hasProperty('modules') && !$class->getProperty('modules')->isProtected()) {
-      @trigger_error('Declaring ' . get_class($test) . '::$modules with public visibility is deprecated in drupal:9.1.0 and must be declared protected in drupal:10.0.0. See https://www.drupal.org/node/2909426', E_USER_DEPRECATED);
-    }
   }
 
   /**
-- 
GitLab