Merge branch '4.5.x' into 5.0.x

* 4.5.x:
  [Doc] Update caching.rst (doctrine#7322)
  Bump the doctrine group with 4 updates
  Bump codecov/codecov-action from 5 to 6
  Group Doctrine workflow updates together (doctrine#7340)
  Fix Json object mapping (doctrine#7336)

Author: derrabus

.github/dependabot.yml

@@ -7,3 +7,7 @@ updates:
     labels:
       - "CI"
     target-branch: "3.10.x"
+    groups:
+      doctrine:
+        patterns:
+          - "doctrine/*"

.github/workflows/coding-standards.yml

@@ -25,6 +25,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@14.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@15.0.0"
     with:
       composer-options: "--ignore-platform-req=php+"

.github/workflows/continuous-integration.yml

@@ -312,7 +312,7 @@ jobs:
         working-directory: reports
 
       - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v5"
+        uses: "codecov/codecov-action@v6"
         with:
           directory: reports
           fail_ci_if_error: true

.github/workflows/documentation.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@14.0.0"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@15.0.0"

.github/workflows/static-analysis.yml

@@ -25,4 +25,4 @@ on:
 jobs:
   static-analysis-phpstan:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@14.0.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@15.0.0"

.github/workflows/website-schema.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   json-validate:
     name: "Validate JSON schema"
-    uses: "doctrine/.github/.github/workflows/website-schema.yml@14.0.0"
+    uses: "doctrine/.github/.github/workflows/website-schema.yml@15.0.0"

docs/en/reference/caching.rst

@@ -4,7 +4,7 @@ Caching
 A ``Doctrine\DBAL\Connection`` can automatically cache result sets. The
 feature is optional though, and by default, no result set is cached.
 
-To use the result cache, there are three mandatory steps:
+To use the result cache, there are two mandatory steps:
 
 1. Configure a global result cache, or provide one at query time.
 2. Provide a cache profile for the result set you want to cache when

src/Types/Type.php

@@ -44,9 +44,9 @@ abstract class Type
         Types::GUID                 => GuidType::class,
         Types::INTEGER              => IntegerType::class,
         Types::JSON                 => JsonType::class,
-        Types::JSON_OBJECT          => JsonType::class,
+        Types::JSON_OBJECT          => JsonObjectType::class,
         Types::JSONB                => JsonbType::class,
-        Types::JSONB_OBJECT         => JsonbType::class,
+        Types::JSONB_OBJECT         => JsonbObjectType::class,
         Types::SIMPLE_ARRAY         => SimpleArrayType::class,
         Types::SMALLFLOAT           => SmallFloatType::class,
         Types::SMALLINT             => SmallIntType::class,

tests/Functional/Types/JsonObjectTest.php

@@ -96,7 +96,7 @@ private function select(int $id): object
 
         self::assertIsString($value);
 
-        $value = json_decode($value, false);
+        $value = $this->connection->convertToPHPValue($value, Types::JSON_OBJECT);
 
         self::assertIsObject($value);
 

tests/Functional/Types/JsonTest.php

@@ -105,7 +105,10 @@ private function select(int $id): array
 
         self::assertIsString($value);
 
-        $value = json_decode($value, true);
+        $value = Type::getType(Types::JSON)->convertToPHPValue(
+            $value,
+            $this->connection->getDatabasePlatform(),
+        );
 
         self::assertIsArray($value);