comparison core/lib/Drupal/Core/Update/UpdateKernel.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

 namespace Drupal\Core\Update;
 
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\Session\AnonymousUserSession;
 use Drupal\Core\Site\Settings;
+use Drupal\Core\StackMiddleware\ReverseProxyMiddleware;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 /**

     try {
       static::bootEnvironment();
 
       // First boot up basic things, like loading the include files.
       $this->initializeSettings($request);
+      ReverseProxyMiddleware::setSettingsOnRequest($request, Settings::getInstance());
       $this->boot();
       $container = $this->getContainer();
       /** @var \Symfony\Component\HttpFoundation\RequestStack $request_stack */
       $request_stack = $container->get('request_stack');
       $request_stack->push($request);

     /** @var callable $db_update_controller */
     $db_update_controller = $controller_resolver->getControllerFromDefinition('\Drupal\system\Controller\DbUpdateController::handle');
 
     $this->setupRequestMatch($request);
 
-    $arguments = $controller_resolver->getArguments($request, $db_update_controller);
+    /** @var \Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface $argument_resolver */
+    $argument_resolver = $container->get('http_kernel.controller.argument_resolver');
+    $arguments = $argument_resolver->getArguments($request, $db_update_controller);
     return call_user_func_array($db_update_controller, $arguments);
   }
 
   /**
    * Boots up the session.
    *
-   * bootSession() + shutdownSession() basically simulates what
+   * This method + shutdownSession() basically simulates what
    * \Drupal\Core\StackMiddleware\Session does.
    *
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The incoming request.
    */

     if (!Settings::get('update_free_access', FALSE) && !$db_update_access->access($account)->isAllowed()) {
       throw new AccessDeniedHttpException('In order to run update.php you need to either have "Administer software updates" permission or have set $settings[\'update_free_access\'] in your settings.php.');
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function loadLegacyIncludes() {
+    parent::loadLegacyIncludes();
+    static::fixSerializedExtensionObjects($this->container);
+  }
+
+  /**
+   * Fixes caches and theme info if they contain old Extension objects.
+   *
+   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+   *   The container.
+   *
+   * @internal
+   *   This function is only to be called by the Drupal core update process.
+   *   Additionally, this function will be removed in minor release of Drupal.
+   *
+   * @todo https://www.drupal.org/project/drupal/issues/3031322 Remove once
+   *   Drupal 8.6.x is not supported.
+   */
+  public static function fixSerializedExtensionObjects(ContainerInterface $container) {
+    // Create a custom error handler that will clear caches if a warning occurs
+    // while getting 'system.theme.data' from state. If this state value was
+    // created by Drupal <= 8.6.7 then when it is read by Drupal >= 8.6.8 there
+    // will be PHP warnings. This silently fixes Drupal so that the update can
+    // continue.
+    $callable = function () use ($container) {
+      // Reset static caches in profile list so the module list is rebuilt
+      // correctly.
+      $container->get('extension.list.profile')->reset();
+      foreach ($container->getParameter('cache_bins') as $service_id => $bin) {
+        $container->get($service_id)->deleteAll();
+      }
+      // Also rebuild themes because it uses state as cache.
+      $container->get('theme_handler')->refreshInfo();
+    };
+
+    set_error_handler($callable, E_ERROR | E_WARNING);
+    $container->get('state')->get('system.theme.data', []);
+    restore_error_handler();
+  }
+
 }