From 9ecd0ddc5852241d7058b1f99d879fd52814e04d Mon Sep 17 00:00:00 2001
From: Vassyli <basilius.sauter@gmail.com>
Date: Mon, 2 Jan 2017 16:15:09 +0100
Subject: [PATCH] Applied suggested changes

---
 src/Models/Actor.php                                 |  6 +++---
 src/PermissionManager.php                            | 12 ++++++------
 tests/Managers/PermissionManagerTest.php             |  4 ++--
 tests/ModelTestCase.php                              |  2 +-
 tests/{Ressources => Resources}/TestModels/User.php  |  0
 .../TestModels/UserPermissionAssociation.php         |  0
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename tests/{Ressources => Resources}/TestModels/User.php (100%)
 rename tests/{Ressources => Resources}/TestModels/UserPermissionAssociation.php (100%)

diff --git a/src/Models/Actor.php b/src/Models/Actor.php
index 68ce428..7a7eb7e 100644
--- a/src/Models/Actor.php
+++ b/src/Models/Actor.php
@@ -42,7 +42,7 @@ abstract class Actor
      * @param string $permissionId
      * @return bool
      */
-    public function hasPermission(string $permissionId): bool
+    public function hasPermissionSet(string $permissionId): bool
     {
         $this->loadPermissions();
 
@@ -86,7 +86,7 @@ abstract class Actor
     {
         $this->loadPermissions();
 
-        if ($this->hasPermission($permission->getId())) {
+        if ($this->hasPermissionSet($permission->getId())) {
             $permissionId = $permission->getId();
             throw new PermissionAlreadyExistsException("The permission with the id {$permissionId} has already been set on this actor.");
         } else {
@@ -106,7 +106,7 @@ abstract class Actor
     {
         $this->loadPermissions();
 
-        if ($this->hasPermission($permissionId)) {
+        if ($this->hasPermissionSet($permissionId)) {
             $permissionAssoc = $this->getPermission($permissionId);
             $this->permissions->removeElement($permissionAssoc);
             unset($this->_permissions[$permissionId]);
diff --git a/src/PermissionManager.php b/src/PermissionManager.php
index 5079f66..92950e3 100644
--- a/src/PermissionManager.php
+++ b/src/PermissionManager.php
@@ -65,7 +65,7 @@ class PermissionManager
         Actor $actor,
         string $permissionId
     ): bool {
-        if ($actor->hasPermission($permissionId)) {
+        if ($actor->hasPermissionSet($permissionId)) {
             return true;
         } else {
             return false;
@@ -82,7 +82,7 @@ class PermissionManager
         Actor $actor,
         string $permissionId
     ): bool {
-        if ($actor->hasPermission($permissionId)) {
+        if ($actor->hasPermissionSet($permissionId)) {
             return $actor->getPermission($permissionId)->checkState(static::Allowed);
         } else {
             return false;
@@ -99,7 +99,7 @@ class PermissionManager
         Actor $actor,
         string $permissionId
     ): bool {
-        if ($actor->hasPermission($permissionId)) {
+        if ($actor->hasPermissionSet($permissionId)) {
             return $actor->getPermission($permissionId)->checkState(static::Denied);
         } else {
             return false;
@@ -133,7 +133,7 @@ class PermissionManager
         Actor $actor,
         string $permissionId
     ) {
-        if ($actor->hasPermission($permissionId)) {
+        if ($actor->hasPermissionSet($permissionId)) {
             if ($this->isAllowed($actor, $permissionId) == false) {
                 $permission = $actor->getPermission($permissionId);
                 $permission->setState(static::Allowed);
@@ -159,7 +159,7 @@ class PermissionManager
         Actor $actor,
         string $permissionId
     ) {
-        if ($actor->hasPermission($permissionId)) {
+        if ($actor->hasPermissionSet($permissionId)) {
             if ($this->isDenied($actor, $permissionId) == false) {
                 $permission = $actor->getPermission($permissionId);
                 $permission->setState(static::Denied);
@@ -185,7 +185,7 @@ class PermissionManager
         Actor $actor,
         string $permissionId
     ) {
-        if ($actor->hasPermission($permissionId)) {
+        if ($actor->hasPermissionSet($permissionId)) {
             $permissionAssoc = $actor->getPermission($permissionId);
             $actor->removePermission($permissionId);
 
diff --git a/tests/Managers/PermissionManagerTest.php b/tests/Managers/PermissionManagerTest.php
index cd8181e..721aa50 100644
--- a/tests/Managers/PermissionManagerTest.php
+++ b/tests/Managers/PermissionManagerTest.php
@@ -41,8 +41,8 @@ class PermissionManagerTest extends CoreModelTestCase
         $em = $this->getEntityManager();
         $user = $em->getRepository(User::class)->find(1);
 
-        $this->assertTrue($user->hasPermission("test/permission_one"));
-        $this->assertTrue($user->hasPermission("test/permission_two"));
+        $this->assertTrue($user->hasPermissionSet("test/permission_one"));
+        $this->assertTrue($user->hasPermissionSet("test/permission_two"));
     }
 
     public function testUserReturnsPermission()
diff --git a/tests/ModelTestCase.php b/tests/ModelTestCase.php
index 9f605b1..e5e2c6a 100644
--- a/tests/ModelTestCase.php
+++ b/tests/ModelTestCase.php
@@ -47,7 +47,7 @@ abstract class ModelTestCase extends \PHPUnit_Extensions_Database_TestCase
                 $libraryConfigurationManager = new LibraryConfigurationManager($composerManager, getcwd());
                 $directories = $libraryConfigurationManager->getEntityDirectories();
                 $directories[] = implode(DIRECTORY_SEPARATOR, [__DIR__, '..', 'src', 'Models']);
-                $directories[] = implode(DIRECTORY_SEPARATOR, [__DIR__, 'Ressources', 'TestModels']);
+                $directories[] = implode(DIRECTORY_SEPARATOR, [__DIR__, 'Resources', 'TestModels']);
 
                 // Read db annotations from model files
                 $configuration = Setup::createAnnotationMetadataConfiguration($directories, true);
diff --git a/tests/Ressources/TestModels/User.php b/tests/Resources/TestModels/User.php
similarity index 100%
rename from tests/Ressources/TestModels/User.php
rename to tests/Resources/TestModels/User.php
diff --git a/tests/Ressources/TestModels/UserPermissionAssociation.php b/tests/Resources/TestModels/UserPermissionAssociation.php
similarity index 100%
rename from tests/Ressources/TestModels/UserPermissionAssociation.php
rename to tests/Resources/TestModels/UserPermissionAssociation.php