Skip to content

Commit

Permalink
Updated modules with composer
Browse files Browse the repository at this point in the history
  • Loading branch information
lpalgarvio committed May 10, 2016
1 parent 9de7284 commit dad5ca1
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 21 deletions.
6 changes: 3 additions & 3 deletions docroot/modules/contrib/ctools/ctools.info.yml
Expand Up @@ -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
Expand Up @@ -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
Expand Up @@ -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
Expand Up @@ -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
Expand Up @@ -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
Expand Up @@ -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;
}

}
7 changes: 6 additions & 1 deletion docroot/modules/contrib/ctools/src/Wizard/FormWizardBase.php
Expand Up @@ -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']);
Expand Down
Expand Up @@ -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
Expand Up @@ -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 = [
Expand All @@ -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']));
}

}

0 comments on commit dad5ca1

Please sign in to comment.