Merge master into jsonSchemaDraft2019

Conflicts resolved in AdditionalPropertiesAccessorPostProcessor:
- Kept both the &$updatedPropertiesCount parameter (from jsonSchemaDraft2019)
  and the ->withJsonPointer() stamping (from master)
- Kept both new test methods: testMinPropertiesExceptionExposesCount and
  testRegularPropertyMergedFromMultipleBranchesReportsFirstDeclaredPointer

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: wol-soft

docs/source/combinedSchemas/allOf.rst

@@ -67,6 +67,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\ComposedValue\\All
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 .. hint::
 

docs/source/combinedSchemas/anyOf.rst

@@ -57,6 +57,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\ComposedValue\\Any
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 .. note::
 

docs/source/combinedSchemas/if.rst

@@ -69,6 +69,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\ComposedValue\\Con
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 An object level composition will result in an object which contains all properties contained in the three possible blocks of the condition.
 

docs/source/combinedSchemas/not.rst

@@ -45,6 +45,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\ComposedValue\\Not
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 .. note::
 

docs/source/combinedSchemas/oneOf.rst

@@ -67,6 +67,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\ComposedValue\\One
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 .. note::
 

docs/source/complexTypes/array.rst

@@ -42,6 +42,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Generic\\InvalidTy
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 Items
 ^^^^^
@@ -82,6 +84,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Arrays\\InvalidIte
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 A more complex array may contain a nested object.
 
@@ -204,6 +208,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Arrays\\InvalidTup
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 .. hint::
 
@@ -259,6 +265,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Arrays\\Additional
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 If invalid additional items are provided a detailed exception will be thrown containing all violations:
 
@@ -280,6 +288,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Arrays\\InvalidAdd
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 Contains
 --------
@@ -313,6 +323,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Arrays\\ContainsEx
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 The ``contains`` keyword also accepts the boolean literals ``true`` and ``false``.
 
@@ -358,6 +370,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Arrays\\MaxItemsEx
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 Uniqueness
 ----------
@@ -389,3 +403,5 @@ The thrown exception will be an *PHPModelGenerator\\Exception\\Arrays\\UniqueIte
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer

docs/source/complexTypes/enum.rst

@@ -70,3 +70,5 @@ The thrown exception will be an *PHPModelGenerator\\Exception\\Generic\\EnumExce
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer

docs/source/complexTypes/multiType.rst

@@ -37,6 +37,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Generic\\InvalidTy
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 Additional validators
 ---------------------

docs/source/complexTypes/object.rst

@@ -63,6 +63,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Generic\\InvalidTy
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 The nested object will be validated in the nested class Car which may throw additional exceptions if invalid data is provided. If the internal validation of a nested object fails a *PHPModelGenerator\\Exception\\Generic\\NestedObjectException* will be thrown which provides the following methods to get further error details:
 
@@ -74,6 +76,8 @@ The nested object will be validated in the nested class Car which may throw addi
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 If `error collection <../gettingStarted.html#collect-errors-vs-early-return>`__ is enabled the nested exception returned by `getNestedException` will be an **ErrorRegistryException** containing all validation errors of the nested object. Otherwise it will contain the first validation error which occurred during the validation of the nested object.
 
@@ -99,9 +103,40 @@ Otherwise, if an `$id` is present, the basename of the $id and as a last fallbac
 Naming of nested classes
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-For the class name of a nested class the `title` property (fallback to `$id`) of the nested object is used.
-If neither the title nor the $id property is present the property key will be prefixed with the parent class.
-If an object `Person` has a nested object `car` without a `title` and an `$id` the class for car will be named **Person_Car**.
+For the class name of a nested class the following priority order applies:
+
+1. **title** — used as-is if present on the nested schema.
+2. **$id** — the basename of the ``$id`` URI is used if present.
+3. **$anchor** — the ``$anchor`` value is used if present (Draft 2019-09 and later). ``$anchor``
+   is a plain-string identifier with the same intent as ``$id`` but without URI semantics.
+4. **Definition key** — when the nested schema is referenced from a named ``definitions`` or
+   ``$defs`` slot (e.g. ``$ref: "#/definitions/address"``), the definition key is used
+   (e.g. ``address``). This produces stable, readable names even for schemas that carry no
+   ``title``, ``$id``, or ``$anchor``.
+5. **Inline property name** — when the schema is defined inline directly under a ``properties``
+   keyword, the property key is used without a content hash. Property keys are unique within
+   their containing object, so the combination of parent class name and property key is
+   already collision-free. For example, an inline ``car`` object inside ``Person`` becomes
+   **Person_Car**.
+6. **Array items** — when the schema is the ``items`` of a named array property, the array
+   property name is extracted and ``Item`` is appended, making it clear that the class
+   represents one element of the array rather than the array itself. For example, the items
+   of a ``tags`` array property become **{Parent}_TagsItem**.
+7. **Property name + content hash** — final fallback for schemas that do not match any of the
+   above (e.g. inline schemas inside composition branches like ``anyOf``/``oneOf``). The
+   property key is prefixed with the parent class name and a short content hash is appended
+   to avoid collisions between branches that share the same property name.
+
+.. hint::
+
+    Set ``title``, ``$id``, or ``$anchor`` on nested schemas, or use named
+    ``definitions``/``$defs`` entries, to get the most explicit and predictable class names.
+    Schemas with large ``definitions`` blocks that lack these keywords will automatically
+    receive names derived from their definition key.
+
+    For full control over class naming, implement ``ClassNameGeneratorInterface`` and pass it
+    to the generator configuration via
+    `setClassNameGenerator() <../gettingStarted.html#class-name-generator>`__.
 
 Property Name Normalization
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -231,6 +266,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Object\\MaxPropert
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 Additional Properties
 ---------------------
@@ -278,6 +315,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Object\\Additional
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 If invalid additional properties are provided a detailed exception will be thrown containing all violations:
 
@@ -299,6 +338,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Object\\InvalidAdd
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 .. warning::
 
@@ -395,6 +436,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Object\\InvalidPro
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 Dependencies
 ------------
@@ -444,6 +487,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Dependency\\Invali
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 As stated above the dependency declaration is not bidirectional. If the presence of a billing_address shall also require the credit_card property to be required the dependency has to be declared separately:
 
@@ -541,6 +586,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Dependency\\Invali
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 Multiple violations against the schema dependency may be included.
 
@@ -592,6 +639,8 @@ The thrown exception will be a *PHPModelGenerator\\Exception\\Object\\InvalidPat
     public function getPropertyName(): string
     // get the value provided to the property
     public function getProvidedValue()
+    // get the JSON pointer to the schema keyword that rejected the value
+    public function getJsonPointer(): JsonPointer
 
 .. note::
 

docs/source/generic/combinedException.rst

@@ -87,4 +87,11 @@ The exception which will be thrown (combined array-exception and combined-schema
           - Composition element #1: Failed
             * Missing required value for name
             * Invalid type for name. Requires string, got NULL
-          - Composition element #2: Valid
+          - Composition element #2: Valid
+
+.. seealso::
+
+    Each leaf ``ValidationException`` inside a combined exception also exposes a JSON pointer to the
+    schema keyword that rejected the value. See
+    `Collect errors vs. early return <../gettingStarted.html#collect-errors-vs-early-return>`__
+    for details on ``getJsonPointer()``.