Issue #3042582 by zeuty, andreyjan, katherined, Berdir, pranit84, thalles,... (607a59f6) · Commits · project / pathauto

pathauto.info.yml

+1 −1

Original line number	Diff line number	Diff line
		name : 'Pathauto'
		description : 'Provides a mechanism for modules to automatically generate aliases for the content they manage.'
		core_version_requirement: ^8.7.7 \|\| ^9
		core_version_requirement: ^8.8 \|\| ^9
		type: module

		dependencies:

pathauto.services.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ services:
		- { name: backend_overridable }
		pathauto.alias_uniquifier:
		class: Drupal\pathauto\AliasUniquifier
		arguments: ['@config.factory', '@pathauto.alias_storage_helper','@module_handler', '@router.route_provider', '@path.alias_manager']
		arguments: ['@config.factory', '@pathauto.alias_storage_helper','@module_handler', '@router.route_provider', '@path_alias.manager']
		pathauto.verbose_messenger:
		class: Drupal\pathauto\VerboseMessenger
		arguments: ['@config.factory', '@current_user', '@messenger']

src/AliasStorageHelper.php

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,9 +7,9 @@ use Drupal\Core\Database\Connection;
		use Drupal\Core\Entity\EntityInterface;
		use Drupal\Core\Entity\EntityTypeManagerInterface;
		use Drupal\Core\Language\LanguageInterface;
		use Drupal\Core\Path\AliasRepositoryInterface;
		use Drupal\Core\StringTranslation\StringTranslationTrait;
		use Drupal\Core\StringTranslation\TranslationInterface;
		use Drupal\path_alias\AliasRepositoryInterface;

		/**
		* Provides helper methods for accessing alias storage.
		@@ -35,7 +35,7 @@ class AliasStorageHelper implements AliasStorageHelperInterface {
		/**
		* The alias repository.
		*
		* @var \Drupal\Core\Path\AliasRepositoryInterface
		* @var \Drupal\path_alias\AliasRepositoryInterface
		*/
		protected $aliasRepository;

		@@ -65,7 +65,7 @@ class AliasStorageHelper implements AliasStorageHelperInterface {
		*
		* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
		* The config factory.
		* @param \Drupal\Core\Path\AliasRepositoryInterface $alias_repository
		* @param \Drupal\path_alias\AliasRepositoryInterface $alias_repository
		* The alias repository.
		* @param \Drupal\Core\Database\Connection $database
		* The database connection.

src/AliasUniquifier.php

+3 −3

Original line number	Diff line number	Diff line
		@@ -6,8 +6,8 @@ use Drupal\Component\Utility\Unicode;
		use Drupal\Core\Config\ConfigFactoryInterface;
		use Drupal\Core\Extension\ModuleHandlerInterface;
		use Drupal\Core\Language\LanguageInterface;
		use Drupal\Core\Path\AliasManagerInterface;
		use Drupal\Core\Routing\RouteProviderInterface;
		use Drupal\path_alias\AliasManagerInterface;

		/**
		* Provides a utility for creating a unique path alias.
		@@ -45,7 +45,7 @@ class AliasUniquifier implements AliasUniquifierInterface {
		/**
		* The alias manager.
		*
		* @var \Drupal\Core\Path\AliasManagerInterface
		* @var \Drupal\path_alias\AliasManagerInterface
		*/
		protected $aliasManager;

		@@ -60,7 +60,7 @@ class AliasUniquifier implements AliasUniquifierInterface {
		* The module handler.
		* @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
		* The route provider service.
		* @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
		* @param \Drupal\path_alias\AliasManagerInterface $alias_manager
		* The alias manager.
		*/
		public function __construct(ConfigFactoryInterface $config_factory, AliasStorageHelperInterface $alias_storage_helper, ModuleHandlerInterface $module_handler, RouteProviderInterface $route_provider, AliasManagerInterface $alias_manager) {

src/LegacyAliasStorageHelper.php

deleted100644 → 0

+0 −249

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\pathauto;

		use Drupal\Core\Config\ConfigFactoryInterface;
		use Drupal\Core\Database\Connection;
		use Drupal\Core\Entity\EntityInterface;
		use Drupal\Core\Language\LanguageInterface;
		use Drupal\Core\Path\AliasStorageInterface;
		use Drupal\Core\StringTranslation\StringTranslationTrait;
		use Drupal\Core\StringTranslation\TranslationInterface;

		/**
		* Provides helper methods for accessing alias storage.
		*/
		class LegacyAliasStorageHelper implements AliasStorageHelperInterface {

		use StringTranslationTrait;

		/**
		* Alias schema max length.
		*
		* @var int
		*/
		protected $aliasSchemaMaxLength = 255;

		/**
		* Config factory.
		*
		* @var \Drupal\Core\Config\ConfigFactoryInterface
		*/
		protected $configFactory;

		/**
		* The alias storage.
		*
		* @var \Drupal\Core\Path\AliasStorageInterface
		*/
		protected $aliasStorage;

		/**
		* The database connection.
		*
		* @var \Drupal\Core\Database\Connection
		*/
		protected $database;

		/**
		* The messenger.
		*
		* @var \Drupal\pathauto\MessengerInterface
		*/
		protected $messenger;

		/**
		* The config factory.
		*
		* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
		* The config factory.
		* @param \Drupal\Core\Path\AliasStorageInterface $alias_storage
		* The alias storage.
		* @param \Drupal\Core\Database\Connection $database
		* The database connection.
		* @param MessengerInterface $messenger
		* The messenger.
		* @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
		* The string translation service.
		*/
		public function __construct(ConfigFactoryInterface $config_factory, AliasStorageInterface $alias_storage, Connection $database, MessengerInterface $messenger, TranslationInterface $string_translation) {
		$this->configFactory = $config_factory;
		$this->aliasStorage = $alias_storage;
		$this->database = $database;
		$this->messenger = $messenger;
		$this->stringTranslation = $string_translation;
		}

		/**
		* {@inheritdoc}
		*/
		public function getAliasSchemaMaxLength() {
		return $this->aliasSchemaMaxLength;
		}

		/**
		* {@inheritdoc}
		*/
		public function save(array $path, $existing_alias = NULL, $op = NULL) {
		$config = $this->configFactory->get('pathauto.settings');

		// Alert users if they are trying to create an alias that is the same as the
		// internal path.
		if ($path['source'] == $path['alias']) {
		$this->messenger->addMessage($this->t('Ignoring alias %alias because it is the same as the internal path.', ['%alias' => $path['alias']]));
		return NULL;
		}

		// Skip replacing the current alias with an identical alias.
		if (empty($existing_alias) \|\| $existing_alias['alias'] != $path['alias']) {
		$path += [
		'pathauto' => TRUE,
		'original' => $existing_alias,
		'pid' => NULL,
		];

		// If there is already an alias, respect some update actions.
		if (!empty($existing_alias)) {
		switch ($config->get('update_action')) {
		case PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW:
		// Do not create the alias.
		return NULL;

		case PathautoGeneratorInterface::UPDATE_ACTION_LEAVE:
		// Create a new alias instead of overwriting the existing by leaving
		// $path['pid'] empty.
		break;

		case PathautoGeneratorInterface::UPDATE_ACTION_DELETE:
		// The delete actions should overwrite the existing alias.
		$path['pid'] = $existing_alias['pid'];
		break;
		}
		}

		// Save the path array.
		$this->aliasStorage->save($path['source'], $path['alias'], $path['language'], $path['pid']);

		if (!empty($existing_alias['pid'])) {
		$this->messenger->addMessage($this->t(
		'Created new alias %alias for %source, replacing %old_alias.',
		[
		'%alias' => $path['alias'],
		'%source' => $path['source'],
		'%old_alias' => $existing_alias['alias'],
		]
		)
		);
		}
		else {
		$this->messenger->addMessage($this->t('Created new alias %alias for %source.', [
		'%alias' => $path['alias'],
		'%source' => $path['source'],
		]));
		}

		return $path;
		}
		}

		/**
		* {@inheritdoc}
		*/
		public function loadBySource($source, $language = LanguageInterface::LANGCODE_NOT_SPECIFIED) {
		$alias = $this->aliasStorage->load([
		'source' => $source,
		'langcode' => $language,
		]);
		// If no alias was fetched and if a language was specified, fallbacks to
		// undefined language.
		if (!$alias && ($language !== LanguageInterface::LANGCODE_NOT_SPECIFIED)) {
		$alias = $this->aliasStorage->load([
		'source' => $source,
		'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
		]);
		}
		return $alias;
		}

		/**
		* {@inheritdoc}
		*/
		public function deleteBySourcePrefix($source) {
		$pids = $this->loadBySourcePrefix($source);
		if ($pids) {
		$this->deleteMultiple($pids);
		}
		}

		/**
		* {@inheritdoc}
		*/
		public function deleteAll() {
		$this->database->truncate('url_alias')->execute();
		}

		/**
		* {@inheritdoc}
		*/
		public function deleteEntityPathAll(EntityInterface $entity, $default_uri = NULL) {
		$this->deleteBySourcePrefix('/' . $entity->toUrl('canonical')->getInternalPath());
		if (isset($default_uri) && $entity->toUrl('canonical')->toString() != $default_uri) {
		$this->deleteBySourcePrefix($default_uri);
		}
		}

		/**
		* {@inheritdoc}
		*/
		public function loadBySourcePrefix($source) {
		$select = $this->database->select('url_alias', 'u')
		->fields('u', ['pid']);

		$or_group = $select->orConditionGroup()
		->condition('source', $source)
		->condition('source', rtrim($source, '/') . '/%', 'LIKE');

		return $select
		->condition($or_group)
		->execute()
		->fetchCol();
		}

		/**
		* {@inheritdoc}
		*/
		public function countBySourcePrefix($source) {
		$select = $this->database->select('url_alias', 'u')
		->fields('u', ['pid']);

		$or_group = $select->orConditionGroup()
		->condition('source', $source)
		->condition('source', rtrim($source, '/') . '/%', 'LIKE');

		return $select
		->condition($or_group)
		->countQuery()
		->execute()
		->fetchField();
		}

		/**
		* {@inheritdoc}
		*/
		public function countAll() {
		return $this->database->select('url_alias')
		->countQuery()
		->execute()
		->fetchField();
		}

		/**
		* {@inheritdoc}
		*/
		public function deleteMultiple($pids) {
		foreach ($pids as $pid) {
		$this->aliasStorage->delete(['pid' => $pid]);
		}
		}

		}