Fix CI

Author: wol-soft

src/Model/Validator/PropertyNamesValidator.php

@@ -20,28 +20,26 @@
  *
  * @package PHPModelGenerator\Model\Validator
  */
-class PropertyNamesValidator extends AbstractComposedPropertyValidator
+class PropertyNamesValidator extends PropertyTemplateValidator
 {
     /**
-     * ComposedPropertyValidator constructor.
+     * PropertyNamesValidator constructor.
      *
-     * @param PropertyCollectionProcessor $propertyCollectionProcessor
-     * @param SchemaProcessor             $schemaProcessor
-     * @param Schema                      $schema
-     * @param array                       $propertyNames
+     * @param SchemaProcessor $schemaProcessor
+     * @param Schema          $schema
+     * @param array           $propertyNames
      *
      * @throws FileSystemException
      * @throws SyntaxErrorException
      * @throws UndefinedSymbolException
      * @throws SchemaException
      */
     public function __construct(
-        PropertyCollectionProcessor $propertyCollectionProcessor,
         SchemaProcessor $schemaProcessor,
         Schema $schema,
         array $propertyNames
     ) {
-        $nameValidationProperty = (new StringProcessor($propertyCollectionProcessor, $schemaProcessor, $schema))
+        $nameValidationProperty = (new StringProcessor(new PropertyCollectionProcessor(), $schemaProcessor, $schema))
             ->process('property name', $propertyNames)
             // the property name validator doesn't need type checks or required checks so simply filter them out
             ->filterValidators(function (Validator $validator) {

tests/Basic/PropertyNamesTest.php

@@ -131,7 +131,7 @@ public function invalidPropertyNamesDataProvider(): array
     * property name must not be shorter than 3
   - invalid property '123456'
     * property name must not be longer than 5
-ERROR,
+ERROR
                 ],
                 'pattern violation' => [
                     '{"pattern": "^test[0-9]+$"}',
@@ -149,7 +149,7 @@ public function invalidPropertyNamesDataProvider(): array
     * property name doesn't match pattern ^test[0-9]+$
   - invalid property 'test12w12'
     * property name doesn't match pattern ^test[0-9]+$
-ERROR,
+ERROR
                 ],
                 'multiple violations' => [
                     '{"minLength": 6, "maxLength": 8, "pattern": "^test[0-9]+$"}',
@@ -164,7 +164,7 @@ public function invalidPropertyNamesDataProvider(): array
     * property name doesn't match pattern ^test[0-9]+$
   - invalid property 'test'
     * property name doesn't match pattern ^test[0-9]+$
-ERROR,
+ERROR
                 ],
             ]
         );
@@ -187,7 +187,7 @@ public function invalidCombinedPropertyNamesDataProvider(): array
     * property name doesn't match pattern ^test[0-9]+$
   - invalid property 'test'
     * property name doesn't match pattern ^test[0-9]+$
-ERROR,
+ERROR
             ],
             'Error Collection - multiple violations' => [
                 new GeneratorConfiguration(),
@@ -205,7 +205,7 @@ public function invalidCombinedPropertyNamesDataProvider(): array
   - invalid property 'test'
     * property name doesn't match pattern ^test[0-9]+$
     * property name must not be shorter than 6
-ERROR,
+ERROR
             ],
         ];
     }