Merge pull request #20 from zf-fr/psr4

PSR4
zf-fr · Nov 5, 2015 · 51cff01 · 51cff01
2 parents 63ca2d9 + efcb8c5
commit 51cff01
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 54 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 matrix:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 2.0.0
 
+* Minimum PHP dependency has been raised to 5.5.
 * `PermissionInterface` has been removed from RBAC component. This has been moved to ZfcRbac.
 
 ## 1.2.0

diff --git a/composer.json b/composer.json
@@ -18,21 +18,21 @@
         }
     ],
     "require": {
-        "php": ">=5.4"
+        "php": ">=5.5"
     },
     "require-dev": {
         "zendframework/zend-servicemanager": "~2.2",
         "phpunit/phpunit": "~4.0",
         "squizlabs/php_codesniffer": "1.5.*"
     },
     "autoload": {
-        "psr-0": {
+        "psr-4": {
             "Rbac\\": "src/"
         }
     },
-    "extra": {
-      "branch-alias": {
-        "dev-master": "2.0-dev"
-      }
+    "autoload-dev": {
+        "psr-4": {
+            "RbacTest\\": "tests/"
+        }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit
-    bootstrap="./tests/Bootstrap.php"
+    bootstrap="./vendor/autoload.php"
     colors="true"
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"

diff --git a/src/Rbac/Rbac.php → src/Rbac.php b/src/Rbac/Rbac.php → src/Rbac.php
diff --git a/src/Rbac/Role/HierarchicalRole.php → src/Role/HierarchicalRole.php b/src/Rbac/Role/HierarchicalRole.php → src/Role/HierarchicalRole.php
diff --git a/src/Rbac/Role/HierarchicalRoleInterface.php → src/Role/HierarchicalRoleInterface.php b/src/Rbac/Role/HierarchicalRoleInterface.php → src/Role/HierarchicalRoleInterface.php
diff --git a/src/Rbac/Role/Role.php → src/Role/Role.php b/src/Rbac/Role/Role.php → src/Role/Role.php
diff --git a/src/Rbac/Role/RoleInterface.php → src/Role/RoleInterface.php b/src/Rbac/Role/RoleInterface.php → src/Role/RoleInterface.php
diff --git a/src/Rbac/Traversal/RecursiveRoleIterator.php → src/Traversal/RecursiveRoleIterator.php b/src/Rbac/Traversal/RecursiveRoleIterator.php → src/Traversal/RecursiveRoleIterator.php
diff --git a/.../Traversal/Strategy/GeneratorStrategy.php → src/Traversal/Strategy/GeneratorStrategy.php b/.../Traversal/Strategy/GeneratorStrategy.php → src/Traversal/Strategy/GeneratorStrategy.php
diff --git a/...trategy/RecursiveRoleIteratorStrategy.php → ...trategy/RecursiveRoleIteratorStrategy.php b/...trategy/RecursiveRoleIteratorStrategy.php → ...trategy/RecursiveRoleIteratorStrategy.php
diff --git a/...l/Strategy/TraversalStrategyInterface.php → ...l/Strategy/TraversalStrategyInterface.php b/...l/Strategy/TraversalStrategyInterface.php → ...l/Strategy/TraversalStrategyInterface.php
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
diff --git a/tests/RbacTest/RbacTest.php → tests/RbacTest.php b/tests/RbacTest/RbacTest.php → tests/RbacTest.php
diff --git a/tests/RbacTest/Role/HierarchicalRoleTest.php → tests/Role/HierarchicalRoleTest.php b/tests/RbacTest/Role/HierarchicalRoleTest.php → tests/Role/HierarchicalRoleTest.php
diff --git a/tests/RbacTest/Role/RoleTest.php → tests/Role/RoleTest.php b/tests/RbacTest/Role/RoleTest.php → tests/Role/RoleTest.php
diff --git a/...t/Traversal/RecursiveRoleIteratorTest.php → ...s/Traversal/RecursiveRoleIteratorTest.php b/...t/Traversal/RecursiveRoleIteratorTest.php → ...s/Traversal/RecursiveRoleIteratorTest.php
diff --git a/...versal/Strategy/GeneratorStrategyTest.php → ...versal/Strategy/GeneratorStrategyTest.php b/...versal/Strategy/GeneratorStrategyTest.php → ...versal/Strategy/GeneratorStrategyTest.php
diff --git a/...egy/RecursiveRoleIteratorStrategyTest.php → ...egy/RecursiveRoleIteratorStrategyTest.php b/...egy/RecursiveRoleIteratorStrategyTest.php → ...egy/RecursiveRoleIteratorStrategyTest.php