Upgrade test suite to use generators

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Changed
 - Update test case to current (PHP) standards ([#831](https://github.com/jsonrainbow/json-schema/pull/831))
+- Upgrade test suite to use generators ([#834](https://github.com/jsonrainbow/json-schema/pull/834))
 
 ## [6.4.2] - 2025-06-03
 ### Fixed

tests/ConstraintErrorTest.php

@@ -1,11 +1,6 @@
 <?php
 
-/*
- * This file is part of the JsonSchema package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+declare(strict_types=1);
 
 namespace JsonSchema\Tests;
 
@@ -24,7 +19,7 @@ public function testGetInvalidMessage(): void
     {
         $e = ConstraintError::MISSING_ERROR();
 
-        $this->expectException('\JsonSchema\Exception\InvalidArgumentException');
+        $this->expectException(\JsonSchema\Exception\InvalidArgumentException::class);
         $this->expectExceptionMessage('Missing error message for missingError');
 
         $e->getMessage();

tests/Constraints/AdditionalPropertiesTest.php

@@ -1,11 +1,6 @@
 <?php
 
-/*
- * This file is part of the JsonSchema package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+declare(strict_types=1);
 
 namespace JsonSchema\Tests\Constraints;
 
@@ -15,10 +10,9 @@ class AdditionalPropertiesTest extends BaseTestCase
 {
     protected $validateSchema = true;
 
-    public function getInvalidTests(): array
+    public function getInvalidTests(): \Generator
     {
-        return [
-            [
+        yield [
                 '{
                   "prop":"1",
                   "patternProp":"3",
@@ -49,8 +43,8 @@ public function getInvalidTests(): array
                         'context' => Validator::ERROR_DOCUMENT_VALIDATION
                     ]
                 ]
-            ],
-            [
+            ];
+        yield [
                 '{
                   "prop":"1",
                   "additionalProp":"2"
@@ -62,8 +56,8 @@ public function getInvalidTests(): array
                   },
                   "additionalProperties": false
                 }'
-            ],
-            [
+            ];
+        yield [
                 '{
                   "prop":"1",
                   "additionalProp":2
@@ -75,8 +69,8 @@ public function getInvalidTests(): array
                   },
                   "additionalProperties": {"type":"string"}
                 }'
-            ],
-            [
+            ];
+        yield [
                 '{
                   "prop":"1",
                   "additionalProp":2
@@ -88,8 +82,8 @@ public function getInvalidTests(): array
                   },
                   "additionalProperties": {"type":"string"}
                 }'
-            ],
-            [
+            ];
+        yield [
                 '{
                   "prop1": "a",
                   "prop2": "b"
@@ -100,8 +94,8 @@ public function getInvalidTests(): array
                     "type": "boolean"
                   }
                 }'
-            ],
-            [
+            ];
+        yield [
                 '{
                   "prop1": "a",
                   "prop2": "b"
@@ -110,14 +104,12 @@ public function getInvalidTests(): array
                   "type": "object",
                   "additionalProperties": false
                 }'
-            ],
-        ];
+            ];
     }
 
-    public function getValidTests(): array
+    public function getValidTests(): \Generator
     {
-        return [
-            [
+        yield [
                 '{
                   "prop":"1",
                   "additionalProp":"2"
@@ -128,8 +120,8 @@ public function getValidTests(): array
                     "prop":{"type":"string"}
                   }
                 }'
-            ],
-            [
+            ];
+        yield [
                 '{
                   "prop":"1",
                   "additionalProp":"2"
@@ -140,8 +132,8 @@ public function getValidTests(): array
                     "prop":{"type":"string"}
                   }
                 }'
-            ],
-            [
+        ];
+        yield [
                 '{
                   "prop":"1",
                   "additionalProp":"2"
@@ -153,8 +145,8 @@ public function getValidTests(): array
                   },
                   "additionalProperties": {"type":"string"}
                 }'
-            ],
-            [
+        ];
+        yield [
                 '{
                   "prop":"1",
                   "additionalProp":[]
@@ -166,8 +158,8 @@ public function getValidTests(): array
                   },
                   "additionalProperties": true
                 }'
-            ],
-            [
+        ];
+        yield [
                 '{
                   "prop1": "a",
                   "prop2": "b"
@@ -178,8 +170,8 @@ public function getValidTests(): array
                     "type": "string"
                   }
                 }'
-            ],
-            [
+        ];
+        yield [
                 '{
                   "prop1": "a",
                   "prop2": "b"
@@ -188,8 +180,8 @@ public function getValidTests(): array
                   "type": "object",
                   "additionalProperties": true
                 }'
-            ],
-            'additional property casted into int when actually is numeric string (#784)' => [
+        ];
+        yield 'additional property casted into int when actually is numeric string (#784)' => [
                 '{
                     "prop1": {
                         "123": "a"
@@ -206,7 +198,6 @@ public function getValidTests(): array
                         }
                     }
                 }'
-            ],
-        ];
+            ];
     }
 }