diff --git a/core/modules/block/custom_block/custom_block.info.yml b/core/modules/block/custom_block/custom_block.info.yml index 692648f..d72d448 100644 --- a/core/modules/block/custom_block/custom_block.info.yml +++ b/core/modules/block/custom_block/custom_block.info.yml @@ -6,5 +6,4 @@ version: VERSION core: 8.x dependencies: - block - - text configure: custom_block.list diff --git a/core/modules/comment/comment.info.yml b/core/modules/comment/comment.info.yml index c841981..d3ed143 100644 --- a/core/modules/comment/comment.info.yml +++ b/core/modules/comment/comment.info.yml @@ -6,5 +6,5 @@ version: VERSION core: 8.x dependencies: - datetime - - text + - field configure: comment.admin diff --git a/core/modules/node/node.info.yml b/core/modules/node/node.info.yml index e61b363..cbe615f 100644 --- a/core/modules/node/node.info.yml +++ b/core/modules/node/node.info.yml @@ -6,4 +6,4 @@ version: VERSION core: 8.x configure: node.overview_types dependencies: - - text + - field diff --git a/core/modules/options/options.info.yml b/core/modules/options/options.info.yml index 1d35ece..197ea24 100644 --- a/core/modules/options/options.info.yml +++ b/core/modules/options/options.info.yml @@ -6,5 +6,3 @@ version: VERSION core: 8.x dependencies: - field - - text - - number diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php index 907741e..f4415e7 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php @@ -122,13 +122,10 @@ function testModuleEnableOrder() { // module_test creates a dependency chain: // - forum depends on node, taxonomy, comment, datetime, history, and // ban (via module_test) - // - node depends on text - // - text depends on filter // - taxonomy depends on options - // - options depends on number // - ban depends on xmlrpc (via module_test) // The correct enable order is: - $expected_order = array('filter', 'xmlrpc', 'ban', 'text', 'node', 'datetime', 'comment', 'history', 'number', 'options', 'taxonomy', 'forum'); + $expected_order = array('xmlrpc', 'ban', 'node', 'datetime', 'comment', 'history', 'options', 'taxonomy', 'forum'); // Enable the modules through the UI, verifying that the dependency chain // is correct. @@ -136,7 +133,7 @@ function testModuleEnableOrder() { $edit['modules[Core][forum][enable]'] = 'forum'; $this->drupalPostForm('admin/modules', $edit, t('Save configuration')); $this->assertModules(array('forum'), FALSE); - $this->assertText(t('You must enable the Node, Text, Filter, History, Taxonomy, Options, Number, Comment, Datetime, Ban, XML-RPC modules to install Forum.')); + $this->assertText(t('You must enable the Node, History, Taxonomy, Options, Comment, Datetime, Ban, XML-RPC modules to install Forum.')); $edit['modules[Core][node][enable]'] = 'node'; $edit['modules[Field types][text][enable]'] = 'text'; $edit['modules[Core][filter][enable]'] = 'filter'; @@ -149,7 +146,7 @@ function testModuleEnableOrder() { $edit['modules[Core][ban][enable]'] = 'ban'; $edit['modules[Core][xmlrpc][enable]'] = 'xmlrpc'; $this->drupalPostForm('admin/modules', $edit, t('Save configuration')); - $this->assertModules(array('forum', 'ban', 'node', 'text', 'filter', 'xmlrpc', 'datetime', 'comment', 'history', 'taxonomy', 'options', 'number'), TRUE); + $this->assertModules(array('forum', 'ban', 'node', 'xmlrpc', 'datetime', 'comment', 'history', 'taxonomy', 'options'), TRUE); // Check the actual order which is saved by module_test_modules_enabled(). $module_order = \Drupal::state()->get('module_test.install_order') ?: array(); diff --git a/core/modules/system/tests/modules/entity_test/entity_test.info.yml b/core/modules/system/tests/modules/entity_test/entity_test.info.yml index 5bea26a..cb76982 100644 --- a/core/modules/system/tests/modules/entity_test/entity_test.info.yml +++ b/core/modules/system/tests/modules/entity_test/entity_test.info.yml @@ -6,5 +6,4 @@ version: VERSION core: 8.x dependencies: - field - - text hidden: true diff --git a/core/modules/taxonomy/taxonomy.info.yml b/core/modules/taxonomy/taxonomy.info.yml index c559074..4814953 100644 --- a/core/modules/taxonomy/taxonomy.info.yml +++ b/core/modules/taxonomy/taxonomy.info.yml @@ -5,7 +5,7 @@ package: Core version: VERSION core: 8.x dependencies: + - field - node - options - - text configure: taxonomy.vocabulary_list diff --git a/core/profiles/standard/standard.info.yml b/core/profiles/standard/standard.info.yml index ba41dd5..26bef95 100644 --- a/core/profiles/standard/standard.info.yml +++ b/core/profiles/standard/standard.info.yml @@ -22,7 +22,6 @@ dependencies: - help - image - menu - - number - options - path - taxonomy