Merge branch 'develop' into fix-sync-request-after-get-change

Author: rahul05ranjan

.github/carson.yml

@@ -56,6 +56,13 @@ settings:
           Closing this issue: the description still does not follow the bug report template after {{days_until_close}} days.
 
           Please open a new issue using the [bug report form](https://github.com/codeigniter4/CodeIgniter4/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=Bug%3A+). For feature requests or support questions, please use the [forums](https://forum.codeigniter.com/forum-30.html).
+      - label: waiting for info
+        days_until_close: 14
+        unlabel_on_response: true
+        close_message: |-
+          Closing this {{type}}: there has been no response for {{days_until_close}} days after more information was requested.
+
+          If you can provide the requested details, leave a comment and a maintainer can reopen it.
   pr-title-linter:
     name: 'Carson / pr-title-linter'
     rules:

.github/workflows/run-carson.yml

@@ -14,6 +14,9 @@ on:
       - opened
       - edited
       - labeled
+  issue_comment:
+    types:
+      - created
   push:
     branches:
       - develop
@@ -28,7 +31,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Run Carson
-        uses: NexusPHP/carson@e4b2fde33f32c47455df218cf1765702c15c3b8b # v1.6.0
+        uses: NexusPHP/carson@cb35604ab330c2e44dba673fcef712c78e75f858 # v1.7.0
         with:
           app_id: ${{ secrets.CARSON_APP_ID }}
           private_key: ${{ secrets.CARSON_PRIVATE_KEY }}

system/Database/Postgre/Connection.php

@@ -207,7 +207,13 @@ public function getVersion(): string
     protected function execute(string $sql)
     {
         try {
-            return pg_query($this->connID, $sql);
+            $result = pg_query($this->connID, $sql);
+
+            if ($result === false && $this->DBDebug) {
+                throw new DatabaseException(pg_last_error($this->connID));
+            }
+
+            return $result;
         } catch (ErrorException $e) {
             $trace = array_slice($e->getTrace(), 2); // remove the call to error handler
 

system/Database/ResultInterface.php

@@ -26,18 +26,22 @@ interface ResultInterface
      * individual data rows, which can be either an 'array', an
      * 'object', or a custom class name.
      *
-     * @param string $type The row type. Either 'array', 'object', or a class name to use
+     * @template T of object
+     *
+     * @param 'array'|'object'|class-string<T> $type The row type. Either 'array', 'object', or a class name to use
      *
-     * @return ($type is 'array' ? list<array<string, mixed>> : ($type is 'object' ? list<stdClass> : list<object>))
+     * @return ($type is 'array' ? list<array<string, mixed>> : ($type is 'object' ? list<stdClass> : list<T>))
      */
     public function getResult(string $type = 'object'): array;
 
     /**
      * Returns the results as an array of custom objects.
      *
-     * @param string $className The name of the class to use.
+     * @template T of object
+     *
+     * @param class-string<T> $className The name of the class to use.
      *
-     * @return list<object>
+     * @return list<T>
      */
     public function getCustomResultObject(string $className);
 
@@ -102,7 +106,7 @@ public function getRowArray(int $n = 0);
      *
      * If row doesn't exist, returns null.
      *
-     * @return object|stdClass|null
+     * @return stdClass|null
      */
     public function getRowObject(int $n = 0);
 

system/HTTP/CLIRequest.php

@@ -236,7 +236,7 @@ public function isCLI(): bool
      * @param int|null                      $filter A filter name to apply.
      * @param array<string, mixed>|int|null $flags
      *
-     * @return array{}|null
+     * @return ($index is string ? null : array{})
      */
     public function getGet($index = null, $filter = null, $flags = null)
     {
@@ -250,7 +250,7 @@ public function getGet($index = null, $filter = null, $flags = null)
      * @param int|null                      $filter A filter name to apply
      * @param array<string, mixed>|int|null $flags
      *
-     * @return array{}|null
+     * @return ($index is string ? null : array{})
      */
     public function getPost($index = null, $filter = null, $flags = null)
     {
@@ -264,7 +264,7 @@ public function getPost($index = null, $filter = null, $flags = null)
      * @param int|null                      $filter A filter name to apply
      * @param array<string, mixed>|int|null $flags
      *
-     * @return array{}|null
+     * @return ($index is string ? null : array{})
      */
     public function getPostGet($index = null, $filter = null, $flags = null)
     {
@@ -278,7 +278,7 @@ public function getPostGet($index = null, $filter = null, $flags = null)
      * @param int|null                      $filter A filter name to apply
      * @param array<string, mixed>|int|null $flags
      *
-     * @return array{}|null
+     * @return ($index is string ? null : array{})
      */
     public function getGetPost($index = null, $filter = null, $flags = null)
     {
@@ -292,7 +292,7 @@ public function getGetPost($index = null, $filter = null, $flags = null)
      * @param int|null                 $filter A filter name to be applied
      * @param mixed                    $flags
      *
-     * @return array{}|null
+     * @return ($index is string ? null : array{})
      */
     public function getCookie($index = null, $filter = null, $flags = null)
     {
@@ -302,7 +302,7 @@ public function getCookie($index = null, $filter = null, $flags = null)
     /**
      * @param list<string>|string|null $index
      *
-     * @return array{}|null
+     * @return ($index is string ? null : array{})
      */
     private function returnNullOrEmptyArray($index)
     {

system/HTTP/IncomingRequest.php

@@ -409,7 +409,7 @@ public function getVar($index = null, $filter = null, $flags = null)
      *
      * @see http://php.net/manual/en/function.json-decode.php
      *
-     * @return array<array-key, mixed>|bool|float|int|stdClass|null
+     * @return ($assoc is true ? array<array-key, mixed>|bool|float|int|string|null : array<array-key, mixed>|bool|float|int|stdClass|string|null)
      *
      * @throws HTTPException When the body is invalid as JSON.
      */
@@ -436,7 +436,7 @@ public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
      * @param int|null                      $filter Filter Constant
      * @param array<string, mixed>|int|null $flags  Option
      *
-     * @return array<array-key, mixed>|bool|float|int|stdClass|string|null
+     * @return ($assoc is true ? array<array-key, mixed>|bool|float|int|string|null : array<array-key, mixed>|bool|float|int|stdClass|string|null)
      */
     public function getJsonVar($index = null, bool $assoc = false, ?int $filter = null, $flags = null)
     {

system/Helpers/url_helper.php

@@ -68,8 +68,8 @@ function base_url($relativePath = '', ?string $scheme = null): string
      * @param bool                 $returnObject True to return an object instead of a string
      * @param IncomingRequest|null $request      A request to use when retrieving the path
      *
-     * @return string|URI When returning string, the query and fragment parts are removed.
-     *                    When returning URI, the query and fragment parts are preserved.
+     * @return ($returnObject is true ? URI : string) When returning string, the query and fragment parts are removed.
+     *                                                When returning URI, the query and fragment parts are preserved.
      */
     function current_url(bool $returnObject = false, ?IncomingRequest $request = null): string|URI
     {
@@ -87,6 +87,8 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul
      * we first check in a saved session variable, if it exists, and use that.
      * If that's not available, however, we'll use a sanitized url from $_SERVER['HTTP_REFERER']
      * which can be set by the user so is untrusted and not set by certain browsers/servers.
+     *
+     * @return ($returnObject is true ? URI : string)
      */
     function previous_url(bool $returnObject = false): string|URI
     {

system/Validation/CreditCardRules.php

@@ -199,8 +199,7 @@ public function valid_cc_number(?string $ccNumber, string $type): bool
         // Remove any spaces and dashes
         $ccNumber = str_replace([' ', '-'], '', $ccNumber);
 
-        // Non-numeric values cannot be a number...duh
-        if (! is_numeric($ccNumber)) {
+        if (! ctype_digit($ccNumber)) {
             return false;
         }
 

tests/system/Database/Live/BadQueryTest.php

@@ -53,4 +53,22 @@ public function testBadQueryDebugFalse(): void
 
         $this->enableDBDebug();
     }
+
+    public function testPostgreBadQueryDebugTrueWithWarningsDisabled(): void
+    {
+        if ($this->db->DBDriver !== 'Postgre') {
+            $this->markTestSkipped('This test is only for Postgre.');
+        }
+
+        $this->enableDBDebug();
+        $errorReporting = error_reporting(E_ALL & ~E_WARNING);
+
+        try {
+            $this->expectException(DatabaseException::class);
+            $this->expectExceptionMessage('table_does_not_exist');
+            $this->db->query('SELECT * FROM table_does_not_exist');
+        } finally {
+            error_reporting($errorReporting);
+        }
+    }
 }

tests/system/Validation/StrictRules/CreditCardRulesTest.php

@@ -100,6 +100,16 @@ public static function provideValidCCNumber(): iterable
                 'abcd efgh ijkl mnop',
                 false,
             ],
+            'decimal_point_visa' => [
+                'visa',
+                '41.1111111111111',
+                false,
+            ],
+            'decimal_point_mastercard' => [
+                'mastercard',
+                '5351367.37861108',
+                false,
+            ],
             'bad_length' => [
                 'amex',
                 '3782 8224 6310 0051',