Issue #3286402 by mrweiner, Project Update Bot: Automated Drupal 10 compatibility fixes (da95512d) · Commits · project / cache_register

cache_register.info.yml

+1 −2

Changes for cache_register.info.yml: 1 added line, 2 removed lines.
Original line number	Diff line number	Diff line
		name: 'Cache Register'
		type: module
		description: "Simplifies interactions with Drupal's cache."
		core: 8.x
		core_version_requirement: ^8 \|\| ^9
		core_version_requirement: ^8 \|\| ^9 \|\| ^10
		package: 'Custom'

tests/src/Kernel/CacheRegisterKernelTestBase.php

+3 −3

Changes for tests/src/Kernel/CacheRegisterKernelTestBase.php: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ abstract class CacheRegisterKernelTestBase extends DatabaseBackendTest {
		*
		* @var array
		*/
		public static $modules = [
		protected static $modules = [
		'cache_register',
		];

		@@ -191,7 +191,7 @@ abstract class CacheRegisterKernelTestBase extends DatabaseBackendTest {

		// After caching.
		$slot->getCacheBackend()->set($cid, 'cache_data');
		$this->assertNotEqual($slot->getCacheData(), NULL);
		$this->assertNotEquals($slot->getCacheData(), NULL);
		$this->assertEquals(
		$slot->getCache()->data,
		$slot->getCacheData()
		@@ -200,7 +200,7 @@ abstract class CacheRegisterKernelTestBase extends DatabaseBackendTest {
		// After invalidating the cache.
		$slot->getCacheBackend()->invalidate($slot->id());
		$this->assertEquals(NULL, $slot->getCacheData());
		$this->assertNotEqual($slot->getCacheData(TRUE), NULL);
		$this->assertNotEquals($slot->getCacheData(TRUE), NULL);
		$this->assertEquals(
		$slot->getCache(TRUE)->data,
		$slot->getCacheData(TRUE)

tests/src/Kernel/DrawerTest.php

+11 −11

Changes for tests/src/Kernel/DrawerTest.php: 11 added lines, 11 removed lines.
Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ class DrawerTest extends CacheRegisterKernelTestBase {
		*/
		public function testId() {
		$drawer = $this->createDrawer('testId', FALSE);
		$this->assert('testId', $drawer->id());
		$this->assertEquals('testId', $drawer->id());
		}

		/**
		@@ -23,10 +23,10 @@ class DrawerTest extends CacheRegisterKernelTestBase {
		*/
		public function testHasActiveRegister() {
		$drawer = $this->createDrawer('testHasActiveRegister', FALSE);
		$this->assertEqual(FALSE, $drawer->hasActiveRegister());
		$this->assertEquals(FALSE, $drawer->hasActiveRegister());

		$this->createRegister($drawer);
		$this->assertEqual(TRUE, $drawer->hasActiveRegister());
		$this->assertEquals(TRUE, $drawer->hasActiveRegister());
		}

		/**
		@@ -42,7 +42,7 @@ class DrawerTest extends CacheRegisterKernelTestBase {
		*/
		public function testGetRegister() {
		$drawer = $this->createDrawer('cr.d', FALSE);
		$this->assertEqual(NULL, $drawer->getRegister());
		$this->assertEquals(NULL, $drawer->getRegister());

		$this->createRegister($drawer);
		$this->assertInstanceOf('\Drupal\cache_register\Object\RegisterInterface', $drawer->getRegister());
		@@ -78,19 +78,19 @@ class DrawerTest extends CacheRegisterKernelTestBase {
		$slot_1->setCache('slot_1_data');
		$slot_2->setCache('slot_2_data');

		$this->assertNotEqual($drawer->getRegister()->getCache(), NULL);
		$this->assertNotEqual($slot_1->getCache(), NULL);
		$this->assertNotEqual($slot_2->getCache(), NULL);
		$this->assertNotEquals($drawer->getRegister()->getCache(), NULL);
		$this->assertNotEquals($slot_1->getCache(), NULL);
		$this->assertNotEquals($slot_2->getCache(), NULL);

		$drawer->invalidate($reopen_register);
		if ($reopen_register) {
		$this->assertNotEqual($drawer->getRegister()->getCache(), NULL);
		$this->assertNotEquals($drawer->getRegister()->getCache(), NULL);
		}
		else {
		$this->assertEqual(NULL, $drawer->getRegister());
		$this->assertEquals(NULL, $drawer->getRegister());
		}
		$this->assertEqual(NULL, $slot_1->getCache());
		$this->assertEqual(NULL, $slot_2->getCache());
		$this->assertEquals(NULL, $slot_1->getCache());
		$this->assertEquals(NULL, $slot_2->getCache());
		}

		}

tests/src/Kernel/ManagerTest.php

+2 −2

Changes for tests/src/Kernel/ManagerTest.php: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ class ManagerTest extends CacheRegisterKernelTestBase {
		$this->assertInstanceOf("Drupal\cache_register\Object\RegisterInterface", $slot->getRegister());
		}
		else {
		$this->assertEqual(NULL, $slot->getRegister());
		$this->assertEquals(NULL, $slot->getRegister());
		}
		}

		@@ -38,7 +38,7 @@ class ManagerTest extends CacheRegisterKernelTestBase {
		$this->assertInstanceOf("Drupal\cache_register\Object\RegisterInterface", $drawer->getRegister());
		}
		else {
		$this->assertEqual(NULL, $drawer->getRegister());
		$this->assertEquals(NULL, $drawer->getRegister());
		}
		}

tests/src/Kernel/RegisterTest.php

+2 −5

Changes for tests/src/Kernel/RegisterTest.php: 2 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ class RegisterTest extends CacheRegisterKernelTestBase {
		// Reopen the slot.
		$slot_2 = $this->createSlotBase('testReopenRegister');
		$slot_cache_2 = $slot_2->getCache();
		$this->assertEqual($slot_cache_1, $slot_cache_2);
		$this->assertEquals($slot_cache_1, $slot_cache_2);
		}

		/**
		@@ -31,10 +31,7 @@ class RegisterTest extends CacheRegisterKernelTestBase {
		public function testGetList() {
		/** @var \Drupal\cache_register\Manager $manager */
		$register = $this->createRegister();
		$this->assertEqual(
		$register->getCacheBackend()->get($register->id())->data,
		$register->getList()
		);
		$this->assertEquals($register->getCacheBackend()->get($register->id())->data, $register->getList());
		}

		/**