Merge pull request #19 from SerafimArts/master

Change schema direct accessing to scheme getter.

src/ORM.php

@@ -63,11 +63,11 @@ final class ORM implements ORMInterface
      */
     public function __construct(FactoryInterface $factory, SchemaInterface $schema = null)
     {
-        $this->generator = new CommandGenerator();
         $this->factory = $factory;
-        $this->schema = $schema;
+        $this->schema = $schema ?? new Schema([]);
 
         $this->heap = new Heap();
+        $this->generator = new CommandGenerator();
     }
 
     /**
@@ -134,7 +134,7 @@ public function make(string $role, array $data = [], int $node = Node::NEW)
         }
 
         // init entity class and prepared (typecasted) data
-        list($e, $prepared) = $m->init($data);
+        [$e, $prepared] = $m->init($data);
 
         $node = new Node($node, $prepared, $m->getRole());
 
@@ -179,10 +179,6 @@ public function withSchema(SchemaInterface $schema): ORMInterface
      */
     public function getSchema(): SchemaInterface
     {
-        if (is_null($this->schema)) {
-            throw new ORMException("ORM is not configured, schema is missing");
-        }
-
         return $this->schema;
     }
 

src/Schema.php

@@ -28,7 +28,7 @@ final class Schema implements SchemaInterface
     public function __construct(array $schema)
     {
         // split into two?
-        list($this->schema, $this->aliases) = $this->normalize($schema);
+        [$this->schema, $this->aliases] = $this->normalize($schema);
     }
 
     /**
@@ -60,7 +60,8 @@ public function defines(string $role): bool
      */
     public function define(string $role, int $property)
     {
-        $role = $this->resolveAlias($role);
+        $role = $this->resolveAlias($role) ?? $role;
+
         if (!isset($this->schema[$role])) {
             throw new SchemaException("Undefined schema `{$role}`, not found");
         }
@@ -178,4 +179,4 @@ private function normalizeRelations(array $relations, array $aliases): \Generato
             yield $name => $rel;
         }
     }
-}
+}