Make some nested class names and variable names more reliable over multiple runs

Author: wol-soft

src/Model/SchemaDefinition/SchemaDefinitionDictionary.php

@@ -180,7 +180,7 @@ protected function parseExternalFile(
 
         // set up a dummy schema to fetch the definitions from the external file
         $schema = new Schema(
-            'ExternalSchema_' . uniqid(),
+            'ExternalSchema',
             '',
             new JsonSchema($jsonSchemaFilePath, $decodedJsonSchema),
             new self(dirname($jsonSchemaFilePath))

src/Model/Validator/ArrayItemValidator.php

@@ -44,8 +44,8 @@ public function __construct(
         JsonSchema $itemStructure,
         PropertyInterface $property
     ) {
-        $this->variableSuffix = '_' . uniqid();
         $nestedPropertyName = "item of array {$property->getName()}";
+        $this->variableSuffix = '_' . md5($nestedPropertyName);
 
         // an item of the array behaves like a nested property to add item-level validation
         $this->nestedProperty = (new PropertyFactory(new PropertyProcessorFactory()))

src/PropertyProcessor/Property/AbstractPropertyProcessor.php

@@ -155,7 +155,7 @@ function ($dependency, $index) use (&$propertyDependency): void {
         $dependencySchema = $this->schemaProcessor->processSchema(
             new JsonSchema($this->schema->getJsonSchema()->getFile(), $dependencies),
             $this->schema->getClassPath(),
-            ucfirst("{$property->getName()}_Dependency_" . uniqid()),
+            "{$this->schema->getClassName()}_{$property->getName()}_Dependency",
             $this->schema->getSchemaDictionary()
         );
 

tests/Basic/SchemaDependencyTest.php

@@ -228,7 +228,7 @@ public function invalidSchemaDependencyCompositionDataProvider(): array
                 ['credit_card' => 12345],
                 <<<ERROR
 Invalid schema which is dependant on credit_card:
-  - Invalid value for Credit_card_Dependency_(.*) declined by composition constraint.
+  - Invalid value for SchemaDependencyTest_\w+_credit_card_Dependency declined by composition constraint.
       Requires to match all composition elements but matched 0 elements.
       - Composition element #1: Failed
         \* Missing required value for name
@@ -242,7 +242,7 @@ public function invalidSchemaDependencyCompositionDataProvider(): array
                 ['credit_card' => 12345, 'age' => 42],
                 <<<ERROR
 Invalid schema which is dependant on credit_card:
-  - Invalid value for Credit_card_Dependency_(.*) declined by composition constraint.
+  - Invalid value for SchemaDependencyTest_\w+_credit_card_Dependency declined by composition constraint.
       Requires to match all composition elements but matched 1 elements.
       - Composition element #1: Failed
         \* Missing required value for name
@@ -255,7 +255,7 @@ public function invalidSchemaDependencyCompositionDataProvider(): array
                 ['credit_card' => 12345, 'name' => false, 'age' => 42],
                 <<<ERROR
 Invalid schema which is dependant on credit_card:
-  - Invalid value for Credit_card_Dependency_(.*) declined by composition constraint.
+  - Invalid value for SchemaDependencyTest_\w+_credit_card_Dependency declined by composition constraint.
       Requires to match all composition elements but matched 1 elements.
       - Composition element #1: Failed
         \* Invalid type for name. Requires string, got boolean