Merge branch '1.24.x' into 2.0.x

DavidBadura · DavidBadura · commit 834220fb2496 · 2026-06-12T14:30:51.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -12,5 +12,5 @@
 /phpunit.xml.dist export-ignore
 /psalm.xml export-ignore
 /psalm-baseline.xml export-ignore
-/test/ export-ignore
+/tests/ export-ignore
 /tools/ export-ignore
diff --git a/.github/workflows/backward-compatibility-check.yml b/.github/workflows/backward-compatibility-check.yml
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.37.0"
+        uses: "shivammathur/setup-php@2.37.2"
         with:
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.37.0"
+        uses: "shivammathur/setup-php@2.37.2"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -29,7 +29,7 @@ jobs:
               uses: actions/checkout@v6
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.37.0"
+              uses: "shivammathur/setup-php@2.37.2"
               with:
                   php-version: "${{ matrix.php-version }}"
                   ini-values: memory_limit=-1
diff --git a/.github/workflows/mutation-tests-diff.yml b/.github/workflows/mutation-tests-diff.yml
@@ -27,7 +27,7 @@ jobs:
                   fetch-depth: 0
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.37.0"
+              uses: "shivammathur/setup-php@2.37.2"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -29,7 +29,7 @@ jobs:
               uses: actions/checkout@v6
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.37.0"
+              uses: "shivammathur/setup-php@2.37.2"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -29,7 +29,7 @@ jobs:
               uses: actions/checkout@v6
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.37.0"
+              uses: "shivammathur/setup-php@2.37.2"
               with:
                   php-version: "${{ matrix.php-version }}"
                   ini-values: memory_limit=-1
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -46,7 +46,7 @@ jobs:
               uses: actions/checkout@v6
 
             - name: "Install PHP"
-              uses: "shivammathur/setup-php@2.37.0"
+              uses: "shivammathur/setup-php@2.37.2"
               with:
                   coverage: "pcov"
                   php-version: "${{ matrix.php-version }}"
diff --git a/src/Hydrator.php b/src/Hydrator.php
@@ -15,11 +15,18 @@ interface Hydrator
      * @return T
      *
      * @throws ClassNotSupported if the class is not supported or not found.
+     * @throws DenormalizationFailure if any normalizers throw an exception.
+     * @throws TypeMismatch if a TypeError occurs when setting a property value.
+     * @throws HydratorException Any other thrown exceptions should implement HydratorException.
      *
      * @template T of object
      */
     public function hydrate(string $class, mixed $data, array $context = []): object;
 
-    /** @param array<string, mixed> $context */
+    /**
+     * @param array<string, mixed> $context
+     *
+     * @throws HydratorException
+     */
     public function extract(object $object, array $context = []): mixed;
 }
diff --git a/src/HydratorException.php b/src/HydratorException.php
@@ -4,6 +4,8 @@
 
 namespace Patchlevel\Hydrator;
 
-interface HydratorException
+use Throwable;
+
+interface HydratorException extends Throwable
 {
 }
diff --git a/src/StackHydrator.php b/src/StackHydrator.php
@@ -88,7 +88,11 @@ function () use ($metadata, $data, $context): object {
         );
     }
 
-    /** @param array<string, mixed> $context */
+    /**
+     * @param array<string, mixed> $context
+     *
+     * @throws HydratorException
+     */
     public function extract(object $object, array $context = []): mixed
     {
         $metadata = $this->metadata($object::class);

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,18 @@ interface Hydrator`
`15`	`15`	`* @return T`
`16`	`16`	`*`
`17`	`17`	`* @throws ClassNotSupported if the class is not supported or not found.`
	`18`	`+ * @throws DenormalizationFailure if any normalizers throw an exception.`
	`19`	`+ * @throws TypeMismatch if a TypeError occurs when setting a property value.`
	`20`	`+ * @throws HydratorException Any other thrown exceptions should implement HydratorException.`
`18`	`21`	`*`
`19`	`22`	`* @template T of object`
`20`	`23`	`*/`
`21`	`24`	`public function hydrate(string $class, mixed $data, array $context = []): object;`
`22`	`25`
`23`		`- /** @param array<string, mixed> $context */`
	`26`	`+ /**`
	`27`	`+ * @param array<string, mixed> $context`
	`28`	`+ *`
	`29`	`+ * @throws HydratorException`
	`30`	`+ */`
`24`	`31`	`public function extract(object $object, array $context = []): mixed;`
`25`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace Patchlevel\Hydrator;`
`6`	`6`
`7`		`-interface HydratorException`
	`7`	`+use Throwable;`
	`8`	`+`
	`9`	`+interface HydratorException extends Throwable`
`8`	`10`	`{`
`9`	`11`	`}`