Commit 0b82d468 authored by Project Update Bot's avatar Project Update Bot Committed by Andrii Podanenko
Browse files

Issue #3299386 by Project Update Bot: Automated Drupal 10 compatibility fixes

parent 68537f14

openy_upgrade_tool.install

+3 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ function openy_upgrade_tool_update_8004(&$sandbox) { 
 * Import new configs + install advanced_help_block.

 */

function openy_upgrade_tool_update_8005() {

  $config_dir = drupal_get_path('module', 'openy_upgrade_tool') . '/config/install/';

  $config_dir = \Drupal::service('extension.list.module')->getPath('openy_upgrade_tool') . '/config/install/';

  // Import new configuration.

  $config_importer = \Drupal::service('openy_upgrade_tool.importer');

  $config_importer->setDirectory($config_dir);
@@ -165,7 +165,7 @@ function openy_upgrade_tool_update_8007() { 
  $entityTypeManager = \Drupal::entityTypeManager();



  // Load data from demo content.

  $config_path = drupal_get_path('module', 'openy_demo_ahb') . '/config/install/migrate_plus.migration.openy_demo_entity_ahb.yml';

  $config_path = \Drupal::service('extension.list.module')->getPath('openy_demo_ahb') . '/config/install/migrate_plus.migration.openy_demo_entity_ahb.yml';

  $entity_ahb_migration_data = Yaml::decode(file_get_contents($config_path));

  if (!isset($entity_ahb_migration_data['source']['data_rows'])) {

    // We have incorrect data.
@@ -195,7 +195,7 @@ function openy_upgrade_tool_update_8007() { 
 * Add bulk update actions for OpenY Upgrade dashboard.

 */

function openy_upgrade_tool_update_8008() {

  $config_dir = drupal_get_path('module', 'openy_upgrade_tool') . '/config/install/';

  $config_dir = \Drupal::service('extension.list.module')->getPath('openy_upgrade_tool') . '/config/install/';

  // Import new configuration.

  $config_importer = \Drupal::service('openy_upgrade_tool.importer');

  $config_importer->setDirectory($config_dir);

src/OpenyUpgradeLogManagerInterface.php

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\openy_upgrade_tool;



use Drupal\Core\Config\Config;

/**

 * Interface for wrapper with main logic that related to OpenyUpgradeLog.

 */
@@ -175,6 +176,6 @@ interface OpenyUpgradeLogManagerInterface { 
   * @return bool

   *   TRUE - if changes can be ignored.

   */

  public function validateConfigDiff(\Drupal\Core\Config\Config $config);

  public function validateConfigDiff(Config $config);



}