Resolving conflicts in composer.json

srijanone · Mar 25, 2021 · ce2c2b7 · ce2c2b7
1 parent 6b8dab1
commit ce2c2b7
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -34,6 +34,7 @@
     "drupal/email_registration": "^1.0",
     "drupal/entity_browser": "~2.1",
     "drupal/entity_embed": "^1.0",
+    "drupal/entityqueue": "^1.2",
     "drupal/entity_usage": "^2.0@beta",
     "drupal/environment_indicator": "^3.7",
     "drupal/ezcontent_api": "^2.0",
@@ -135,6 +136,9 @@
       },
       "drupal/fvm": {
         "3188401 - Add widget to override none option inside view mode select list ": "https://www.drupal.org/files/issues/2020-12-16/allow-user-to-custmise-none-option-from-select-3188401-3.patch"
+      },
+      "drupal/entityqueue": {
+        "3124403 - Fixed get translation context error ": "https://www.drupal.org/files/issues/2020-04-02/type-error-3124403-2.patch"
       }
     },
     "installer-paths": {

diff --git a/...e/modules/ezcontent_article/config/install/entityqueue.entity_queue.featured_articles.yml b/...e/modules/ezcontent_article/config/install/entityqueue.entity_queue.featured_articles.yml
@@ -0,0 +1,24 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: featured_articles
+label: 'Featured Articles'
+handler: simple
+handler_configuration: {  }
+entity_settings:
+  target_type: node
+  handler: 'default:node'
+  handler_settings:
+    target_bundles:
+      article: article
+    sort:
+      field: _none
+    auto_create: false
+    auto_create_bundle: ''
+queue_settings:
+  min_size: 0
+  max_size: 0
+  act_as_queue: false
+  reverse: false
diff --git a/modules/ezcontent_node/modules/ezcontent_article/ezcontent_article.info.yml b/modules/ezcontent_node/modules/ezcontent_article/ezcontent_article.info.yml
@@ -6,6 +6,7 @@ core: 8.x
 dependencies:
   - autocomplete_deluxe
   - diff
+  - entityqueue
   - ezcontent_author
   - ezcontent_node
   - ezcontent_image

diff --git a/modules/ezcontent_node/modules/ezcontent_article/ezcontent_article.install b/modules/ezcontent_node/modules/ezcontent_article/ezcontent_article.install
@@ -5,6 +5,8 @@
  * Install file for module EzContent Article.
  */
 
+use Symfony\Component\Yaml\Yaml;
+
 /**
  * Enhanced the content field display in article form.
  */
@@ -32,3 +34,18 @@ function ezcontent_article_update_8002() {
   // Output logged messages to related channel of update execution.
   return $updateHelper->logger()->output();
 }
+
+/**
+ * Configuration update.
+ */
+function ezcontent_article_update_8003() {
+  /** @var \Drupal\update_helper\Updater $updateHelper */
+  $updateHelper = \Drupal::service('update_helper.updater');
+  $module_path = drupal_get_path('module', 'ezcontent_article');
+  $file = 'entityqueue.entity_queue.featured_articles';
+  $config_path = $module_path . '/config/install/' . $file . '.yml';
+  $data = Yaml::parseFile($config_path);
+  \Drupal::configFactory()->getEditable($file)->setData($data)->save(TRUE);
+  // Output logged messages to related channel of update execution.
+  return $updateHelper->logger()->output();
+}
diff --git a/modules/ezcontent_node/modules/ezcontent_article/updates_checklist.yml b/modules/ezcontent_node/modules/ezcontent_article/updates_checklist.yml
@@ -12,3 +12,9 @@
         '#description': '<p>This configuration update will update site configuration to newly provided configuration</p>'
         '#description_successful': '<p>Configuration is successfully updated.</p>'
         '#description_failed': '<p><strong>Update of configuration has failed.</strong><p>'
+
+    ezcontent_article_update_8003:
+        '#title': 'Configuration update.'
+        '#description': '<p>This configuration update will update site configuration to newly provided configuration</p>'
+        '#description_successful': '<p>Configuration is successfully updated.</p>'
+        '#description_failed': '<p><strong>Update of configuration has failed.</strong><p>'