minor cs

cycle · Mar 28, 2019 · 85385a0 · 85385a0
1 parent 4fd39d3
commit 85385a0
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/src/Generator/ResolveInterfaces.php b/src/Generator/ResolveInterfaces.php
@@ -46,7 +46,7 @@ protected function compute(Registry $registry, Entity $entity)
             }
 
             $target = $relation->getTarget();
-            if ($registry->hasRole($target)) {
+            if ($registry->hasEntity($target)) {
                 // no need to resolve
                 continue;
             }

diff --git a/src/Registry.php b/src/Registry.php
@@ -61,7 +61,7 @@ public function register(Entity $entity): Registry
      * @param string $role Entity role of class.
      * @return bool
      */
-    public function hasRole(string $role): bool
+    public function hasEntity(string $role): bool
     {
         foreach ($this->entities as $entity) {
             if ($entity->getRole() === $role || $entity->getClass() === $role) {
@@ -72,15 +72,6 @@ public function hasRole(string $role): bool
         return false;
     }
 
-    /**
-     * @param Entity $entity
-     * @return bool
-     */
-    public function hasEntity(Entity $entity): bool
-    {
-        return array_search($entity, $this->entities, true) !== false;
-    }
-
     /**
      * Get entity by it's role.
      *
@@ -118,7 +109,7 @@ public function getIterator()
      */
     public function registerChild(Entity $parent, Entity $child)
     {
-        if (!$this->hasEntity($parent)) {
+        if (!$this->hasInstance($parent)) {
             throw new RegistryException("Undefined entity `{$parent->getRole()}`");
         }
 
@@ -138,7 +129,7 @@ public function registerChild(Entity $parent, Entity $child)
      */
     public function getChildren(Entity $entity): array
     {
-        if (!$this->hasEntity($entity)) {
+        if (!$this->hasInstance($entity)) {
             throw new RegistryException("Undefined entity `{$entity->getRole()}`");
         }
 
@@ -158,7 +149,7 @@ public function getChildren(Entity $entity): array
      */
     public function linkTable(Entity $entity, ?string $database, string $table): Registry
     {
-        if (!$this->hasEntity($entity)) {
+        if (!$this->hasInstance($entity)) {
             throw new RegistryException("Undefined entity `{$entity->getRole()}`");
         }
 
@@ -179,7 +170,7 @@ public function linkTable(Entity $entity, ?string $database, string $table): Reg
      */
     public function hasTable(Entity $entity): bool
     {
-        if (!$this->hasEntity($entity)) {
+        if (!$this->hasInstance($entity)) {
             throw new RegistryException("Undefined entity `{$entity->getRole()}`");
         }
 
@@ -243,7 +234,7 @@ public function getTableSchema(Entity $entity): AbstractTable
      */
     public function registerRelation(Entity $entity, string $name, RelationInterface $relation)
     {
-        if (!$this->hasEntity($entity)) {
+        if (!$this->hasInstance($entity)) {
             throw new RegistryException("Undefined entity `{$entity->getRole()}`");
         }
 
@@ -261,7 +252,7 @@ public function registerRelation(Entity $entity, string $name, RelationInterface
      */
     public function hasRelation(Entity $entity, string $name): bool
     {
-        if (!$this->hasEntity($entity)) {
+        if (!$this->hasInstance($entity)) {
             throw new RegistryException("Undefined entity `{$entity->getRole()}`");
         }
 
@@ -290,10 +281,19 @@ public function getRelation(Entity $entity, string $name): RelationInterface
      */
     public function getRelations(Entity $entity): array
     {
-        if (!$this->hasEntity($entity)) {
+        if (!$this->hasInstance($entity)) {
             throw new RegistryException("Undefined entity `{$entity->getRole()}`");
         }
 
         return $this->relations[$entity];
     }
+
+    /**
+     * @param Entity $entity
+     * @return bool
+     */
+    protected function hasInstance(Entity $entity): bool
+    {
+        return array_search($entity, $this->entities, true) !== false;
+    }
 }
diff --git a/src/Relation/RelationSchema.php b/src/Relation/RelationSchema.php
@@ -71,7 +71,7 @@ public function compute(Registry $registry)
             'source:primaryKey' => $this->getPrimary($registry->getEntity($this->source))
         ]);
 
-        if ($registry->hasRole($this->target)) {
+        if ($registry->hasEntity($this->target)) {
             $this->options = $this->options->withContext([
                 'target:primaryKey' => $this->getPrimary($registry->getEntity($this->target))
             ]);

diff --git a/tests/Schema/RegistryTest.php b/tests/Schema/RegistryTest.php
@@ -27,12 +27,11 @@ public function testHasRole()
 
         $r->register($e);
 
-        $this->assertTrue($r->hasEntity($e));
-        $this->assertTrue($r->hasRole('user'));
-        $this->assertTrue($r->hasRole(User::class));
+        $this->assertTrue($r->hasEntity('user'));
+        $this->assertTrue($r->hasEntity(User::class));
 
-        $this->assertFalse($r->hasRole('post'));
-        $this->assertFalse($r->hasRole(Post::class));
+        $this->assertFalse($r->hasEntity('post'));
+        $this->assertFalse($r->hasEntity(Post::class));
     }
 
     public function testGetEntity()