Fix TruncationResetStrategy and TransactionResetStrategy names

phpstan-baseline.neon

@@ -16,9 +16,9 @@ parameters:
 			path: src/Auth/Storage/SessionStorage.php
 
 		-
-			message: "#^Constructor of class Cake\\\\TestSuite\\\\Fixture\\\\TransactionStrategy has an unused parameter \\$loader\\.$#"
+			message: "#^Constructor of class Cake\\\\TestSuite\\\\Fixture\\\\TransactionResetStrategy has an unused parameter \\$loader\\.$#"
 			count: 1
-			path: src/TestSuite/Fixture/TransactionStrategy.php
+			path: src/TestSuite/Fixture/TransactionResetStrategy.php
 
 		-
 			message: "#^Method Cake\\\\Auth\\\\Storage\\\\SessionStorage\\:\\:redirectUrl\\(\\) should return array\\|string\\|null but return statement is missing\\.$#"

src/TestSuite/Fixture/TransactionStrategy.php

@@ -28,7 +28,7 @@ use RuntimeException;
  * of not being able to query data in fixtures from another
  * process.
  */
-class TransactionStrategy implements ResetStrategyInterface
+class TransactionResetStrategy implements ResetStrategyInterface
 {
     /**
      * Constructor.
@@ -57,7 +57,7 @@ class TransactionStrategy implements ResetStrategyInterface
                     throw new RuntimeException(
                         "Could not enable save points for the `{$name}` connection. " .
                             'Your database needs to support savepoints in order to use the ' .
-                            'TransactionStrategy for fixtures.'
+                            'TransactionResetStrategy for fixtures.'
                     );
                 }
             }

src/TestSuite/Fixture/TruncationStrategy.php

@@ -24,7 +24,7 @@ use Cake\Datasource\ConnectionManager;
 /**
  * Fixture state strategy that truncates tables before a test.
  *
- * This strategy is slower than the TransactionStrategy, but
+ * This strategy is slower than the TransactionResetStrategy, but
  * allows tests to reset state when applications require operations
  * that cannot be executed in a transaction. An example
  * of this is DDL operations in MySQL which auto-commit any open
@@ -34,7 +34,7 @@ use Cake\Datasource\ConnectionManager;
  * with the schema + data fixture system. Only tables that have
  * fixture data 'loaded' will be truncated.
  */
-class TruncationStrategy implements ResetStrategyInterface
+class TruncationResetStrategy implements ResetStrategyInterface
 {
     /**
      * A map of connections to the tables they contain.

src/TestSuite/TestCase.php

@@ -29,7 +29,7 @@ use Cake\TestSuite\Constraint\EventFired;
 use Cake\TestSuite\Constraint\EventFiredWith;
 use Cake\TestSuite\Fixture\FixtureLoader;
 use Cake\TestSuite\Fixture\ResetStrategyInterface;
-use Cake\TestSuite\Fixture\TruncationStrategy;
+use Cake\TestSuite\Fixture\TruncationResetStrategy;
 use Cake\Utility\Inflector;
 use LogicException;
 use PHPUnit\Framework\Constraint\DirectoryExists;
@@ -87,7 +87,7 @@ abstract class TestCase extends BaseTestCase
     /**
      * The classname for the fixture state reset strategy.
      *
-     * If null the TruncationStrategy will be used.
+     * If null, TruncationResetStrategy will be used.
      *
      * @var string|null
      * @psalm-var class-string|null
@@ -1058,7 +1058,7 @@ abstract class TestCase extends BaseTestCase
      */
     public function getResetStrategy(): ResetStrategyInterface
     {
-        $strategyClass = $this->stateResetStrategy ?? TruncationStrategy::class;
+        $strategyClass = $this->stateResetStrategy ?? TruncationResetStrategy::class;
         try {
             $reflect = new ReflectionClass($strategyClass);
         } catch (ReflectionException $e) {

tests/TestCase/Controller/ControllerTest.php

@@ -23,7 +23,7 @@ use Cake\Event\EventInterface;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Routing\Router;
-use Cake\TestSuite\Fixture\TransactionStrategy;
+use Cake\TestSuite\Fixture\TransactionResetStrategy;
 use Cake\TestSuite\TestCase;
 use Laminas\Diactoros\Uri;
 use ReflectionFunction;
@@ -41,7 +41,7 @@ class ControllerTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected $stateResetStrategy = TransactionStrategy::class;
+    protected $stateResetStrategy = TransactionResetStrategy::class;
 
     /**
      * fixtures property

tests/TestCase/Http/SessionTest.php

@@ -17,7 +17,7 @@ declare(strict_types=1);
 namespace Cake\Test\TestCase\Http;
 
 use Cake\Http\Session;
-use Cake\TestSuite\Fixture\TransactionStrategy;
+use Cake\TestSuite\Fixture\TransactionResetStrategy;
 use Cake\TestSuite\TestCase;
 use InvalidArgumentException;
 use RuntimeException;
@@ -32,7 +32,7 @@ class SessionTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected $stateResetStrategy = TransactionStrategy::class;
+    protected $stateResetStrategy = TransactionResetStrategy::class;
 
     /**
      * Fixtures used in the SessionTest

tests/TestCase/TestSuite/Fixture/TransactionStrategyTest.php

@@ -17,10 +17,10 @@ declare(strict_types=1);
 namespace Cake\Test\TestCase\TestSuite;
 
 use Cake\ORM\TableRegistry;
-use Cake\TestSuite\Fixture\TransactionStrategy;
+use Cake\TestSuite\Fixture\TransactionResetStrategy;
 use Cake\TestSuite\TestCase;
 
-class TransactionStrategyTest extends TestCase
+class TransactionResetStrategyTest extends TestCase
 {
     public $fixtures = ['core.Users'];
 
@@ -31,7 +31,7 @@ class TransactionStrategyTest extends TestCase
     {
         $users = TableRegistry::get('Users');
 
-        $strategy = new TransactionStrategy($this->fixtureManager);
+        $strategy = new TransactionResetStrategy($this->fixtureManager);
         $strategy->setupTest();
         $user = $users->newEntity(['username' => 'testing', 'password' => 'secrets']);
 

tests/TestCase/TestSuite/Fixture/TruncationStrategyTest.php

@@ -17,13 +17,13 @@ declare(strict_types=1);
 namespace Cake\Test\TestCase\TestSuite;
 
 use Cake\ORM\TableRegistry;
-use Cake\TestSuite\Fixture\TruncationStrategy;
+use Cake\TestSuite\Fixture\TruncationResetStrategy;
 use Cake\TestSuite\TestCase;
 
 /**
  * TruncationStrategy test
  */
-class TruncationStrategyTest extends TestCase
+class TruncationResetStrategyTest extends TestCase
 {
     public $fixtures = ['core.Articles', 'core.Tags', 'core.ArticlesTags'];
 
@@ -40,7 +40,7 @@ class TruncationStrategyTest extends TestCase
         $rowCount = $articlesTags->find()->count();
         $this->assertGreaterThan(0, $rowCount);
 
-        $strategy = new TruncationStrategy($this->fixtureManager);
+        $strategy = new TruncationResetStrategy($this->fixtureManager);
         $strategy->teardownTest();
 
         $rowCount = $articles->find()->count();

tests/TestCase/TestSuite/TestCaseTest.php

@@ -27,7 +27,7 @@ use Cake\Routing\Exception\MissingRouteException;
 use Cake\Routing\Router;
 use Cake\Test\Fixture\FixturizedTestCase;
 use Cake\TestSuite\Fixture\ResetStrategyInterface;
-use Cake\TestSuite\Fixture\TruncationStrategy;
+use Cake\TestSuite\Fixture\TruncationResetStrategy;
 use Cake\TestSuite\TestCase;
 use PHPUnit\Framework\AssertionFailedError;
 use RuntimeException;
@@ -427,7 +427,7 @@ class TestCaseTest extends TestCase
     {
         $instance = $this->getResetStrategy();
         $this->assertInstanceOf(ResetStrategyInterface::class, $instance);
-        $this->assertInstanceOf(TruncationStrategy::class, $instance);
+        $this->assertInstanceOf(TruncationResetStrategy::class, $instance);
     }
 
     /**

tests/TestCase/View/Helper/FormHelperTest.php

@@ -25,7 +25,7 @@ use Cake\I18n\FrozenTime;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;
 use Cake\Routing\Router;
-use Cake\TestSuite\Fixture\TransactionStrategy;
+use Cake\TestSuite\Fixture\TransactionResetStrategy;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Security;
 use Cake\Validation\Validator;
@@ -49,7 +49,7 @@ class FormHelperTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected $stateResetStrategy = TransactionStrategy::class;
+    protected $stateResetStrategy = TransactionResetStrategy::class;
 
     /**
      * Fixtures to be used

tests/TestCase/View/ViewTest.php

@@ -24,7 +24,7 @@ use Cake\Core\Plugin;
 use Cake\Event\EventInterface;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\TestSuite\Fixture\TransactionStrategy;
+use Cake\TestSuite\Fixture\TransactionResetStrategy;
 use Cake\TestSuite\TestCase;
 use Cake\View\View;
 use RuntimeException;
@@ -44,7 +44,7 @@ class ViewTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected $stateResetStrategy = TransactionStrategy::class;
+    protected $stateResetStrategy = TransactionResetStrategy::class;
 
     /**
      * Fixtures used in this test.