From 14b533c9808b42f27672a574c0cd03f251334a33 Mon Sep 17 00:00:00 2001 From: Andrey Utkin Date: Thu, 22 Jan 2015 17:32:26 +0600 Subject: [PATCH] Switch to PSR-4 --- composer.json | 7 +++---- {Rbac => src/Rbac}/IOwned.php | 0 {Rbac => src/Rbac}/IRbacService.php | 0 {Rbac => src/Rbac}/ISubject.php | 0 {Rbac => src/Rbac}/Impl/Memory/RbacService.php | 0 {Rbac => src/Rbac}/Impl/Repository/Dao/DRbacPermission.php | 0 .../Rbac}/Impl/Repository/Dao/DRbacPermissionHierarchy.php | 0 {Rbac => src/Rbac}/Impl/Repository/Dao/DRbacRole.php | 0 .../Rbac}/Impl/Repository/Dao/DRbacRoleHierarchy.php | 0 .../Rbac}/Impl/Repository/Dao/DRbacRolesPermissions.php | 0 {Rbac => src/Rbac}/Impl/Repository/Dao/DRbacUserRoles.php | 0 {Rbac => src/Rbac}/Impl/Repository/IRbacDaoFactory.php | 0 {Rbac => src/Rbac}/Impl/Repository/IRbacService.php | 0 {Rbac => src/Rbac}/Impl/Repository/PermissionFilter.php | 0 {Rbac => src/Rbac}/Impl/Repository/RbacCache.php | 0 {Rbac => src/Rbac}/Impl/Repository/RbacService.php | 0 {Rbac => src/Rbac}/Impl/Repository/RoleFilter.php | 0 {Rbac => src/Rbac}/OwnerPermission.php | 0 {Rbac => src/Rbac}/Permission.php | 0 {Rbac => src/Rbac}/Role.php | 0 20 files changed, 3 insertions(+), 4 deletions(-) rename {Rbac => src/Rbac}/IOwned.php (100%) rename {Rbac => src/Rbac}/IRbacService.php (100%) rename {Rbac => src/Rbac}/ISubject.php (100%) rename {Rbac => src/Rbac}/Impl/Memory/RbacService.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/Dao/DRbacPermission.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/Dao/DRbacPermissionHierarchy.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/Dao/DRbacRole.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/Dao/DRbacRoleHierarchy.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/Dao/DRbacRolesPermissions.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/Dao/DRbacUserRoles.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/IRbacDaoFactory.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/IRbacService.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/PermissionFilter.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/RbacCache.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/RbacService.php (100%) rename {Rbac => src/Rbac}/Impl/Repository/RoleFilter.php (100%) rename {Rbac => src/Rbac}/OwnerPermission.php (100%) rename {Rbac => src/Rbac}/Permission.php (100%) rename {Rbac => src/Rbac}/Role.php (100%) diff --git a/composer.json b/composer.json index 6937f15..fa7036d 100644 --- a/composer.json +++ b/composer.json @@ -9,10 +9,9 @@ "vda/query": "0.11.*|0.12.*", "vda/util": "0.11.*|0.12.*" }, - "autoload": { - "psr-0": { "": "" } - }, - "target-dir": "Vda/Security", + "autoload": { + "psr-4": { "Vda\\Security\\": "src/" } + }, "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/Rbac/IOwned.php b/src/Rbac/IOwned.php similarity index 100% rename from Rbac/IOwned.php rename to src/Rbac/IOwned.php diff --git a/Rbac/IRbacService.php b/src/Rbac/IRbacService.php similarity index 100% rename from Rbac/IRbacService.php rename to src/Rbac/IRbacService.php diff --git a/Rbac/ISubject.php b/src/Rbac/ISubject.php similarity index 100% rename from Rbac/ISubject.php rename to src/Rbac/ISubject.php diff --git a/Rbac/Impl/Memory/RbacService.php b/src/Rbac/Impl/Memory/RbacService.php similarity index 100% rename from Rbac/Impl/Memory/RbacService.php rename to src/Rbac/Impl/Memory/RbacService.php diff --git a/Rbac/Impl/Repository/Dao/DRbacPermission.php b/src/Rbac/Impl/Repository/Dao/DRbacPermission.php similarity index 100% rename from Rbac/Impl/Repository/Dao/DRbacPermission.php rename to src/Rbac/Impl/Repository/Dao/DRbacPermission.php diff --git a/Rbac/Impl/Repository/Dao/DRbacPermissionHierarchy.php b/src/Rbac/Impl/Repository/Dao/DRbacPermissionHierarchy.php similarity index 100% rename from Rbac/Impl/Repository/Dao/DRbacPermissionHierarchy.php rename to src/Rbac/Impl/Repository/Dao/DRbacPermissionHierarchy.php diff --git a/Rbac/Impl/Repository/Dao/DRbacRole.php b/src/Rbac/Impl/Repository/Dao/DRbacRole.php similarity index 100% rename from Rbac/Impl/Repository/Dao/DRbacRole.php rename to src/Rbac/Impl/Repository/Dao/DRbacRole.php diff --git a/Rbac/Impl/Repository/Dao/DRbacRoleHierarchy.php b/src/Rbac/Impl/Repository/Dao/DRbacRoleHierarchy.php similarity index 100% rename from Rbac/Impl/Repository/Dao/DRbacRoleHierarchy.php rename to src/Rbac/Impl/Repository/Dao/DRbacRoleHierarchy.php diff --git a/Rbac/Impl/Repository/Dao/DRbacRolesPermissions.php b/src/Rbac/Impl/Repository/Dao/DRbacRolesPermissions.php similarity index 100% rename from Rbac/Impl/Repository/Dao/DRbacRolesPermissions.php rename to src/Rbac/Impl/Repository/Dao/DRbacRolesPermissions.php diff --git a/Rbac/Impl/Repository/Dao/DRbacUserRoles.php b/src/Rbac/Impl/Repository/Dao/DRbacUserRoles.php similarity index 100% rename from Rbac/Impl/Repository/Dao/DRbacUserRoles.php rename to src/Rbac/Impl/Repository/Dao/DRbacUserRoles.php diff --git a/Rbac/Impl/Repository/IRbacDaoFactory.php b/src/Rbac/Impl/Repository/IRbacDaoFactory.php similarity index 100% rename from Rbac/Impl/Repository/IRbacDaoFactory.php rename to src/Rbac/Impl/Repository/IRbacDaoFactory.php diff --git a/Rbac/Impl/Repository/IRbacService.php b/src/Rbac/Impl/Repository/IRbacService.php similarity index 100% rename from Rbac/Impl/Repository/IRbacService.php rename to src/Rbac/Impl/Repository/IRbacService.php diff --git a/Rbac/Impl/Repository/PermissionFilter.php b/src/Rbac/Impl/Repository/PermissionFilter.php similarity index 100% rename from Rbac/Impl/Repository/PermissionFilter.php rename to src/Rbac/Impl/Repository/PermissionFilter.php diff --git a/Rbac/Impl/Repository/RbacCache.php b/src/Rbac/Impl/Repository/RbacCache.php similarity index 100% rename from Rbac/Impl/Repository/RbacCache.php rename to src/Rbac/Impl/Repository/RbacCache.php diff --git a/Rbac/Impl/Repository/RbacService.php b/src/Rbac/Impl/Repository/RbacService.php similarity index 100% rename from Rbac/Impl/Repository/RbacService.php rename to src/Rbac/Impl/Repository/RbacService.php diff --git a/Rbac/Impl/Repository/RoleFilter.php b/src/Rbac/Impl/Repository/RoleFilter.php similarity index 100% rename from Rbac/Impl/Repository/RoleFilter.php rename to src/Rbac/Impl/Repository/RoleFilter.php diff --git a/Rbac/OwnerPermission.php b/src/Rbac/OwnerPermission.php similarity index 100% rename from Rbac/OwnerPermission.php rename to src/Rbac/OwnerPermission.php diff --git a/Rbac/Permission.php b/src/Rbac/Permission.php similarity index 100% rename from Rbac/Permission.php rename to src/Rbac/Permission.php diff --git a/Rbac/Role.php b/src/Rbac/Role.php similarity index 100% rename from Rbac/Role.php rename to src/Rbac/Role.php