Revert "Added VirtualResource"

This reverts commit 808d06d.
myclabs · Jul 1, 2014 · 1180bee · 1180bee
1 parent f19ae05
commit 1180bee
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 151 deletions.
diff --git a/src/Model/ClassResource.php b/src/Model/ClassResource.php
@@ -9,7 +9,7 @@
  *
  * @author Matthieu Napoli <matthieu@mnapoli.fr>
  */
-class ClassResource implements ResourceInterface, CascadingResource
+final class ClassResource implements ResourceInterface, CascadingResource
 {
     /**
      * @var string

diff --git a/src/Model/VirtualResource.php b/src/Model/VirtualResource.php
diff --git a/tests/Integration/AbstractIntegrationTest.php b/tests/Integration/AbstractIntegrationTest.php
@@ -12,7 +12,6 @@
 use MyCLabs\ACL\ACL;
 use MyCLabs\ACL\Doctrine\ACLSetup;
 use MyCLabs\ACL\Model\ClassResource;
-use MyCLabs\ACL\Model\VirtualResource;
 use Tests\MyCLabs\ACL\Integration\Model\Actions;
 
 abstract class AbstractIntegrationTest extends \PHPUnit_Framework_TestCase
@@ -94,11 +93,7 @@ private function configureACL()
             'AccountAdmin' => [
                 'resourceType' => Issues\Issue10\Account::class,
                 'actions' => Actions::all()
-            ],
-            'BackendAdmin' => [
-                'resource' => new VirtualResource('backend'),
-                'actions' => new Actions([Actions::VIEW]),
-            ],
+            ]
         ];
 
         $setup->registerRoles($roles, $this->acl);

diff --git a/tests/Integration/ClassResourceTest.php → tests/Integration/ClassScopeTest.php b/tests/Integration/ClassResourceTest.php → tests/Integration/ClassScopeTest.php
@@ -8,11 +8,11 @@
 use Tests\MyCLabs\ACL\Integration\Model\User;
 
 /**
- * Tests authorizations applied on class resources (i.e. all entities of type X).
+ * Tests authorizations applied at class scope (i.e. all entities of type X).
  *
  * @coversNothing
  */
-class ClassResourceTest extends AbstractIntegrationTest
+class ClassScopeTest extends AbstractIntegrationTest
 {
     /**
      * Check when adding the role and all entities are already created and flushed

diff --git a/tests/Integration/VirtualResourceTest.php b/tests/Integration/VirtualResourceTest.php
diff --git a/tests/Unit/Model/ClassResourceTest.php b/tests/Unit/Model/ClassResourceTest.php
@@ -18,14 +18,6 @@ public function testGetClass()
         $this->assertEquals('foo', $resource->getClass());
     }
 
-    public function testGetResourceId()
-    {
-        $resource = new ClassResource('foo');
-
-        $this->assertEquals('foo', $resource->getResourceId()->getName());
-        $this->assertNull($resource->getResourceId()->getId());
-    }
-
     public function testParentResources()
     {
         $em = $this->getMock(EntityManager::class, [], [], '', false);

diff --git a/tests/Unit/Model/VirtualResourceTest.php b/tests/Unit/Model/VirtualResourceTest.php