Rafactoring: join factory + generator together

src/DI/ApiExtension.php

@@ -13,8 +13,8 @@
 use Contributte\Api\Router\IRouter;
 use Contributte\Api\Schema\ApiSchema;
 use Contributte\Api\Schema\Builder\SchemaBuilder;
-use Contributte\Api\Schema\Factory\ArrayFactory;
-use Contributte\Api\Schema\Generator\ArrayGenerator;
+use Contributte\Api\Schema\Factory\ArrayHydrator;
+use Contributte\Api\Schema\Generator\ArraySerializator;
 use Contributte\Api\Schema\Validator\Impl\PathValidator;
 use Contributte\Api\Schema\Validator\Impl\RootPathValidator;
 use Contributte\Api\Schema\Validator\SchemaBuilderValidator;
@@ -94,11 +94,11 @@ public function beforeCompile()
 		$this->validateSchema($schemaBuilder);
 
 		// Convert schema to array (for DI)
-		$generator = new ArrayGenerator();
-		$schema = $generator->generate($schemaBuilder);
+		$generator = new ArraySerializator();
+		$schema = $generator->serialize($schemaBuilder);
 
 		$builder->addDefinition($this->prefix('schemaFactory'))
-			->setClass(ArrayFactory::class, [$schema]);
+			->setClass(ArrayHydrator::class, [$schema]);
 
 		$builder->getDefinition($this->prefix('schema'))
 			->setFactory('@' . $this->prefix('schemaFactory') . '::create');

src/Schema/Factory/ArrayFactory.php → src/Schema/Serialization/ArrayHydrator.php

@@ -8,28 +8,18 @@
 use Contributte\Api\Schema\EndpointParameter;
 use Contributte\Api\Schema\SchemaMapping;
 
-final class ArrayFactory implements IFactory
+final class ArrayHydrator implements IHydrator
 {
 
-	/** @var array */
-	private $schema;
-
 	/**
 	 * @param array $schema
-	 */
-	public function __construct(array $schema)
-	{
-		$this->schema = $schema;
-	}
-
-	/**
 	 * @return ApiSchema
 	 */
-	public function create()
+	public function hydrate($schema)
 	{
 		$schema = new ApiSchema();
 
-		foreach ($this->schema as $route) {
+		foreach ($schema as $route) {
 			// @todo replace to EndpointHandler::factory()
 			// move validation inside, make class immutable
 			$handler = new EndpointHandler();

src/Schema/Generator/ArrayGenerator.php → src/Schema/Serialization/ArraySerializator.php

@@ -9,14 +9,14 @@
 use Contributte\Api\Utils\Helpers;
 use Contributte\Api\Utils\Regex;
 
-final class ArrayGenerator implements IGenerator
+final class ArraySerializator implements ISerializator
 {
 
 	/**
 	 * @param SchemaBuilder $builder
 	 * @return array
 	 */
-	public function generate(SchemaBuilder $builder)
+	public function serialize(SchemaBuilder $builder)
 	{
 		$controllers = $builder->getControllers();
 		$schema = [];

src/Schema/Factory/IFactory.php → src/Schema/Serialization/IHydrator.php

@@ -4,12 +4,13 @@
 
 use Contributte\Api\Schema\ApiSchema;
 
-interface IFactory
+interface IHydrator
 {
 
 	/**
+	 * @param mixed $data
 	 * @return ApiSchema
 	 */
-	public function create();
+	public function hydrate($data);
 
 }

src/Schema/Generator/IGenerator.php → src/Schema/Serialization/ISerializator.php

@@ -4,13 +4,13 @@
 
 use Contributte\Api\Schema\Builder\SchemaBuilder;
 
-interface IGenerator
+interface ISerializator
 {
 
 	/**
 	 * @param SchemaBuilder $builder
 	 * @return mixed
 	 */
-	public function generate(SchemaBuilder $builder);
+	public function serialize(SchemaBuilder $builder);
 
 }