Merge branch 'develop' into 4.7

Author: paulbalandan

phpstan.neon.dist

@@ -41,5 +41,6 @@ parameters:
 	codeigniter:
 		additionalServices:
 			- AfterAutoloadModule\Config\Services
+		checkArgumentTypeOfModel: false
 	shipmonkBaselinePerIdentifier:
 		directory: %currentWorkingDirectory%

system/Log/Handlers/ChromeLoggerHandler.php

@@ -151,6 +151,8 @@ protected function format($object)
     /**
      * Attaches the header and the content to the passed in request object.
      *
+     * @param-out ResponseInterface $response
+     *
      * @return void
      */
     public function sendLogs(?ResponseInterface &$response = null)

tests/_support/Validation/TestRules.php

@@ -15,6 +15,9 @@
 
 class TestRules
 {
+    /**
+     * @param-out string $error
+     */
     public function customError(string $str, ?string &$error = null)
     {
         $error = 'My lovely error';

tests/system/ControllerTest.php

@@ -89,13 +89,17 @@ public function testConstructorHTTPS(): void
         $_SERVER = $original; // restore so code coverage doesn't break
     }
 
-    public function testCachePage(): void
+    public function testCachePageSetsTtl(): void
     {
         $this->controller = new Controller();
         $this->controller->initController($this->request, $this->response, $this->logger);
 
         $method = self::getPrivateMethodInvoker($this->controller, 'cachePage');
-        $this->assertNull($method(10));
+
+        $this->assertSame(0, self::getPrivateProperty(service('responsecache'), 'ttl'));
+
+        $method(10);
+        $this->assertSame(10, self::getPrivateProperty(service('responsecache'), 'ttl'));
     }
 
     public function testValidate(): void

tests/system/Database/ConfigTest.php

@@ -13,6 +13,7 @@
 
 namespace CodeIgniter\Database;
 
+use CodeIgniter\Database\Postgre\Connection as PostgreConnection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\ReflectionHelper;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -149,7 +150,7 @@ public function testConnectionGroupWithDSN(): void
     public function testConnectionGroupWithDSNPostgre(): void
     {
         $conn = Config::connect($this->dsnGroupPostgre, false);
-        $this->assertInstanceOf(BaseConnection::class, $conn);
+        $this->assertInstanceOf(PostgreConnection::class, $conn);
 
         $this->assertSame('', $this->getPrivateProperty($conn, 'DSN'));
         $this->assertSame('localhost', $this->getPrivateProperty($conn, 'hostname'));
@@ -205,7 +206,7 @@ public function testConvertDSN(string $input, string $expected): void
         //      Should deprecate?
         $this->dsnGroupPostgreNative['DSN'] = $input;
         $conn                               = Config::connect($this->dsnGroupPostgreNative, false);
-        $this->assertInstanceOf(BaseConnection::class, $conn);
+        $this->assertInstanceOf(PostgreConnection::class, $conn);
 
         $method = self::getPrivateMethodInvoker($conn, 'convertDSN');
         $method();

utils/phpstan-baseline/codeigniter.modelArgumentInstanceof.neon

@@ -3,7 +3,6 @@ includes:
     - assign.propertyType.neon
     - codeigniter.cacheHandlerInstance.neon
     - codeigniter.getReassignArray.neon
-    - codeigniter.modelArgumentInstanceof.neon
     - codeigniter.modelArgumentType.neon
     - codeigniter.superglobalAccess.neon
     - codeigniter.superglobalAccessAssign.neon
@@ -26,7 +25,6 @@ includes:
     - notIdentical.alwaysTrue.neon
     - nullCoalesce.property.neon
     - nullCoalesce.variable.neon
-    - parameterByRef.unusedType.neon
     - property.defaultValue.neon
     - property.nonObject.neon
     - property.notFound.neon