Commit 4653a5ab authored by catch's avatar catch
Browse files

Issue #3472092 by nicxvan, smustgrave: Remove references to ApcClassLoader (removed in Symfony 4) 

(cherry picked from commit 6df676ad)
parent 39041950

core/includes/install.core.inc

+2 −4
Original line number Diff line number Diff line
@@ -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.

core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php

+1 −2
Original line number Diff line number Diff line
@@ -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.

core/lib/Drupal/Core/DrupalKernel.php

+1 −2
Original line number Diff line number Diff line
@@ -1596,8 +1596,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) {

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

+1 −2
Original line number Diff line number Diff line
@@ -58,8 +58,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;