Issue #3443491 by smustgrave: Remove deprecated code from lib/Password and lib/Plugin (aafce189) · Commits · project / drupal

core/lib/Drupal/Component/Plugin/LazyPluginCollection.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ abstract public function getConfiguration();
		*
		* @return $this
		*/
		abstract public function setConfiguration($configuration);
		abstract public function setConfiguration(array $configuration);

		/**
		* Clears all instantiated plugins.

deleted100644 → 0

+0 −16

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\Core\Password;

		@trigger_error('\Drupal\Core\Password\PhpassHashedPassword is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. The password compatibility service has been moved to the phpass module. Use \Drupal\phpass\Password\PhpassHashedPassword instead. See https://www.drupal.org/node/3322420', E_USER_DEPRECATED);

		/**
		* Deprecated legacy password hashing framework.
		*
		* @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. The
		* password compatibility service has been moved to the phpass module.
		* Use \Drupal\phpass\Password\PhpassHashedPassword instead.
		*
		* @see https://www.drupal.org/node/3322420
		*/
		class PhpassHashedPassword extends PhpassHashedPasswordBase {}

+1 −6

Original line number	Diff line number	Diff line
		@@ -127,12 +127,7 @@ public function getConfiguration() {
		/**
		* {@inheritdoc}
		*/
		public function setConfiguration($configuration) {
		if (!is_array($configuration)) {
		@trigger_error('Calling ' . __METHOD__ . '() with a non-array argument is deprecated in drupal:10.3.0 and will fail in drupal:11.0.0. See https://www.drupal.org/node/3406191', E_USER_DEPRECATED);
		$configuration = [];
		}

		public function setConfiguration(array $configuration) {
		// Track each instance ID as it is updated.
		$unprocessed_instance_ids = $this->getInstanceIds();

+1 −6

Original line number	Diff line number	Diff line
		@@ -78,12 +78,7 @@ public function getConfiguration() {
		/**
		* {@inheritdoc}
		*/
		public function setConfiguration($configuration) {
		if (!is_array($configuration)) {
		@trigger_error('Calling ' . __METHOD__ . '() with a non-array argument is deprecated in drupal:10.3.0 and will fail in drupal:11.0.0. See https://www.drupal.org/node/3406191', E_USER_DEPRECATED);
		$configuration = [];
		}

		public function setConfiguration(array $configuration) {
		$this->configuration = $configuration;
		$plugin = $this->get($this->instanceId);
		if ($plugin instanceof ConfigurableInterface) {

+0 −12

Original line number	Diff line number	Diff line
		@@ -243,18 +243,6 @@ public function testConfigurableSetConfiguration() {
		$this->assertSame($expected, $config);
		}

		/**
		* @covers ::setConfiguration
		* @group legacy
		*/
		public function testConfigurableSetConfigurationToNull(): void {
		$this->setupPluginCollection($this->any());

		$this->expectDeprecation('Calling Drupal\Core\Plugin\DefaultLazyPluginCollection::setConfiguration() with a non-array argument is deprecated in drupal:10.3.0 and will fail in drupal:11.0.0. See https://www.drupal.org/node/3406191');
		$this->defaultPluginCollection->setConfiguration(NULL);
		$this->assertSame([], $this->defaultPluginCollection->getConfiguration());
		}

		/**
		* Tests that plugin methods are correctly attached to interfaces.
		*