Removed unreachable exceptions, added test cases for schema exceptions

Author: Enno Woortmann

src/PropertyProcessor/ComposedValueProcessorFactory.php

@@ -38,9 +38,6 @@ public function getProcessor(
         Schema $schema
     ): PropertyProcessorInterface {
         $processor = '\\PHPModelGenerator\\PropertyProcessor\\ComposedValue\\' . ucfirst($type) . 'Processor';
-        if (!class_exists($processor)) {
-            throw new SchemaException("Unsupported composed value type $type");
-        }
 
         return new $processor($propertyMetaDataCollection, $schemaProcessor, $schema, $this->rootLevelComposition);
     }

src/PropertyProcessor/Property/ObjectProcessor.php

@@ -43,16 +43,6 @@ public function process(string $propertyName, JsonSchema $propertySchema): Prope
             $this->schema->getSchemaDictionary()
         );
 
-        if ($schema === null) {
-            throw new SchemaException(
-                sprintf(
-                    'Failed to process schema for object property %s in file %s',
-                    $propertyName,
-                    $propertySchema->getFile()
-                )
-            );
-        }
-
         // if the generated schema is located in a different namespace (the schema for the given structure in
         // $propertySchema is duplicated) add used classes to the current schema. By importing the class which is
         // represented by $schema and by transferring all imports of $schema as well as imports for all properties

tests/ComposedValue/ComposedAllOfTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPModelGenerator\Tests\ComposedValue;
 
+use PHPModelGenerator\Exception\SchemaException;
 use PHPModelGenerator\Exception\ValidationException;
 use PHPModelGenerator\Tests\AbstractPHPModelGeneratorTest;
 use ReflectionMethod;
@@ -447,6 +448,14 @@ public function nestedObjectDataProvider()
         ];
     }
 
+    public function testNoNestedSchemaThrowsAnException(): void
+    {
+        $this->expectException(SchemaException::class);
+        $this->expectExceptionMessage('No nested schema for composed property');
+
+        $this->generateClassFromFile('NoNestedSchema.json');
+    }
+
     /*
         public function testObjectLevelCompositionConditional()
         {

tests/ComposedValue/ComposedIfTest.php

@@ -95,4 +95,12 @@ public function invalidConditionalObjectPropertyDataProvider(): array
             ]
         );
     }
+
+    public function testIncompleteCompositionThrowsAnException(): void
+    {
+        $this->expectException(SchemaException::class);
+        $this->expectExceptionMessage('Incomplete conditional composition for property');
+
+        $this->generateClassFromFile('IncompleteConditional.json');
+    }
 }

tests/Schema/ComposedAllOfTest/NoNestedSchema.json

@@ -0,0 +1,9 @@
+{
+  "type": "object",
+  "allOf": [
+    {
+      "type": "integer",
+      "minimum": 10
+    }
+  ]
+}

tests/Schema/ComposedIfTest/IncompleteConditional.json

@@ -0,0 +1,18 @@
+{
+  "type": "object",
+  "properties": {
+    "country": {
+      "enum": [
+        "USA",
+        "Canada"
+      ]
+    }
+  },
+  "if": {
+    "properties": {
+      "country": {
+        "const": "USA"
+      }
+    }
+  }
+}