Merge remote-tracking branch 'upstream/develop' into 4.3

Author: kenjis

.github/workflows/test-phpstan.yml

@@ -33,16 +33,14 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-      matrix:
-        php-versions: ['8.0', '8.1']
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: '8.1'
           extensions: intl
 
       - name: Use latest Composer

phpstan-baseline.neon.dist

@@ -261,7 +261,7 @@ parameters:
 			path: system/Database/MySQLi/Result.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between array and false will always evaluate to false\\.$#"
+			message: "#^Strict comparison using \\=\\=\\= between array<string, int|string|null> and false will always evaluate to false\\.$#"
 			count: 1
 			path: system/Database/Postgre/Connection.php
 

phpstan.neon.dist

@@ -16,7 +16,7 @@ includes:
 	- phpstan-baseline.neon.dist
 
 parameters:
-	phpVersion: 80000
+	phpVersion: 80100
 	tmpDir: build/phpstan
 	level: 5
 	paths:

tests/system/HTTP/MessageTest.php

@@ -154,9 +154,9 @@ public function testAppendBody()
     {
         $this->message->setBody('moo');
 
-        $this->message->appendBody('\n');
+        $this->message->appendBody("\n");
 
-        $this->assertSame('moo\n', $this->message->getBody());
+        $this->assertSame("moo\n", $this->message->getBody());
     }
 
     public function testSetHeaderReplacingHeader()

tests/system/HTTP/ResponseTest.php

@@ -243,9 +243,10 @@ public function testSetLastModifiedWithDateTimeObject()
     {
         $response = new Response(new App());
 
-        $response->setLastModified(DateTime::createFromFormat('Y-m-d', '2000-03-10'));
+        $datetime = DateTime::createFromFormat('Y-m-d', '2000-03-10');
+        $response->setLastModified($datetime);
 
-        $date = DateTime::createFromFormat('Y-m-d', '2000-03-10');
+        $date = clone $datetime;
         $date->setTimezone(new DateTimeZone('UTC'));
 
         $header = $response->getHeaderLine('Last-Modified');

tests/system/HTTP/URITest.php

@@ -863,56 +863,56 @@ public function testSetBadSegmentSilent()
 
     public function testBasedNoIndex()
     {
-        $this->resetServices();
-
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/ci/v4/controller/method';
 
+        $this->resetServices();
+
         $config            = new App();
-        $config->baseURL   = 'http://example.com/ci/v4';
-        $config->indexPage = 'index.php';
-        $request           = Services::request($config);
-        $request->uri      = new URI('http://example.com/ci/v4/controller/method');
+        $config->baseURL   = 'http://example.com/ci/v4/';
+        $config->indexPage = '';
+        Factories::injectMock('config', 'App', $config);
 
+        $request = Services::request($config);
         Services::injectMock('request', $request);
 
         // going through request
         $this->assertSame('http://example.com/ci/v4/controller/method', (string) $request->getUri());
-        $this->assertSame('/ci/v4/controller/method', $request->getUri()->getPath());
+        $this->assertSame('ci/v4/controller/method', $request->getUri()->getPath());
 
         // standalone
         $uri = new URI('http://example.com/ci/v4/controller/method');
         $this->assertSame('http://example.com/ci/v4/controller/method', (string) $uri);
         $this->assertSame('/ci/v4/controller/method', $uri->getPath());
 
-        $this->assertSame($uri->getPath(), $request->getUri()->getPath());
+        $this->assertSame($uri->getPath(), '/' . $request->getUri()->getPath());
     }
 
     public function testBasedWithIndex()
     {
-        $this->resetServices();
-
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/ci/v4/index.php/controller/method';
 
+        $this->resetServices();
+
         $config            = new App();
-        $config->baseURL   = 'http://example.com/ci/v4';
+        $config->baseURL   = 'http://example.com/ci/v4/';
         $config->indexPage = 'index.php';
-        $request           = Services::request($config);
-        $request->uri      = new URI('http://example.com/ci/v4/index.php/controller/method');
+        Factories::injectMock('config', 'App', $config);
 
+        $request = Services::request($config);
         Services::injectMock('request', $request);
 
         // going through request
         $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $request->getUri());
-        $this->assertSame('/ci/v4/index.php/controller/method', $request->getUri()->getPath());
+        $this->assertSame('ci/v4/index.php/controller/method', $request->getUri()->getPath());
 
         // standalone
         $uri = new URI('http://example.com/ci/v4/index.php/controller/method');
         $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $uri);
         $this->assertSame('/ci/v4/index.php/controller/method', $uri->getPath());
 
-        $this->assertSame($uri->getPath(), $request->getUri()->getPath());
+        $this->assertSame($uri->getPath(), '/' . $request->getUri()->getPath());
     }
 
     public function testForceGlobalSecureRequests()

tests/system/Pager/PagerTest.php

@@ -467,9 +467,9 @@ public function testBasedURI()
         $config            = new App();
         $config->baseURL   = 'http://example.com/ci/v4/';
         $config->indexPage = 'fc.php';
-        $request           = Services::request($config);
-        $request->uri      = new URI('http://example.com/ci/v4/x/y');
+        Factories::injectMock('config', 'App', $config);
 
+        $request = Services::request($config);
         Services::injectMock('request', $request);
 
         $this->config = new PagerConfig();