From dad5ca19d620b80f6a48526348c524f960e90703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Pedro=20Algarvio?= Date: Mon, 9 May 2016 18:33:10 +0100 Subject: [PATCH] Updated modules with composer --- docroot/modules/contrib/ctools/ctools.info.yml | 6 +++--- .../modules/ctools_block/ctools_block.info.yml | 6 +++--- .../ctools_block_field_test.info.yml | 6 +++--- .../modules/ctools_views/ctools_views.info.yml | 6 +++--- .../ctools_views_test_views.info.yml | 6 +++--- .../Plugin/DisplayVariant/BlockDisplayVariant.php | 14 ++++++++++++++ .../contrib/ctools/src/Wizard/FormWizardBase.php | 7 ++++++- .../ctools_wizard_test/ctools_wizard_test.info.yml | 6 +++--- .../tests/src/Kernel/RelationshipManagerTest.php | 4 ++-- 9 files changed, 40 insertions(+), 21 deletions(-) diff --git a/docroot/modules/contrib/ctools/ctools.info.yml b/docroot/modules/contrib/ctools/ctools.info.yml index df53e08a7..6d102903a 100644 --- a/docroot/modules/contrib/ctools/ctools.info.yml +++ b/docroot/modules/contrib/ctools/ctools.info.yml @@ -4,8 +4,8 @@ description: 'Provides a number of utility and helper APIs for Drupal developers package: Chaos tool suite # core: 8.x -# Information added by Drupal.org packaging script on 2016-04-01 -version: '8.x-3.0-alpha25' +# Information added by Drupal.org packaging script on 2016-05-06 +version: '8.x-3.0-alpha26' core: '8.x' project: 'ctools' -datestamp: 1459542842 +datestamp: 1462560866 diff --git a/docroot/modules/contrib/ctools/modules/ctools_block/ctools_block.info.yml b/docroot/modules/contrib/ctools/modules/ctools_block/ctools_block.info.yml index 00a084381..4b9f4cee5 100644 --- a/docroot/modules/contrib/ctools/modules/ctools_block/ctools_block.info.yml +++ b/docroot/modules/contrib/ctools/modules/ctools_block/ctools_block.info.yml @@ -7,8 +7,8 @@ package: Chaos tool suite (Experimental) dependencies: - ctools -# Information added by Drupal.org packaging script on 2016-04-01 -version: '8.x-3.0-alpha25' +# Information added by Drupal.org packaging script on 2016-05-06 +version: '8.x-3.0-alpha26' core: '8.x' project: 'ctools' -datestamp: 1459542842 +datestamp: 1462560866 diff --git a/docroot/modules/contrib/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml b/docroot/modules/contrib/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml index 2917211f4..130bf7ee0 100644 --- a/docroot/modules/contrib/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml +++ b/docroot/modules/contrib/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml @@ -12,8 +12,8 @@ dependencies: - user features: true -# Information added by Drupal.org packaging script on 2016-04-01 -version: '8.x-3.0-alpha25' +# Information added by Drupal.org packaging script on 2016-05-06 +version: '8.x-3.0-alpha26' core: '8.x' project: 'ctools' -datestamp: 1459542842 +datestamp: 1462560866 diff --git a/docroot/modules/contrib/ctools/modules/ctools_views/ctools_views.info.yml b/docroot/modules/contrib/ctools/modules/ctools_views/ctools_views.info.yml index 34eea53e4..f14376d23 100644 --- a/docroot/modules/contrib/ctools/modules/ctools_views/ctools_views.info.yml +++ b/docroot/modules/contrib/ctools/modules/ctools_views/ctools_views.info.yml @@ -8,8 +8,8 @@ dependencies: - block - views -# Information added by Drupal.org packaging script on 2016-04-01 -version: '8.x-3.0-alpha25' +# Information added by Drupal.org packaging script on 2016-05-06 +version: '8.x-3.0-alpha26' core: '8.x' project: 'ctools' -datestamp: 1459542842 +datestamp: 1462560866 diff --git a/docroot/modules/contrib/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/ctools_views_test_views.info.yml b/docroot/modules/contrib/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/ctools_views_test_views.info.yml index 3430eb255..0949bfa9b 100644 --- a/docroot/modules/contrib/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/ctools_views_test_views.info.yml +++ b/docroot/modules/contrib/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/ctools_views_test_views.info.yml @@ -13,8 +13,8 @@ dependencies: - node - taxonomy -# Information added by Drupal.org packaging script on 2016-04-01 -version: '8.x-3.0-alpha25' +# Information added by Drupal.org packaging script on 2016-05-06 +version: '8.x-3.0-alpha26' core: '8.x' project: 'ctools' -datestamp: 1459542842 +datestamp: 1462560866 diff --git a/docroot/modules/contrib/ctools/src/Plugin/DisplayVariant/BlockDisplayVariant.php b/docroot/modules/contrib/ctools/src/Plugin/DisplayVariant/BlockDisplayVariant.php index 31a1a665d..889d76d2c 100644 --- a/docroot/modules/contrib/ctools/src/Plugin/DisplayVariant/BlockDisplayVariant.php +++ b/docroot/modules/contrib/ctools/src/Plugin/DisplayVariant/BlockDisplayVariant.php @@ -205,4 +205,18 @@ protected function uuidGenerator() { return $this->uuidGenerator; } + /** + * {@inheritdoc} + */ + public function __sleep() { + $vars = parent::__sleep(); + + // Gathered contexts objects should not be serialized. + if (($key = array_search('contexts', $vars)) !== FALSE) { + unset($vars[$key]); + } + + return $vars; + } + } diff --git a/docroot/modules/contrib/ctools/src/Wizard/FormWizardBase.php b/docroot/modules/contrib/ctools/src/Wizard/FormWizardBase.php index ee1c75ab2..41b7ae3ea 100644 --- a/docroot/modules/contrib/ctools/src/Wizard/FormWizardBase.php +++ b/docroot/modules/contrib/ctools/src/Wizard/FormWizardBase.php @@ -230,7 +230,12 @@ public function getPreviousParameters($cached_values) { * {@inheritdoc} */ public function getFormId() { - $cached_values = $this->getTempstore()->get($this->getMachineName()); + if (!$this->getMachineName() || !$this->getTempstore()->get($this->getMachineName())) { + $cached_values = $this->initValues(); + } + else { + $cached_values = $this->getTempstore()->get($this->getMachineName()); + } $operation = $this->getOperation($cached_values); /* @var $operation \Drupal\Core\Form\FormInterface */ $operation = $this->classResolver->getInstanceFromDefinition($operation['form']); diff --git a/docroot/modules/contrib/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.info.yml b/docroot/modules/contrib/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.info.yml index f52b87942..51444baa1 100644 --- a/docroot/modules/contrib/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.info.yml +++ b/docroot/modules/contrib/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.info.yml @@ -5,8 +5,8 @@ package: Testing # version: 3.x # core: 8.x -# Information added by Drupal.org packaging script on 2016-04-01 -version: '8.x-3.0-alpha25' +# Information added by Drupal.org packaging script on 2016-05-06 +version: '8.x-3.0-alpha26' core: '8.x' project: 'ctools' -datestamp: 1459542842 +datestamp: 1462560866 diff --git a/docroot/modules/contrib/ctools/tests/src/Kernel/RelationshipManagerTest.php b/docroot/modules/contrib/ctools/tests/src/Kernel/RelationshipManagerTest.php index 177cc006d..5b0f91baf 100644 --- a/docroot/modules/contrib/ctools/tests/src/Kernel/RelationshipManagerTest.php +++ b/docroot/modules/contrib/ctools/tests/src/Kernel/RelationshipManagerTest.php @@ -47,7 +47,7 @@ public function testRelationshipPluginAvailability() { 'node' => new Context($context_definition, $this->entities['node1']), ]; $definitions = $this->relationshipManager->getDefinitionsForContexts($contexts); - $this->assertTrue(isset($definitions['typed_data_relationship:entity:node:body'])); + //$this->assertTrue(isset($definitions['typed_data_relationship:entity:node:body'])); $context_definition = new ContextDefinition('entity:node'); $contexts = [ @@ -61,7 +61,7 @@ public function testRelationshipPluginAvailability() { 'node' => new Context($context_definition, $this->entities['node3']), ]; $definitions = $this->relationshipManager->getDefinitionsForContexts($contexts); - $this->assertTrue(isset($definitions['typed_data_relationship:entity:node:body'])); + //$this->assertTrue(isset($definitions['typed_data_relationship:entity:node:body'])); } }