Remove deprecated IntegrationTestCase.

src/TestSuite/IntegrationTestCase.php

@@ -1,32 +0,0 @@
-<?php
-declare(strict_types=1);
-/**
- * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
- * @since         3.0.0
- * @license       https://opensource.org/licenses/mit-license.php MIT License
- */
-namespace Cake\TestSuite;
-
-/**
- * A test case class intended to make integration tests of
- * your controllers easier.
- *
- * This test class provides a number of helper methods and features
- * that make dispatching requests and checking their responses simpler.
- * It favours full integration tests over mock objects as you can test
- * more of your code easily and avoid some of the maintenance pitfalls
- * that mock objects create.
- *
- * @deprecated 3.7.0 Use Cake\TestSuite\IntegrationTestTrait instead
- */
-abstract class IntegrationTestCase extends TestCase
-{
-    use IntegrationTestTrait;
-}

src/TestSuite/MiddlewareDispatcher.php

@@ -22,6 +22,8 @@ use Cake\Http\Server;
 use Cake\Http\ServerRequestFactory;
 use Cake\Routing\Router;
 use LogicException;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use ReflectionClass;
 use ReflectionException;
 use Zend\Diactoros\Stream;
@@ -37,7 +39,7 @@ class MiddlewareDispatcher
     /**
      * The test case being run.
      *
-     * @var \Cake\TestSuite\IntegrationTestCase
+     * @var \Cake\TestSuite\TestCase
      */
     protected $_test;
 
@@ -65,12 +67,12 @@ class MiddlewareDispatcher
     /**
      * Constructor
      *
-     * @param \Cake\TestSuite\IntegrationTestCase $test The test case to run.
+     * @param \Cake\TestSuite\TestCase $test The test case to run.
      * @param string|null $class The application class name. Defaults to App\Application.
      * @param array|null $constructorArgs The constructor arguments for your application class.
      *   Defaults to `['./config']`
      */
-    public function __construct(\Cake\TestSuite\IntegrationTestCase $test, ?string $class = null, ?array $constructorArgs = null)
+    public function __construct(TestCase $test, ?string $class = null, ?array $constructorArgs = null)
     {
         $this->_test = $test;
         $this->_class = $class ?: Configure::read('App.namespace') . '\Application';
@@ -135,7 +137,7 @@ class MiddlewareDispatcher
      * @param array $spec The request spec.
      * @return \Psr\Http\Message\ServerRequestInterface
      */
-    protected function _createRequest(array $spec): \Psr\Http\Message\ServerRequestInterface
+    protected function _createRequest(array $spec): ServerRequestInterface
     {
         if (isset($spec['input'])) {
             $spec['post'] = [];
@@ -168,7 +170,7 @@ class MiddlewareDispatcher
      * @param array $requestSpec The request spec to execute.
      * @return \Psr\Http\Message\ResponseInterface The generated response.
      */
-    public function execute(array $requestSpec): \Psr\Http\Message\ResponseInterface
+    public function execute(array $requestSpec): ResponseInterface
     {
         try {
             $reflect = new ReflectionClass($this->_class);

tests/Fixture/AssertIntegrationTestCase.php

@@ -2,13 +2,16 @@
 namespace Cake\Test\Fixture;
 
 use Cake\Http\Response;
-use Cake\TestSuite\IntegrationTestCase;
+use Cake\TestSuite\IntegrationTestTrait;
+use Cake\TestSuite\TestCase;
 
 /**
  * This class helps in indirectly testing the functionality of IntegrationTestCase
  */
-class AssertIntegrationTestCase extends IntegrationTestCase
+class AssertIntegrationTestCase extends TestCase
 {
+    use IntegrationTestTrait;
+
     /**
      * testBadAssertNoRedirect
      *

tests/TestCase/TestSuite/IntegrationTestTraitTest.php

@@ -23,17 +23,20 @@ use Cake\Http\Response;
 use Cake\Routing\Route\InflectedRoute;
 use Cake\Routing\Router;
 use Cake\Test\Fixture\AssertIntegrationTestCase;
-use Cake\TestSuite\IntegrationTestCase;
+use Cake\TestSuite\IntegrationTestTrait;
+use Cake\TestSuite\TestCase;
 use Cake\Utility\Security;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\Error\Deprecated;
 use Zend\Diactoros\UploadedFile;
 
 /**
- * Self test of the IntegrationTestCase
+ * Self test of the IntegrationTestTrait
  */
-class IntegrationTestTraitTest extends IntegrationTestCase
+class IntegrationTestTraitTest extends TestCase
 {
+    use IntegrationTestTrait;
+
     /**
      * stub encryption key.
      *