PHPStan 2.0 update.

dereuromark · Nov 11, 2024 · f8f21a1 · f8f21a1
1 parent b331e1b
commit f8f21a1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/plugins/Sandbox/tests/TestCase/Controller/ExposeExamplesControllerTest.php b/plugins/Sandbox/tests/TestCase/Controller/ExposeExamplesControllerTest.php
@@ -2,7 +2,6 @@
 
 namespace Sandbox\Test\TestCase\Controller;
 
-use Cake\ORM\TableRegistry;
 use Shim\TestSuite\IntegrationTestCase;
 
 /**
@@ -44,7 +43,7 @@ public function testView() {
 		$this->disableErrorHandlerMiddleware();
 
 		/** @var \Sandbox\Model\Entity\ExposedUser $user */
-		$user = TableRegistry::getTableLocator()->get('Sandbox.ExposedUsers')->find()->firstOrFail();
+		$user = $this->fetchTable('Sandbox.ExposedUsers')->find()->firstOrFail();
 
 		$this->get(['plugin' => 'Sandbox', 'controller' => 'ExposeExamples', 'action' => 'view', $user->uuid]);
 
@@ -71,7 +70,7 @@ public function testSuperimposedView() {
 		$this->disableErrorHandlerMiddleware();
 
 		/** @var \Sandbox\Model\Entity\ExposedUser $user */
-		$user = TableRegistry::getTableLocator()->get('Sandbox.ExposedUsers')->find()->firstOrFail();
+		$user = $this->fetchTable('Sandbox.ExposedUsers')->find()->firstOrFail();
 
 		$this->get(['plugin' => 'Sandbox', 'controller' => 'ExposeExamples', 'action' => 'superimposedView', $user->uuid]);
 

diff --git a/plugins/Sandbox/tests/TestCase/Controller/QueueExamplesControllerTest.php b/plugins/Sandbox/tests/TestCase/Controller/QueueExamplesControllerTest.php
@@ -2,7 +2,6 @@
 
 namespace Sandbox\Test\TestCase\Controller;
 
-use Cake\ORM\TableRegistry;
 use Shim\TestSuite\IntegrationTestCase;
 
 /**
@@ -56,7 +55,7 @@ public function testConfig() {
 	public function testCancelJob() {
 		$this->disableErrorHandlerMiddleware();
 
-		$queuedJobs = TableRegistry::getTableLocator()->get('Queue.QueuedJobs');
+		$queuedJobs = $this->fetchTable('Queue.QueuedJobs');
 		$queuedJob = $queuedJobs->newEntity([
 			'job_task' => 'Queue.ProgressExample',
 			'reference' => 'demo-cli',
@@ -80,7 +79,7 @@ public function testScheduleDemo() {
 		$this->assertResponseCode(302);
 		$this->assertRedirect();
 
-		$queuedJobs = TableRegistry::getTableLocator()->get('Queue.QueuedJobs');
+		$queuedJobs = $this->fetchTable('Queue.QueuedJobs');
 		/** @var \Queue\Model\Entity\QueuedJob $queuedJob */
 		$queuedJob = $queuedJobs->find()->orderByDesc('id')->firstOrFail();
 		$this->assertSame('Queue.ProgressExample', $queuedJob->job_task);

diff --git a/plugins/Sandbox/tests/TestCase/Model/Table/EventsTableTest.php b/plugins/Sandbox/tests/TestCase/Model/Table/EventsTableTest.php
@@ -34,7 +34,7 @@ class EventsTableTest extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 		$config = TableRegistry::getTableLocator()->exists('Events') ? [] : ['className' => 'Sandbox\Model\Table\EventsTable'];
-		$this->Events = TableRegistry::getTableLocator()->get('Events', $config);
+		$this->Events = $this->fetchTable('Events', $config);
 	}
 
 	/**

diff --git a/plugins/Sandbox/tests/TestCase/Model/Table/ExposedUsersTableTest.php b/plugins/Sandbox/tests/TestCase/Model/Table/ExposedUsersTableTest.php
@@ -36,7 +36,7 @@ class ExposedUsersTableTest extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 		$config = TableRegistry::getTableLocator()->exists('ExposedUsers') ? [] : ['className' => ExposedUsersTable::class];
-		$this->ExposedUsers = TableRegistry::getTableLocator()->get('ExposedUsers', $config);
+		$this->ExposedUsers = $this->fetchTable('ExposedUsers', $config);
 	}
 
 	/**

diff --git a/tests/TestCase/Controller/AccountControllerTest.php b/tests/TestCase/Controller/AccountControllerTest.php
@@ -2,7 +2,6 @@
 
 namespace App\Test\TestCase\Controller;
 
-use Cake\ORM\TableRegistry;
 use Shim\TestSuite\IntegrationTestCase;
 
 /**
@@ -89,7 +88,7 @@ public function testLoginPostValidData() {
 			'email' => '[email protected]',
 			'pwd' => '123456',
 		];
-		$Users = TableRegistry::getTableLocator()->get('Users');
+		$Users = $this->fetchTable('Users');
 		$Users->addBehavior('Tools.Passwordable', ['confirm' => false]);
 		$user = $Users->newEntity($data);
 		$result = $Users->save($user);
@@ -113,7 +112,7 @@ public function testLoginPostValidDataEmail() {
 			'email' => '[email protected]',
 			'pwd' => '123456',
 		];
-		$Users = TableRegistry::getTableLocator()->get('Users');
+		$Users = $this->fetchTable('Users');
 		$Users->addBehavior('Tools.Passwordable', ['confirm' => false]);
 		$user = $Users->newEntity($data);
 		$result = $Users->save($user);
@@ -137,7 +136,7 @@ public function testLoginPostValidDataReferrer() {
 			'email' => '[email protected]',
 			'pwd' => '123456',
 		];
-		$Users = TableRegistry::getTableLocator()->get('Users');
+		$Users = $this->fetchTable('Users');
 		$Users->addBehavior('Tools.Passwordable', ['confirm' => false]);
 		$user = $Users->newEntity($data);
 		$result = $Users->save($user);
@@ -202,7 +201,7 @@ public function testChangePassword() {
 	public function testChangePasswordPost() {
 		$this->skipIf(true); // not needed right now
 
-		$Users = TableRegistry::getTableLocator()->get('Users');
+		$Users = $this->fetchTable('Users');
 		$username = $Users->field('username');
 
 		$session = ['Auth' => ['Tmp' => ['id' => '1']]];

diff --git a/tests/TestCase/Model/Table/UsersTableTest.php b/tests/TestCase/Model/Table/UsersTableTest.php
@@ -2,7 +2,6 @@
 
 namespace App\Test\TestCase\Model\Table;
 
-use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 
 /**
@@ -31,7 +30,7 @@ class UsersTableTest extends TestCase {
 	 */
 	public function setUp(): void {
 		parent::setUp();
-		$this->Users = TableRegistry::getTableLocator()->get('Users');
+		$this->Users = $this->fetchTable('Users');
 	}
 
 	/**