Issue #3393099 by kim.pepper, smustgrave, xjm, alexpott, longwave: Move... (36f2784c) · Commits · project / drupal

core/lib/Drupal/Core/TypedData/TypedDataManager.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,11 +8,11 @@
		use Drupal\Core\DependencyInjection\DependencySerializationTrait;
		use Drupal\Core\Extension\ModuleHandlerInterface;
		use Drupal\Core\Plugin\DefaultPluginManager;
		use Drupal\Core\TypedData\Validation\ExecutionContextFactory;
		use Drupal\Core\TypedData\Validation\RecursiveValidator;
		use Drupal\Core\Validation\ConstraintManager;
		use Drupal\Core\Validation\ConstraintValidatorFactory;
		use Drupal\Core\Validation\DrupalTranslator;
		use Drupal\Core\Validation\ExecutionContextFactory;
		use Symfony\Component\Validator\Validator\ValidatorInterface;

		/**

core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php

+5 −227

Original line number	Diff line number	Diff line
		@@ -5,12 +5,10 @@
		// phpcs:ignoreFile Portions of this file are a direct copy of
		// \Symfony\Component\Validator\Violation\ConstraintViolationBuilder.

		use Drupal\Core\Validation\ConstraintViolationBuilder as NewConstraintViolationBuilder;
		use Drupal\Core\Validation\TranslatorInterface;
		use Symfony\Component\Validator\Constraint;
		use Symfony\Component\Validator\ConstraintViolation;
		use Symfony\Component\Validator\ConstraintViolationList;
		use Symfony\Component\Validator\Util\PropertyPath;
		use Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface;

		/**
		* Defines a constraint violation builder for the Typed Data validator.
		@@ -18,84 +16,7 @@
		* We do not use the builder provided by Symfony as it is marked internal.
		*
		*/
		class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface {

		/**
		* The list of violations.
		*
		* @var \Symfony\Component\Validator\ConstraintViolationList
		*/
		protected $violations;

		/**
		* The violation message.
		*
		* @var string
		*/
		protected $message;

		/**
		* The message parameters.
		*
		* @var array
		*/
		protected $parameters;

		/**
		* The root path.
		*
		* @var mixed
		*/
		protected $root;

		/**
		* The invalid value caused the violation.
		*
		* @var mixed
		*/
		protected $invalidValue;

		/**
		* The property path.
		*
		* @var string
		*/
		protected $propertyPath;

		/**
		* The translator.
		*
		* @var \Drupal\Core\Validation\TranslatorInterface
		*/
		protected $translator;

		/**
		* The translation domain.
		*
		* @var string\|false\|null
		*/
		protected $translationDomain;

		/**
		* The number used
		* @var int\|null
		*/
		protected $plural;

		/**
		* @var Constraint
		*/
		protected $constraint;

		/**
		* @var mixed
		*/
		protected $code;

		/**
		* @var mixed
		*/
		protected $cause;
		class ConstraintViolationBuilder extends NewConstraintViolationBuilder {

		/**
		* Constructs a new ConstraintViolationBuilder instance.
		@@ -119,152 +40,9 @@ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
		* @param null $translationDomain
		* (optional) The translation domain.
		*/
		public function __construct(ConstraintViolationList $violations, Constraint $constraint, $message, array $parameters, $root, $propertyPath, $invalidValue, TranslatorInterface $translator, $translationDomain = null)
		{
		$this->violations = $violations;
		$this->message = $message;
		$this->parameters = $parameters;
		$this->root = $root;
		$this->propertyPath = $propertyPath;
		$this->invalidValue = $invalidValue;
		$this->translator = $translator;
		$this->translationDomain = $translationDomain;
		$this->constraint = $constraint;
		}

		/**
		* {@inheritdoc}
		*/
		public function atPath($path): static
		{
		$this->propertyPath = PropertyPath::append($this->propertyPath, $path);

		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function setParameter($key, $value): static
		{
		$this->parameters[$key] = $value;

		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function setParameters(array $parameters): static
		{
		$this->parameters = $parameters;

		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function setTranslationDomain($translationDomain): static
		{
		$this->translationDomain = $translationDomain;

		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function setInvalidValue($invalidValue): static
		{
		$this->invalidValue = $invalidValue;

		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function setPlural($number): static
		{
		$this->plural = $number;

		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function setCode($code): static
		{
		$this->code = $code;

		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function setCause($cause): static
		{
		$this->cause = $cause;

		return $this;
		}

		/**
		* {@inheritdoc}
		*
		* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
		* @return void
		*/
		public function addViolation()
		{
		if (null === $this->plural) {
		$translatedMessage = $this->translator->trans(
		$this->message,
		$this->parameters,
		$this->translationDomain
		);
		} else {
		try {
		$translatedMessage = $this->translator->transChoice(
		$this->message,
		$this->plural,
		$this->parameters,
		$this->translationDomain#
		);
		} catch (\InvalidArgumentException $e) {
		$translatedMessage = $this->translator->trans(
		$this->message,
		$this->parameters,
		$this->translationDomain
		);
		}
		}

		$this->violations->add(new ConstraintViolation(
		$translatedMessage,
		$this->message,
		$this->parameters,
		$this->root,
		$this->propertyPath,
		$this->invalidValue,
		$this->plural,
		$this->code,
		$this->constraint,
		$this->cause
		));
		}

		/**
		* {@inheritdoc}
		*/
		public function disableTranslation(): static
		{
		$this->translationDomain = false;

		return $this;
		public function __construct(ConstraintViolationList $violations, Constraint $constraint, $message, array $parameters, $root, $propertyPath, $invalidValue, TranslatorInterface $translator, $translationDomain = null) {
		@trigger_error(__CLASS__ . ' is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Instead, use \Drupal\Core\Validation\ConstraintViolationBuilder. See https://www.drupal.org/node/3396238', E_USER_DEPRECATED);
		parent::__construct($violations, $constraint, $message, $parameters, $root, $propertyPath, $invalidValue, $translator, $translationDomain);
		}

		}

core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php

+5 −253

Original line number	Diff line number	Diff line
		@@ -2,15 +2,8 @@

		namespace Drupal\Core\TypedData\Validation;

		use Drupal\Core\Validation\ExecutionContext as NewExecutionContext;
		use Drupal\Core\Validation\TranslatorInterface;
		use Symfony\Component\Validator\Constraint;
		use Symfony\Component\Validator\ConstraintViolation;
		use Symfony\Component\Validator\ConstraintViolationList;
		use Symfony\Component\Validator\ConstraintViolationListInterface;
		use Symfony\Component\Validator\Context\ExecutionContextInterface;
		use Symfony\Component\Validator\Mapping\MetadataInterface;
		use Symfony\Component\Validator\Util\PropertyPath;
		use Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface;
		use Symfony\Component\Validator\Validator\ValidatorInterface;

		/**
		@@ -20,92 +13,7 @@
		* this class is pretty much the same, but has some code style changes as well
		* as exceptions for methods we don't support.
		*/
		class ExecutionContext implements ExecutionContextInterface {

		/**
		* @var \Symfony\Component\Validator\Validator\ValidatorInterface
		*/
		protected $validator;

		/**
		* The root value of the validated object graph.
		*
		* @var mixed
		*/
		protected $root;

		/**
		* @var \Drupal\Core\Validation\TranslatorInterface
		*/
		protected $translator;

		/**
		* @var string
		*/
		protected $translationDomain;

		/**
		* The violations generated in the current context.
		*
		* @var \Symfony\Component\Validator\ConstraintViolationList
		*/
		protected $violations;

		/**
		* The currently validated value.
		*
		* @var mixed
		*/
		protected $value;

		/**
		* The currently validated typed data object.
		*
		* @var \Drupal\Core\TypedData\TypedDataInterface
		*/
		protected $data;

		/**
		* The property path leading to the current value.
		*
		* @var string
		*/
		protected $propertyPath = '';

		/**
		* The current validation metadata.
		*
		* @var \Symfony\Component\Validator\Mapping\MetadataInterface\|null
		*/
		protected $metadata;

		/**
		* The currently validated group.
		*
		* @var string\|null
		*/
		protected $group;

		/**
		* The currently validated constraint.
		*
		* @var \Symfony\Component\Validator\Constraint\|null
		*/
		protected $constraint;

		/**
		* Stores which objects have been validated in which group.
		*
		* @var array
		*/
		protected $validatedObjects = [];

		/**
		* Stores which class constraint has been validated for which object.
		*
		* @var array
		*/
		protected $validatedConstraints = [];
		class ExecutionContext extends NewExecutionContext {

		/**
		* Creates a new ExecutionContext.
		@@ -119,168 +27,12 @@ class ExecutionContext implements ExecutionContextInterface {
		* @param string $translationDomain
		* (optional) The translation domain.
		*
		* @internal Called by \Drupal\Core\TypedData\Validation\ExecutionContextFactory.
		* @internal Called by \Drupal\Core\Validation\ExecutionContextFactory.
		* Should not be used in user code.
		*/
		public function __construct(ValidatorInterface $validator, $root, TranslatorInterface $translator, $translationDomain = NULL) {
		$this->validator = $validator;
		$this->root = $root;
		$this->translator = $translator;
		$this->translationDomain = $translationDomain;
		$this->violations = new ConstraintViolationList();
		}

		/**
		* {@inheritdoc}
		*/
		public function setNode($value, $object, MetadataInterface $metadata = NULL, $propertyPath): void {
		$this->value = $value;
		$this->data = $object;
		$this->metadata = $metadata;
		$this->propertyPath = (string) $propertyPath;
		}

		/**
		* {@inheritdoc}
		*/
		public function setGroup($group): void {
		$this->group = $group;
		}

		/**
		* {@inheritdoc}
		*/
		public function setConstraint(Constraint $constraint): void {
		$this->constraint = $constraint;
		}

		/**
		* {@inheritdoc}
		*
		* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
		* @return void
		*/
		public function addViolation($message, array $parameters = []) {
		$this->violations->add(new ConstraintViolation($this->translator->trans($message, $parameters, $this->translationDomain), $message, $parameters, $this->root, $this->propertyPath, $this->value, NULL, NULL, $this->constraint));
		}

		/**
		* {@inheritdoc}
		*/
		public function buildViolation($message, array $parameters = []): ConstraintViolationBuilderInterface {
		return new ConstraintViolationBuilder($this->violations, $this->constraint, $message, $parameters, $this->root, $this->propertyPath, $this->value, $this->translator, $this->translationDomain);
		}

		/**
		* {@inheritdoc}
		*/
		public function getViolations(): ConstraintViolationListInterface {
		return $this->violations;
		}

		/**
		* {@inheritdoc}
		*/
		public function getValidator(): ValidatorInterface {
		return $this->validator;
		}

		/**
		* {@inheritdoc}
		*/
		public function getRoot(): mixed {
		return $this->root;
		}

		/**
		* {@inheritdoc}
		*/
		public function getValue(): mixed {
		return $this->value;
		}

		/**
		* {@inheritdoc}
		*/
		public function getObject(): ?object {
		return $this->data;
		}

		/**
		* {@inheritdoc}
		*/
		public function getMetadata(): ?MetadataInterface {
		return $this->metadata;
		}

		/**
		* {@inheritdoc}
		*/
		public function getGroup(): ?string {
		return Constraint::DEFAULT_GROUP;
		}

		/**
		* {@inheritdoc}
		*/
		public function getClassName(): ?string {
		return get_class($this->data);
		}

		/**
		* {@inheritdoc}
		*/
		public function getPropertyName(): ?string {
		return $this->data->getName();
		}

		/**
		* {@inheritdoc}
		*/
		public function getPropertyPath($sub_path = ''): string {
		return PropertyPath::append($this->propertyPath, $sub_path);
		}

		/**
		* {@inheritdoc}
		*/
		public function markConstraintAsValidated($cache_key, $constraint_hash): void {
		$this->validatedConstraints[$cache_key . ':' . $constraint_hash] = TRUE;
		}

		/**
		* {@inheritdoc}
		*/
		public function isConstraintValidated($cache_key, $constraint_hash): bool {
		return isset($this->validatedConstraints[$cache_key . ':' . $constraint_hash]);
		}

		/**
		* {@inheritdoc}
		*/
		public function markGroupAsValidated($cache_key, $group_hash): void {
		$this->validatedObjects[$cache_key][$group_hash] = TRUE;
		}

		/**
		* {@inheritdoc}
		*/
		public function isGroupValidated($cache_key, $group_hash): bool {
		return isset($this->validatedObjects[$cache_key][$group_hash]);
		}

		/**
		* {@inheritdoc}
		*/
		public function markObjectAsInitialized($cache_key): void {
		throw new \LogicException('\Symfony\Component\Validator\Context\ExecutionContextInterface::markObjectAsInitialized is unsupported.');
		}

		/**
		* {@inheritdoc}
		*/
		public function isObjectInitialized($cache_key): bool {
		throw new \LogicException('\Symfony\Component\Validator\Context\ExecutionContextInterface::isObjectInitialized is unsupported.');
		@trigger_error(__CLASS__ . ' is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Instead, use \Drupal\Core\Validation\ExecutionContext. See https://www.drupal.org/node/3396238', E_USER_DEPRECATED);
		parent::__construct($validator, $root, $translator, $translationDomain);
		}

		}

core/lib/Drupal/Core/TypedData/Validation/ExecutionContextFactory.php

+4 −28

Original line number	Diff line number	Diff line
		@@ -2,27 +2,15 @@

		namespace Drupal\Core\TypedData\Validation;

		use Drupal\Core\Validation\ExecutionContextFactory as NewExecutionContextFactory;
		use Drupal\Core\Validation\TranslatorInterface;
		use Symfony\Component\Validator\Context\ExecutionContextFactoryInterface;
		use Symfony\Component\Validator\Context\ExecutionContextInterface;
		use Symfony\Component\Validator\Validator\ValidatorInterface;

		/**
		* Defines an execution factory for the Typed Data validator.
		*
		* We do not use the factory provided by Symfony as it is marked internal.
		*/
		class ExecutionContextFactory implements ExecutionContextFactoryInterface {

		/**
		* @var \Drupal\Core\Validation\TranslatorInterface
		*/
		protected $translator;

		/**
		* @var string\|null
		*/
		protected $translationDomain;
		class ExecutionContextFactory extends NewExecutionContextFactory {

		/**
		* Constructs a new ExecutionContextFactory instance.
		@@ -33,20 +21,8 @@ class ExecutionContextFactory implements ExecutionContextFactoryInterface {
		* (optional) The translation domain.
		*/
		public function __construct(TranslatorInterface $translator, $translationDomain = NULL) {
		$this->translator = $translator;
		$this->translationDomain = $translationDomain;
		}

		/**
		* {@inheritdoc}
		*/
		public function createContext(ValidatorInterface $validator, $root): ExecutionContextInterface {
		return new ExecutionContext(
		$validator,
		$root,
		$this->translator,
		$this->translationDomain
		);
		@trigger_error(__CLASS__ . ' is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. Instead, use \Drupal\Core\Validation\ExecutionContextFactory. See https://www.drupal.org/node/3396238', E_USER_DEPRECATED);
		parent::__construct($translator, $translationDomain);
		}

		}

core/lib/Drupal/Core/Validation/BasicRecursiveValidatorFactory.php

+0 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@
		namespace Drupal\Core\Validation;

		use Drupal\Core\DependencyInjection\ClassResolverInterface;
		use Drupal\Core\TypedData\Validation\ExecutionContextFactory;
		use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
		use Symfony\Component\Validator\Validator\RecursiveValidator;