From 6df676adb27d26e43348f5ba79dd495ac67b433a Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Mon, 9 Sep 2024 17:38:41 +0100
Subject: [PATCH] Issue #3472092 by nicxvan, smustgrave: Remove references to
ApcClassLoader (removed in Symfony 4)
---
core/includes/install.core.inc | 6 ++----
.../Drupal/Core/Config/BootstrapConfigStorageFactory.php | 3 +--
core/lib/Drupal/Core/DrupalKernel.php | 3 +--
core/lib/Drupal/Core/Test/TestDiscovery.php | 3 +--
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 68ef6a2c81a2..ee1cacdded53 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -89,8 +89,7 @@
*
* @param $class_loader
* The class loader. Normally Composer's ClassLoader, as included by the
- * front controller, but may also be decorated; e.g.,
- * \Symfony\Component\ClassLoader\ApcClassLoader.
+ * front controller, but may also be decorated.
* @param $settings
* An optional array of installation settings. Leave this empty for a normal,
* interactive, browser-based installation intended to occur over multiple
@@ -288,8 +287,7 @@ function install_state_defaults() {
*
* @param $class_loader
* The class loader. Normally Composer's ClassLoader, as included by the
- * front controller, but may also be decorated; e.g.,
- * \Symfony\Component\ClassLoader\ApcClassLoader.
+ * front controller, but may also be decorated.
* @param $install_state
* An array of information about the current installation state. This is
* modified with information gleaned from the beginning of the page request.
diff --git a/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php b/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
index 52f7ca52e21d..4717286a9063 100644
--- a/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
+++ b/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
@@ -15,8 +15,7 @@ class BootstrapConfigStorageFactory {
*
* @param $class_loader
* The class loader. Normally Composer's ClassLoader, as included by the
- * front controller, but may also be decorated; e.g.,
- * \Symfony\Component\ClassLoader\ApcClassLoader.
+ * front controller, but may also be decorated.
*
* @return \Drupal\Core\Config\StorageInterface
* A configuration storage implementation.
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index f0766df88936..ae5a99cdb1b0 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -1526,8 +1526,7 @@ protected function getModuleNamespacesPsr4($module_file_names) {
* associated with this namespace.
* @param object $class_loader
* The class loader. Normally \Composer\Autoload\ClassLoader, as included by
- * the front controller, but may also be decorated; e.g.,
- * \Symfony\Component\ClassLoader\ApcClassLoader.
+ * the front controller, but may also be decorated.
*/
protected function classLoaderAddMultiplePsr4(array $namespaces = [], $class_loader = NULL) {
if ($class_loader === NULL) {
diff --git a/core/lib/Drupal/Core/Test/TestDiscovery.php b/core/lib/Drupal/Core/Test/TestDiscovery.php
index ad5b9ef30796..ad2955de79a3 100644
--- a/core/lib/Drupal/Core/Test/TestDiscovery.php
+++ b/core/lib/Drupal/Core/Test/TestDiscovery.php
@@ -57,8 +57,7 @@ class TestDiscovery {
* The app root.
* @param $class_loader
* The class loader. Normally Composer's ClassLoader, as included by the
- * front controller, but may also be decorated; e.g.,
- * \Symfony\Component\ClassLoader\ApcClassLoader.
+ * front controller, but may also be decorated.
*/
public function __construct($root, $class_loader) {
$this->root = $root;
--
GitLab