Welcome to [site:name]. No front page content has been created yet.
Would you like to view the README?
', - 'label' => '', - 'plugin_id' => 'text_custom', - ], - 'node_listing_empty' => [ - 'admin_label' => '', - 'empty' => TRUE, - 'field' => 'node_listing_empty', - 'group_type' => 'group', - 'id' => 'node_listing_empty', - 'label' => '', - 'relationship' => 'none', - 'table' => 'node', - 'plugin_id' => 'node_listing_empty', - 'entity_type' => 'node', - ], - 'title' => [ - 'id' => 'title', - 'table' => 'views', - 'field' => 'title', - 'relationship' => 'none', - 'group_type' => 'group', - 'admin_label' => '', - 'label' => '', - 'empty' => TRUE, - 'title' => 'Welcome to [site:name]', - 'plugin_id' => 'title', - ], - ], - 'exposed_form' => [ - 'type' => 'basic', - 'options' => [ - 'submit_button' => 'Apply', - 'reset_button' => FALSE, - 'reset_button_label' => 'Reset', - 'exposed_sorts_label' => 'Sort by', - 'expose_sort_order' => TRUE, - 'sort_asc_label' => 'Asc', - 'sort_desc_label' => 'Desc', - ], - ], - 'filters' => [ - 'promote' => [ - 'admin_label' => '', - 'expose' => [ - 'description' => '', - 'identifier' => '', - 'label' => '', - 'multiple' => FALSE, - 'operator' => '', - 'operator_id' => '', - 'remember' => FALSE, - 'remember_roles' => [ - 'authenticated' => 'authenticated', - ], - 'required' => FALSE, - 'use_operator' => FALSE, - ], - 'exposed' => FALSE, - 'field' => 'promote', - 'group' => 1, - 'group_info' => [ - 'default_group' => 'All', - 'default_group_multiple' => [], - 'description' => '', - 'group_items' => [], - 'identifier' => '', - 'label' => '', - 'multiple' => FALSE, - 'optional' => TRUE, - 'remember' => FALSE, - 'widget' => 'select', - ], - 'group_type' => 'group', - 'id' => 'promote', - 'is_grouped' => FALSE, - 'operator' => '=', - 'relationship' => 'none', - 'table' => 'node_field_data', - 'value' => '1', - 'plugin_id' => 'boolean', - 'entity_type' => 'node', - 'entity_field' => 'promote', - ], - 'status' => [ - 'expose' => [ - 'operator' => '', - ], - 'field' => 'status', - 'group' => 1, - 'id' => 'status', - 'table' => 'node_field_data', - 'value' => 'true', - 'plugin_id' => 'boolean', - 'entity_type' => 'node', - 'entity_field' => 'status', - ], - 'langcode' => [ - 'id' => 'langcode', - 'table' => 'node_field_data', - 'field' => 'langcode', - 'relationship' => 'none', - 'group_type' => 'group', - 'admin_label' => '', - 'operator' => 'in', - 'value' => [ - '***LANGUAGE_language_content***' => '***LANGUAGE_language_content***', - ], - 'group' => 1, - 'exposed' => FALSE, - 'expose' => [ - 'operator_id' => '', - 'label' => '', - 'description' => '', - 'use_operator' => FALSE, - 'operator' => '', - 'identifier' => '', - 'required' => FALSE, - 'remember' => FALSE, - 'multiple' => FALSE, - 'remember_roles' => [ - 'authenticated' => 'authenticated', - ], - 'reduce' => FALSE, - ], - 'is_grouped' => FALSE, - 'group_info' => [ - 'label' => '', - 'description' => '', - 'identifier' => '', - 'optional' => TRUE, - 'widget' => 'select', - 'multiple' => FALSE, - 'remember' => FALSE, - 'default_group' => 'All', - 'default_group_multiple' => [], - 'group_items' => [], - ], - 'plugin_id' => 'language', - 'entity_type' => 'node', - 'entity_field' => 'langcode', - ], - ], - 'pager' => [ - 'type' => 'full', - 'options' => [ - 'items_per_page' => 10, - 'offset' => 0, - 'id' => 0, - 'total_pages' => 0, - 'expose' => [ - 'items_per_page' => FALSE, - 'items_per_page_label' => 'Items per page', - 'items_per_page_options' => '5, 10, 25, 50', - 'items_per_page_options_all' => FALSE, - 'items_per_page_options_all_label' => '- All -', - 'offset' => FALSE, - 'offset_label' => 'Offset', - ], - 'tags' => [ - 'previous' => '‹ Previous', - 'next' => 'Next ›', - 'first' => '« First', - 'last' => 'Last »', - ], - 'quantity' => 9, - ], - ], - 'query' => [ - 'type' => 'views_query', - 'options' => [ - 'disable_sql_rewrite' => FALSE, - 'distinct' => FALSE, - 'replica' => FALSE, - 'query_comment' => '', - 'query_tags' => [], - ], - ], - 'row' => [ - 'type' => 'entity:node', - 'options' => [ - 'view_mode' => 'teaser', - ], - ], - 'sorts' => [ - 'sticky' => [ - 'admin_label' => '', - 'expose' => [ - 'label' => '', - ], - 'exposed' => FALSE, - 'field' => 'sticky', - 'group_type' => 'group', - 'id' => 'sticky', - 'order' => 'DESC', - 'relationship' => 'none', - 'table' => 'node_field_data', - 'plugin_id' => 'boolean', - 'entity_type' => 'node', - 'entity_field' => 'sticky', - ], - 'created' => [ - 'field' => 'created', - 'id' => 'created', - 'order' => 'DESC', - 'table' => 'node_field_data', - 'plugin_id' => 'date', - 'relationship' => 'none', - 'group_type' => 'group', - 'admin_label' => '', - 'exposed' => FALSE, - 'expose' => [ - 'label' => '', - ], - 'granularity' => 'second', - 'entity_type' => 'node', - 'entity_field' => 'created', - ], - ], - 'style' => [ - 'type' => 'default', - 'options' => [ - 'grouping' => [], - 'row_class' => '', - 'default_row_class' => TRUE, - 'uses_fields' => FALSE, - ], - ], - 'title' => '', - 'header' => [], - 'footer' => [], - 'relationships' => [], - 'fields' => [], - 'arguments' => [], - 'display_extenders' => [], - ], - 'display_plugin' => 'default', - 'display_title' => 'Master', - 'id' => 'default', - 'position' => 0, - 'cache_metadata' => [ - 'contexts' => [ - 'languages:language_interface', - 'url.query_args', - 'user.node_grants:view', - 'user.permissions', - ], - 'max-age' => -1, - 'tags' => [], - ], - ], - 'feed_1' => [ - 'display_plugin' => 'feed', - 'id' => 'feed_1', - 'display_title' => 'Feed', - 'position' => 2, - 'display_options' => [ - 'sitename_title' => TRUE, - 'path' => 'rss.xml', - 'displays' => [ - 'page_1' => 'page_1', - 'default' => '', - ], - 'pager' => [ - 'type' => 'some', - 'options' => [ - 'items_per_page' => 10, - 'offset' => 0, - ], - ], - 'style' => [ - 'type' => 'rss', - 'options' => [ - 'description' => '', - 'grouping' => [], - 'uses_fields' => FALSE, - ], - ], - 'row' => [ - 'type' => 'node_rss', - 'options' => [ - 'relationship' => 'none', - 'view_mode' => 'rss', - ], - ], - 'display_extenders' => [], - ], - 'cache_metadata' => [ - 'contexts' => [ - 'languages:language_interface', - 'user.node_grants:view', - 'user.permissions', - ], - 'max-age' => -1, - 'tags' => [], - ], - ], - 'page_1' => [ - 'display_options' => [ - 'path' => 'node', - 'display_extenders' => [], - ], - 'display_plugin' => 'page', - 'display_title' => 'Page', - 'id' => 'page_1', - 'position' => 1, - 'cache_metadata' => [ - 'contexts' => [ - 'languages:language_interface', - 'url.query_args', - 'user.node_grants:view', - 'user.permissions', - ], - 'max-age' => -1, - 'tags' => [], - ], - ], - ]; - - \Drupal::configFactory() - ->getEditable('views.view.frontpage') - ->set('langcode', 'en') - ->set('status', TRUE) - ->set('dependencies', [ - 'config' => [ - 'core.entity_view_mode.node.rss', - 'core.entity_view_mode.node.teaser', - ], - 'module' => [ - 'node', - 'user', - ], - ]) - ->set('id', 'frontpage') - ->set('label', 'Frontpage') - ->set('module', 'node') - ->set('description', 'All content promoted to frontpage') - ->set('tag', 'default') - ->set('base_table', 'node_field_data') - ->set('base_field', 'nid') - ->set('core', '8.x') - ->set('display', [ - 'default' => $display['default'], - 'feed_1' => $display['feed_1'], - 'page_1' => $display['page_1'], - ]) - ->save(TRUE); -} /** * Makes updates to some basic config that ships with Lightning. @@ -538,6 +99,14 @@ function lightning_update_8006() { */ function lightning_update_dependencies() { return [ + 'lightning_dev' => [ + // Lightning Dev 8010 invokes hook_modules_installed() on all modules, so + // Lightning API must ensure the correct OpenAPI modules are installed + // before that happens. + 8010 => [ + 'lightning_api' => 8300, + ], + ], 'media_entity' => [ // Lightning 8004 must run before Media Entity 8002. 8002 => [ diff --git a/lightning.profile b/lightning.profile index 1ae078e1b..b58c3e81d 100644 --- a/lightning.profile +++ b/lightning.profile @@ -9,6 +9,478 @@ use Drupal\lightning_core\ConfigHelper as Config; use Drupal\node\Entity\NodeType; use Drupal\user\RoleInterface; +/** + * Implements hook_install_tasks(). + */ +function lightning_install_tasks() { + $tasks = []; + + $tasks['lightning_prepare_administrator'] = []; + $tasks['lightning_set_front_page'] = []; + $tasks['lightning_disallow_free_registration'] = []; + $tasks['lightning_grant_shortcut_access'] = []; + $tasks['lightning_set_default_theme'] = []; + $tasks['lightning_set_logo'] = []; + $tasks['lightning_alter_frontpage_view'] = []; + + return $tasks; +} + +/** + * Assigns the 'administrator' role to user 1. + */ +function lightning_prepare_administrator() { + /** @var \Drupal\user\UserInterface $account */ + $account = entity_load('user', 1); + if ($account) { + $account->addRole('administrator'); + $account->save(); + } +} + +/** + * Sets the front page path to /node. + */ +function lightning_set_front_page() { + if (Drupal::moduleHandler()->moduleExists('node')) { + Drupal::configFactory() + ->getEditable('system.site') + ->set('page.front', '/node') + ->save(TRUE); + } +} + +/** + * Only allows administrators to create new user accounts. + */ +function lightning_disallow_free_registration() { + Drupal::configFactory() + ->getEditable('user.settings') + ->set('register', USER_REGISTER_ADMINISTRATORS_ONLY) + ->save(TRUE); +} + +/** + * Allows authenticated users to use shortcuts. + */ +function lightning_grant_shortcut_access() { + if (Drupal::moduleHandler()->moduleExists('shortcut')) { + user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['access shortcuts']); + } +} + +/** + * Sets the default and administration themes. + */ +function lightning_set_default_theme() { + Drupal::configFactory() + ->getEditable('system.theme') + ->set('default', 'bartik') + ->set('admin', 'seven') + ->save(TRUE); + + // Use the admin theme for creating content. + if (Drupal::moduleHandler()->moduleExists('node')) { + Drupal::configFactory() + ->getEditable('node.settings') + ->set('use_admin_theme', TRUE) + ->save(TRUE); + } +} + +/** + * Set the path to the logo, favicon and README file based on install directory. + */ +function lightning_set_logo() { + $lightning_path = drupal_get_path('profile', 'lightning'); + + Drupal::configFactory() + ->getEditable('system.theme.global') + ->set('logo', [ + 'path' => $lightning_path . '/lightning.png', + 'url' => '', + 'use_default' => FALSE, + ]) + ->set('favicon', [ + 'mimetype' => 'image/vnd.microsoft.icon', + 'path' => $lightning_path . '/favicon.ico', + 'url' => '', + 'use_default' => FALSE, + ]) + ->save(TRUE); +} + +/** + * Alters the frontpage view, if it exists. + */ +function lightning_alter_frontpage_view() { + $front_page = Drupal::configFactory()->getEditable('views.view.frontpage'); + + if (! $front_page->isNew()) { + $front_page + ->set('langcode', 'en') + ->set('status', TRUE) + ->set('dependencies', [ + 'config' => [ + 'core.entity_view_mode.node.rss', + 'core.entity_view_mode.node.teaser', + ], + 'module' => [ + 'node', + 'user', + ], + ]) + ->set('id', 'frontpage') + ->set('label', 'Frontpage') + ->set('module', 'node') + ->set('description', 'All content promoted to frontpage') + ->set('tag', 'default') + ->set('base_table', 'node_field_data') + ->set('base_field', 'nid') + ->set('core', '8.x') + ->set('display.default', [ + 'display_options' => [ + 'access' => [ + 'type' => 'perm', + 'options' => [ + 'perm' => 'access content', + ], + ], + 'cache' => [ + 'type' => 'tag', + 'options' => [], + ], + 'empty' => [ + 'area_text_custom' => [ + 'id' => 'area_text_custom', + 'table' => 'views', + 'field' => 'area_text_custom', + 'relationship' => 'none', + 'group_type' => 'group', + 'admin_label' => '', + 'empty' => TRUE, + 'tokenize' => TRUE, + 'content' => 'Welcome to [site:name]. No front page content has been created yet.
Would you like to view the README?
', + 'label' => '', + 'plugin_id' => 'text_custom', + ], + 'node_listing_empty' => [ + 'admin_label' => '', + 'empty' => TRUE, + 'field' => 'node_listing_empty', + 'group_type' => 'group', + 'id' => 'node_listing_empty', + 'label' => '', + 'relationship' => 'none', + 'table' => 'node', + 'plugin_id' => 'node_listing_empty', + 'entity_type' => 'node', + ], + 'title' => [ + 'id' => 'title', + 'table' => 'views', + 'field' => 'title', + 'relationship' => 'none', + 'group_type' => 'group', + 'admin_label' => '', + 'label' => '', + 'empty' => TRUE, + 'title' => 'Welcome to [site:name]', + 'plugin_id' => 'title', + ], + ], + 'exposed_form' => [ + 'type' => 'basic', + 'options' => [ + 'submit_button' => 'Apply', + 'reset_button' => FALSE, + 'reset_button_label' => 'Reset', + 'exposed_sorts_label' => 'Sort by', + 'expose_sort_order' => TRUE, + 'sort_asc_label' => 'Asc', + 'sort_desc_label' => 'Desc', + ], + ], + 'filters' => [ + 'promote' => [ + 'admin_label' => '', + 'expose' => [ + 'description' => '', + 'identifier' => '', + 'label' => '', + 'multiple' => FALSE, + 'operator' => '', + 'operator_id' => '', + 'remember' => FALSE, + 'remember_roles' => [ + 'authenticated' => 'authenticated', + ], + 'required' => FALSE, + 'use_operator' => FALSE, + ], + 'exposed' => FALSE, + 'field' => 'promote', + 'group' => 1, + 'group_info' => [ + 'default_group' => 'All', + 'default_group_multiple' => [], + 'description' => '', + 'group_items' => [], + 'identifier' => '', + 'label' => '', + 'multiple' => FALSE, + 'optional' => TRUE, + 'remember' => FALSE, + 'widget' => 'select', + ], + 'group_type' => 'group', + 'id' => 'promote', + 'is_grouped' => FALSE, + 'operator' => '=', + 'relationship' => 'none', + 'table' => 'node_field_data', + 'value' => '1', + 'plugin_id' => 'boolean', + 'entity_type' => 'node', + 'entity_field' => 'promote', + ], + 'status' => [ + 'expose' => [ + 'operator' => '', + ], + 'field' => 'status', + 'group' => 1, + 'id' => 'status', + 'table' => 'node_field_data', + 'value' => 'true', + 'plugin_id' => 'boolean', + 'entity_type' => 'node', + 'entity_field' => 'status', + ], + 'langcode' => [ + 'id' => 'langcode', + 'table' => 'node_field_data', + 'field' => 'langcode', + 'relationship' => 'none', + 'group_type' => 'group', + 'admin_label' => '', + 'operator' => 'in', + 'value' => [ + '***LANGUAGE_language_content***' => '***LANGUAGE_language_content***', + ], + 'group' => 1, + 'exposed' => FALSE, + 'expose' => [ + 'operator_id' => '', + 'label' => '', + 'description' => '', + 'use_operator' => FALSE, + 'operator' => '', + 'identifier' => '', + 'required' => FALSE, + 'remember' => FALSE, + 'multiple' => FALSE, + 'remember_roles' => [ + 'authenticated' => 'authenticated', + ], + 'reduce' => FALSE, + ], + 'is_grouped' => FALSE, + 'group_info' => [ + 'label' => '', + 'description' => '', + 'identifier' => '', + 'optional' => TRUE, + 'widget' => 'select', + 'multiple' => FALSE, + 'remember' => FALSE, + 'default_group' => 'All', + 'default_group_multiple' => [], + 'group_items' => [], + ], + 'plugin_id' => 'language', + 'entity_type' => 'node', + 'entity_field' => 'langcode', + ], + ], + 'pager' => [ + 'type' => 'full', + 'options' => [ + 'items_per_page' => 10, + 'offset' => 0, + 'id' => 0, + 'total_pages' => 0, + 'expose' => [ + 'items_per_page' => FALSE, + 'items_per_page_label' => 'Items per page', + 'items_per_page_options' => '5, 10, 25, 50', + 'items_per_page_options_all' => FALSE, + 'items_per_page_options_all_label' => '- All -', + 'offset' => FALSE, + 'offset_label' => 'Offset', + ], + 'tags' => [ + 'previous' => '‹ Previous', + 'next' => 'Next ›', + 'first' => '« First', + 'last' => 'Last »', + ], + 'quantity' => 9, + ], + ], + 'query' => [ + 'type' => 'views_query', + 'options' => [ + 'disable_sql_rewrite' => FALSE, + 'distinct' => FALSE, + 'replica' => FALSE, + 'query_comment' => '', + 'query_tags' => [], + ], + ], + 'row' => [ + 'type' => 'entity:node', + 'options' => [ + 'view_mode' => 'teaser', + ], + ], + 'sorts' => [ + 'sticky' => [ + 'admin_label' => '', + 'expose' => [ + 'label' => '', + ], + 'exposed' => FALSE, + 'field' => 'sticky', + 'group_type' => 'group', + 'id' => 'sticky', + 'order' => 'DESC', + 'relationship' => 'none', + 'table' => 'node_field_data', + 'plugin_id' => 'boolean', + 'entity_type' => 'node', + 'entity_field' => 'sticky', + ], + 'created' => [ + 'field' => 'created', + 'id' => 'created', + 'order' => 'DESC', + 'table' => 'node_field_data', + 'plugin_id' => 'date', + 'relationship' => 'none', + 'group_type' => 'group', + 'admin_label' => '', + 'exposed' => FALSE, + 'expose' => [ + 'label' => '', + ], + 'granularity' => 'second', + 'entity_type' => 'node', + 'entity_field' => 'created', + ], + ], + 'style' => [ + 'type' => 'default', + 'options' => [ + 'grouping' => [], + 'row_class' => '', + 'default_row_class' => TRUE, + 'uses_fields' => FALSE, + ], + ], + 'title' => '', + 'header' => [], + 'footer' => [], + 'relationships' => [], + 'fields' => [], + 'arguments' => [], + 'display_extenders' => [], + ], + 'display_plugin' => 'default', + 'display_title' => 'Master', + 'id' => 'default', + 'position' => 0, + 'cache_metadata' => [ + 'contexts' => [ + 'languages:language_interface', + 'url.query_args', + 'user.node_grants:view', + 'user.permissions', + ], + 'max-age' => -1, + 'tags' => [], + ], + ]) + ->set('display.feed_1', [ + 'display_plugin' => 'feed', + 'id' => 'feed_1', + 'display_title' => 'Feed', + 'position' => 2, + 'display_options' => [ + 'sitename_title' => TRUE, + 'path' => 'rss.xml', + 'displays' => [ + 'page_1' => 'page_1', + 'default' => '', + ], + 'pager' => [ + 'type' => 'some', + 'options' => [ + 'items_per_page' => 10, + 'offset' => 0, + ], + ], + 'style' => [ + 'type' => 'rss', + 'options' => [ + 'description' => '', + 'grouping' => [], + 'uses_fields' => FALSE, + ], + ], + 'row' => [ + 'type' => 'node_rss', + 'options' => [ + 'relationship' => 'none', + 'view_mode' => 'rss', + ], + ], + 'display_extenders' => [], + ], + 'cache_metadata' => [ + 'contexts' => [ + 'languages:language_interface', + 'user.node_grants:view', + 'user.permissions', + ], + 'max-age' => -1, + 'tags' => [], + ], + ]) + ->set('display.page_1', [ + 'display_options' => [ + 'path' => 'node', + 'display_extenders' => [], + ], + 'display_plugin' => 'page', + 'display_title' => 'Page', + 'id' => 'page_1', + 'position' => 1, + 'cache_metadata' => [ + 'contexts' => [ + 'languages:language_interface', + 'url.query_args', + 'user.node_grants:view', + 'user.permissions', + ], + 'max-age' => -1, + 'tags' => [], + ], + ]) + ->save(TRUE); + } +} + /** * Implements hook_modules_installed(). */ diff --git a/src/Command/SubProfileCommand.php b/src/Command/SubProfileCommand.php index b61f9ac73..fe3ca2ea9 100644 --- a/src/Command/SubProfileCommand.php +++ b/src/Command/SubProfileCommand.php @@ -75,14 +75,14 @@ class SubProfileCommand extends Command { * * @var string[] */ - protected $include = []; + protected $installList = []; /** * Modules to exclude from the sub-profile. * * @var string[] */ - protected $exclude = []; + protected $excludeList = []; /** * Cache of parsed info for Lightning's main components. @@ -189,18 +189,18 @@ protected function initialize(InputInterface $input, OutputInterface $output) { $this->validator->validateMachineName($options['machine-name']); } if ($options['include']) { - $this->include = $this->toArray($options['include']); + $this->installList = $this->toArray($options['include']); } if ($options['exclude']) { // Only Lightning components can be excluded. This prevents wily users // from excluding modules that Lightning needs. - $this->exclude = $this->toArray($options['exclude']); - $this->validateExcludedModules($this->exclude); + $this->excludeList = $this->toArray($options['exclude']); + $this->validateExcludedModules($this->excludeList); // Exclude the sub-components of any excluded components. $excluded_components = array_intersect_key( $this->getMainComponentInfo(), - array_flip($this->exclude) + array_flip($this->excludeList) ); foreach ($excluded_components as $info) { $this->doExclude(@$info['components']); @@ -244,13 +244,13 @@ protected function interact(InputInterface $input, OutputInterface $output) { // Get any included modules from the --include option, or ask the user if // none were specified. - if (empty($this->include)) { + if (empty($this->installList)) { $include = $io->ask( $this->trans('commands.lightning.subprofile.options.include'), NULL, 'trim' ); - $this->include = $this->toArray($include); + $this->installList = $this->toArray($include); } // Ask the user if they want to exclude any Lightning components. @@ -262,7 +262,7 @@ protected function interact(InputInterface $input, OutputInterface $output) { // Ask about components that have not been excluded yet. $available_components = array_diff_key( $this->getMainComponentInfo(), - array_flip($this->exclude) + array_flip($this->excludeList) ); foreach ($available_components as $component => $info) { $info['machine_name'] = $component; @@ -357,8 +357,8 @@ protected function confirmComponent(array $info, DrupalStyle $io) { protected function doExclude($modules) { if ($modules) { $modules = (array) $modules; - $this->exclude = array_merge($this->exclude, $modules); - $this->include = array_diff($this->include, $modules); + $this->excludeList = array_merge($this->excludeList, $modules); + $this->installList = array_diff($this->installList, $modules); } } @@ -412,8 +412,8 @@ protected function execute(InputInterface $input, OutputInterface $output) { $input->getOption('machine-name'), $this->appRoot . '/profiles/custom', $input->getOption('description'), - array_unique($this->include), - array_unique($this->exclude) + array_unique($this->installList), + array_unique($this->excludeList) ); } } diff --git a/src/Generator/SubProfileGenerator.php b/src/Generator/SubProfileGenerator.php index 2648ab42d..4fd4c89d6 100644 --- a/src/Generator/SubProfileGenerator.php +++ b/src/Generator/SubProfileGenerator.php @@ -13,7 +13,8 @@ class SubProfileGenerator extends Generator { /** * {@inheritdoc} */ - public function generate($name, $machine_name, $profile_path, $description, array $dependencies, array $excluded_dependencies) { + public function generate($name, $machine_name, $profile_path, $description, array $install_list, array $exclude_list + ) { $destination = $profile_path . '/' . $machine_name; // If the destination path already exists, realpath() will return something @@ -43,14 +44,7 @@ public function generate($name, $machine_name, $profile_path, $description, arra (new Filesystem)->mkdir($destination); // Recurse to do the entire validation dance again. - $this->generate( - $name, - $machine_name, - $profile_path, - $description, - $dependencies, - $excluded_dependencies - ); + $this->generate($name, $machine_name, $profile_path, $description, $install_list, $exclude_list); return; } @@ -58,8 +52,8 @@ public function generate($name, $machine_name, $profile_path, $description, arra 'profile' => $name, 'machine_name' => $machine_name, 'description' => $description, - 'dependencies' => $dependencies, - 'excluded_dependencies' => $excluded_dependencies, + 'install' => $install_list, + 'exclude' => $exclude_list, ]; $prefix = "$dir/$machine_name"; diff --git a/src/Update/Update320.php b/src/Update/Update320.php new file mode 100644 index 000000000..8d7d2494c --- /dev/null +++ b/src/Update/Update320.php @@ -0,0 +1,130 @@ +appRoot = $app_root; + $this->profileList = $profile_list; + + if ($translation) { + $this->setStringTranslation($translation); + } + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('app.root'), + $container->get('extension.list.profile'), + $container->get('string_translation') + ); + } + + /** + * Converts sub-profile info keys to the 8.6.x API. + * + * @update + * + * @ask Do you want to update all sub-profiles to be Drupal 8.6-compatible? + * + * @param \Symfony\Component\Console\Style\StyleInterface $io + * The I/O handler. + */ + public function updateProfiles(StyleInterface $io) { + $discovery = new ExtensionDiscovery($this->appRoot); + + foreach ($discovery->scan('profile') as $profile) { + $info_file = $profile->getPathname(); + + if (! is_writeable($info_file)) { + $message = $this->t('Cannot write to @path, skipping.', [ + '@path' => $info_file, + ]); + $io->warning((string) $message); + continue; + } + + $info = file_get_contents($info_file); + if (empty($info) || ! strstr($info, 'base profile:')) { + continue; + } + + $info = Yaml::decode($info); + + // 'base profile' must be an array with at least the 'name' key. + if (! isset($info['base profile']['name'])) { + continue; + } + + // Build the list of excluded extensions and themes. + $exclude = []; + if (isset($info['base profile']['excluded_dependencies'])) { + $exclude = array_merge($exclude, $info['base profile']['excluded_dependencies']); + } + if (isset($info['base profile']['excluded_themes'])) { + $exclude = array_merge($exclude, $info['base profile']['excluded_themes']); + } + + $info['base profile'] = $info['base profile']['name']; + if ($exclude) { + $info['exclude'] = $exclude; + } + + $success = file_put_contents($info_file, Yaml::encode($info)); + if ($success) { + $message = $this->t('Updated @profile.', [ + '@profile' => $profile->getName(), + ]); + $io->success((string) $message); + } + else { + throw new \RuntimeException('An error occurred writing to ' . $profile->getPathname()); + } + } + // Reset the cached profile list. + $this->profileList->reset(); + } + +} diff --git a/templates/profile/info.yml.twig b/templates/profile/info.yml.twig index dd4cecea1..f36c97979 100644 --- a/templates/profile/info.yml.twig +++ b/templates/profile/info.yml.twig @@ -5,9 +5,9 @@ version: 8.x-dev description: '{{ description }}' {% endif %} core: '8.x' -{% if dependencies %} -dependencies: -{% for module in dependencies %} +{% if install %} +install: +{% for module in install %} - {{ module }} {% endfor %} {% endif %} @@ -16,11 +16,10 @@ themes: - bartik - seven -base profile: - name: lightning -{% if excluded_dependencies %} - excluded_dependencies: -{% for module in excluded_dependencies %} - - {{ module }} +base profile: lightning +{% if exclude %} +exclude: +{% for module in exclude %} + - {{ module }} {% endfor %} {% endif %} diff --git a/tests/fixtures/3.2.0-beta1.sql.gz b/tests/fixtures/3.2.0-beta1.sql.gz new file mode 100644 index 000000000..626ae2083 Binary files /dev/null and b/tests/fixtures/3.2.0-beta1.sql.gz differ diff --git a/tests/src/Functional/ConfigIntegrityTest.php b/tests/src/Functional/ConfigIntegrityTest.php index a37df43d4..c639272b0 100644 --- a/tests/src/Functional/ConfigIntegrityTest.php +++ b/tests/src/Functional/ConfigIntegrityTest.php @@ -5,6 +5,7 @@ use Drupal\Core\Entity\Entity\EntityViewMode; use Drupal\Tests\BrowserTestBase; use Drupal\user\Entity\Role; +use Drupal\user\UserInterface; use Drupal\workflows\Entity\Workflow; /** @@ -22,6 +23,23 @@ class ConfigIntegrityTest extends BrowserTestBase { public function testConfig() { $assert = $this->assertSession(); + // Assert that all install tasks have done what they should do. + // @see lightning_install_tasks() + $account = entity_load('user', 1); + $this->assertInstanceOf(UserInterface::class, $account); + /** @var UserInterface $account */ + $this->assertTrue($account->hasRole('administrator')); + + $this->assertSame('/node', $this->config('system.site')->get('page.front')); + $this->assertSame(USER_REGISTER_ADMINISTRATORS_ONLY, $this->config('user.settings')->get('register')); + $this->assertTrue(Role::load(Role::AUTHENTICATED_ID)->hasPermission('access shortcuts')); + $this->assertSame('bartik', $this->config('system.theme')->get('default')); + $this->assertSame('seven', $this->config('system.theme')->get('admin')); + $this->assertTrue($this->config('node.settings')->get('use_admin_theme')); + $this->assertContains('/lightning/lightning.png', $this->config('system.theme.global')->get('logo.path')); + $this->assertContains('/lightning/favicon.ico', $this->config('system.theme.global')->get('favicon.path')); + // TODO: Assert changes to the frontpage view were made. + // lightning_core_update_8002() marks a couple of core view modes as // internal. $view_modes = EntityViewMode::loadMultiple(['node.rss', 'node.search_index']); @@ -107,9 +125,6 @@ public function testConfig() { ]); } - $this->doTestCrop(); - $this->doTestContactForm(); - // Assert that bundled content types have meta tags enabled. $this->assertMetatag(['page', 'landing_page']); @@ -244,55 +259,4 @@ protected function assertFilePermissions($permissions, $file) { $this->assertSame($permissions, fileperms($file) & 0777); } - /** - * Tests that cropping is enabled for image media. - */ - private function doTestCrop() { - // Assert that a local copy of the Cropper library is being used. - $settings = $this->config('image_widget_crop.settings')->get('settings'); - $lib = 'libraries/cropper/dist'; - $this->assertContains("$lib/cropper.min.js", $settings['library_url']); - $this->assertContains("$lib/cropper.min.css", $settings['css_url']); - - $form_displays = $this->container - ->get('entity_type.manager') - ->getStorage('entity_form_display') - ->loadByProperties([ - 'targetEntityType' => 'media', - 'bundle' => 'image', - ]); - - /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display */ - foreach ($form_displays as $form_display) { - $component = $form_display->getComponent('image'); - $this->assertInternalType('array', $component); - $this->assertEquals('image_widget_crop', $component['type']); - $this->assertEquals(['freeform'], $component['settings']['crop_list']); - } - } - - /** - * Tests the site-wide contact form. - */ - private function doTestContactForm() { - $assert = $this->assertSession(); - - $this->assertAllowed('/contact'); - - $assert->fieldExists('Your name'); - $assert->fieldExists('Your email address'); - $assert->fieldExists('Subject'); - $assert->fieldExists('Message'); - - // The name and e-mail fields should not be present for authenticated users. - $account = $this->drupalCreateUser(); - $this->drupalLogin($account); - $this->assertAllowed('/contact'); - $assert->fieldNotExists('Your name'); - $assert->fieldNotExists('Your email address'); - $assert->fieldExists('Subject'); - $assert->fieldExists('Message'); - $this->drupalLogout(); - } - }