CMS-2193-update-d9 - updating AliasManager

composer.json

@@ -1,7 +1,16 @@
 {
-  "name": "drupal/domain_path",
-  "type": "drupal-module",
-  "description": "Allow the same path to be used across different domains",
-  "homepage": "https://github.com/dennisinteractive/domain_path",
-  "license": "GPL-2.0+"
+    "name": "drupal/domain_path",
+    "description": "Allow the same path to be used across different domains.",
+    "type": "drupal-module",
+    "homepage": "https://github.com/dennisinteractive/domain_path",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "drupal/domain": "^1.0-beta"
+    },
+    "require-dev": {
+        "drupal/pathauto": "1.x-dev"
+    },
+    "suggest": {
+        "drupal/pathauto": "Automatic path aliases with Domain Path Pathauto submodule."
+    }
 }

config/install/domain_path.settings.yml

@@ -1,2 +1,4 @@
 entity_types:
   node: '1'
+hide_path_alias_ui: TRUE
+language_method: 'language_content'

config/schema/domain_path.schema.yml

@@ -6,3 +6,9 @@ domain_path.settings:
       type: sequence
       sequence:
         type: string
+    hide_path_alias_ui:
+      label: Hide the default URL alias UI
+      type: boolean
+    language_method:
+      label: The method of language detection
+      type: string

domain_path.info.yml

@@ -2,7 +2,8 @@ name: 'Domain Path'
 description: 'Allows separate path aliases per domain.'
 type: module
 package: Domain
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^8.8 || ^9 || ^10
+configure: entity.domain_path_settings
 dependencies:
-  - path
-  - domain
+  - drupal:path
+  - domain:domain

domain_path.services.yml

@@ -1,13 +1,4 @@
 services:
-  domain_path.path_processor:
-    class: Drupal\domain_path\PathProcessor\DomainPathProcessor
-    arguments: ['@language_manager', '@entity_type.manager', '@path_alias.manager', '@domain.negotiator']
-    tags:
-      # Priority is very important here. The inbound processor needs to happen
-      # BEFORE the path module alias processor, and the outbound needs to happen
-      # AFTER the alias processor.
-      - { name: path_processor_inbound, priority: 110 }
-      - { name: path_processor_outbound, priority: 200 }
   domain_path.helper:
     class: Drupal\domain_path\DomainPathHelper
     arguments: ['@current_user', '@entity_type.manager', '@path_alias.manager', '@config.factory', '@module_handler']

drupalci.yml

@@ -0,0 +1,21 @@
+build:
+  assessment:
+    validate_codebase:
+      phplint:
+      csslint:
+        halt-on-fail: false
+      eslint:
+        halt-on-fail: false
+      phpcs:
+        sniff-all-files: false
+        halt-on-fail: false
+    testing:
+      container_command:
+        commands:
+          - '/bin/bash -c "cd ${SOURCE_DIR}/modules/contrib/domain && chmod +x ./define_subdomains.sh && ./define_subdomains.sh"'
+      run_tests.standard:
+        types: 'PHPUnit-Unit,PHPUnit-Build,PHPUnit-Kernel,PHPUnit-Functional'
+      run_tests.js:
+        concurrency: 1
+        types: 'PHPUnit-FunctionalJavascript'
+      nightwatchjs:

modules/domain_path_pathauto/domain_path_pathauto.info.yml

@@ -4,5 +4,5 @@ description: Domain Path Pathauto support
 core_version_requirement: ^8.8 || ^9
 package: Domain
 dependencies:
-  - domain_path
-  - pathauto(>= 1.8)
+  - domain_path:domain_path
+  - pathauto:pathauto(>= 1.8)

modules/domain_path_pathauto/domain_path_pathauto.module

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Pathauto alias handling for multiple domains.
+ */
+
+use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Implements hook_form_alter().
+ */
+function domain_path_pathauto_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+  // Firstly check if default pathauto UI is hidden or not. Depending on it
+  // we're altering different form elements.
+  // @see DomainPathautoHelper::alterEntityForm().
+  $keys = ['path', 'widget', 0, 'domain_path'];
+  $default_ui_hidden = \Drupal::config('domain_path.settings')->get('hide_path_alias_ui');
+  if ($default_ui_hidden) {
+    $keys = ['domain_path'];
+  }
+  if (!empty(NestedArray::getValue($form, $keys)) && ($object = $form_state->getFormObject()) && is_callable([
+    $object,
+    'getEntity',
+  ])
+    && ($entity = $object->getEntity())) {
+    $domain_path_helper = \Drupal::service('domain_path.helper');
+    $domain_path_pathauto_helper = \Drupal::service('domain_path_pathauto.helper');
+    /** @var \Drupal\domain_path_pathauto\DomainPathautoHelper $domain_path_pathauto_helper */
+    if ($domain_path_helper->domainPathsIsEnabled($entity)) {
+      try {
+        $domain_path_pathauto_helper->alterEntityForm($form, $form_state, $entity, $keys);
+      }
+      catch (InvalidPluginDefinitionException | PluginNotFoundException $e) {
+      }
+
+    }
+  }
+}

modules/domain_path_pathauto/domain_path_pathauto.services.yml

@@ -5,3 +5,6 @@ services:
   domain_path_pathauto.alias_uniquifier:
     class: Drupal\domain_path_pathauto\DomainAliasUniquifier
     arguments: ['@config.factory', '@pathauto.alias_storage_helper','@module_handler', '@router.route_provider', '@path_alias.manager']
+  domain_path_pathauto.helper:
+    class: Drupal\domain_path_pathauto\DomainPathautoHelper
+    arguments: ['@entity_type.manager', '@domain_path_pathauto.generator', '@config.factory', '@domain_path.helper']

modules/domain_path_pathauto/src/DomainPathautoGenerator.php

@@ -8,6 +8,7 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\pathauto\PathautoGenerator;
+use Drupal\pathauto\PathautoGeneratorInterface;
 
 /**
  * Provides methods for generating domain path aliases.
@@ -65,6 +66,7 @@ public function createEntityAlias(EntityInterface $entity, $op, $domain_id = '')
       'data' => $data,
       'bundle' => $entity->bundle(),
       'language' => &$langcode,
+      'domain_id' => $domain_id,
     ];
     $pattern_original = $pattern->getPattern();
     $this->moduleHandler->alter('pathauto_pattern', $pattern, $context);