damiankloip

diff --git a/core/lib/Drupal/Core/Cache/CacheCollector.php b/core/lib/Drupal/Core/Cache/CacheCollector.php
index 5971cf1..0d0e25e 100644
--- a/core/lib/Drupal/Core/Cache/CacheCollector.php
+++ b/core/lib/Drupal/Core/Cache/CacheCollector.php
@@ -155,7 +155,7 @@ public function set($key, $value) {
     $this->storage[$key] = $value;
     // The key might have been marked for deletion.
     unset($this->keysToRemove[$key]);
-    $this->invalidateCache();
+    $this->deleteCache();

damiankloip

diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index 001e278..a795e0e 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -759,6 +759,9 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
       watchdog('system', '%module module uninstalled.', array('%module' => $module), WATCHDOG_INFO);
 
       $schema_store->delete($module);
+
+      // Make sure any route data is also removed for this module.

damiankloip

diff --git a/docroot/sites/all/modules/custom/cci_cloud/cci_cloud.install b/docroot/sites/all/modules/custom/cci_cloud/cci_cloud.install
index 6e25d2b..6d065db 100644
--- a/docroot/sites/all/modules/custom/cci_cloud/cci_cloud.install
+++ b/docroot/sites/all/modules/custom/cci_cloud/cci_cloud.install
@@ -85,6 +85,7 @@ function cci_cloud_schema() {
       'data' => array(
         'description' => 'Any additional data required',
         'type' => 'blob',
+        'serialize' => TRUE,
       ),

damiankloip

diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index bc99b02..2d47e76 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -2130,11 +2130,59 @@ public function executeHookMenuLinkDefaults(array &$existing_links) {
    * Render this display.
    */
   public function render() {
+    $view_id = $this->view->storage->id();
     $element = array(

damiankloip

diff --git a/core/modules/views/lib/Drupal/views/ViewsData.php b/core/modules/views/lib/Drupal/views/ViewsData.php
index a1e2da4..a2a7d29 100644
--- a/core/modules/views/lib/Drupal/views/ViewsData.php
+++ b/core/modules/views/lib/Drupal/views/ViewsData.php
@@ -38,13 +38,20 @@ class ViewsData {
   protected $cacheBackend;
 
   /**
-   * Storage for the data itself.
+   * Table data storage.

damiankloip

    /**
     * Get an array of default options to apply to the client
     *
     * @return array
     */
    protected function getDefaultOptions()
    {
        $settings = [
            'allow_redirects' => true,
            'exceptions'      => true,

damiankloip

--- a/core/lib/Drupal/Core/Http/Client.php
+++ b/core/lib/Drupal/Core/Http/Client.php
@@ -20,28 +20,27 @@ class Client extends GuzzleClient {
    * {@inheritdoc}
    */
   public function __construct(array $config = []) {
-    $defaults = array(
+    $default_config = array(
       'config' => array(
         'curl' => array(

damiankloip

diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index d01235d..11554d5 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -617,10 +617,6 @@ function template_preprocess_views_view_table(&$variables) {
         $column_reference['attributes']['class'][] = 'views-field-' . $variables['fields'][$field];
       }
 
-      if ($classes = $fields[$field]->elementClasses($num)) {
-        $column_reference['attributes']['class'][] = $classes;

damiankloip

diff --git a/core/core.services.yml b/core/core.services.yml
index 9b9c80b..0bea639 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -299,6 +299,8 @@ services:
     arguments: ['@serialization.phpserialize', '@database', '@lock']
   router.request_context:
     class: Symfony\Component\Routing\RequestContext
+    calls:
+      - [fromRequest, ['@?request']]

damiankloip

diff --git a/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php b/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php
index 37a141f..c260a31 100644
--- a/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php
+++ b/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php
@@ -20,18 +20,18 @@
 class CsrfTokenGenerator {
 
   /**
-   * The private key service.
+   * The private key.