Merge branch 'feature/34' into develop

Close #34
zendframework · Mar 5, 2018 · ba20d96 · ba20d96
2 parents 334c740 + 5823ced
commit ba20d96
Show file tree

Hide file tree

Showing 32 changed files with 841 additions and 767 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,37 +18,17 @@ env:
 
 matrix:
   include:
-    - php: 5.6
-      env:
-        - DEPS=lowest
-    - php: 5.6
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-    - php: 5.6
-      env:
-        - DEPS=latest
-        - TEST_COVERAGE=true
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-        - CHECK_CS=true
-    - php: 7
-      env:
-        - DEPS=latest
     - php: 7.1
       env:
         - DEPS=lowest
     - php: 7.1
       env:
         - DEPS=locked
+        - CHECK_CS=true
     - php: 7.1
       env:
         - DEPS=latest
+        - TEST_COVERAGE=true
     - php: 7.2
       env:
         - DEPS=lowest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,49 +2,59 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.7.0 - TBD
+## 3.0.0 - TBD
 
 ### Added
 
-- Nothing.
+- [#34](https://github.com/zendframework/zend-permissions-rbac/pull/34) adds
+  checks for circular references in the role hierarchy when using the
+  `Role::addChild()` and `Role::addParent()` methods.
 
 ### Changed
 
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
+- [#34](https://github.com/zendframework/zend-permissions-rbac/pull/34) updates
+  the `Role::addChild(RoleInterface $child)` method to accept only a `RoleInterface` parameter;
+  strings are no longer accepted.
 
-- Nothing.
+- [#34](https://github.com/zendframework/zend-permissions-rbac/pull/34) updates
+  the `Zend\Permissions\Rbac\AssertionInterface`, adding two parameters to the
+  `assert()` definition and defining a return type, so that it now reads as
+  follows:
 
-## 2.6.1 - TBD
+  ```php
+  public function assert(
+      Rbac $rbac,
+      RoleInterface $role,
+      string $permission
+  ) : bool
+  ```
 
-### Added
+### Deprecated
 
 - Nothing.
 
-### Changed
-
-- Nothing.
+### Removed
 
-### Deprecated
+- [#34](https://github.com/zendframework/zend-permissions-rbac/pull/34) removes
+  support for PHP versions prior to 7.1.
 
-- Nothing.
+- [#34](https://github.com/zendframework/zend-permissions-rbac/pull/34) removes
+  the [AbstractIterator](https://github.com/zendframework/zend-permissions-rbac/blob/release-2.6.0/src/AbstractIterator.php)
+  class. The role hierarchy no longer relies on a `RecursiveIterator`.
 
-### Removed
+- [#34](https://github.com/zendframework/zend-permissions-rbac/pull/34) removes
+  the [AbstractRole](https://github.com/zendframework/zend-permissions-rbac/blob/release-2.6.0/src/AbstractRole.php)
+  class. All its functions have been merged to the `Zend\Permissions\Rbac\Role`
+  class.
 
-- Nothing.
+- [#34](https://github.com/zendframework/zend-permissions-rbac/pull/34) removes
+  the method `Role::setParent()`; use `Role::addParent()` instead.
 
 ### Fixed
 
-- Nothing.
+- [#30](https://github.com/zendframework/zend-permissions-rbac/issues/30) fixes
+  circular references within the `Role::addChild()` and `Role::addParent()`
+  algorithms.
 
 ## 2.6.0 - 2018-02-01
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
+Copyright (c) 2005-2018, Zend Technologies USA, Inc.
 
 All rights reserved.
 

diff --git a/README.md b/README.md
@@ -3,7 +3,8 @@
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-permissions-rbac.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-permissions-rbac)
 [![Coverage Status](https://coveralls.io/repos/zendframework/zend-permissions-rbac/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-permissions-rbac?branch=master)
 
-Provides role-based access control (RBAC) permissions management.
+Provides [Role-Based Access Control](https://it.wikipedia.org/wiki/Role-based_access_control)
+(RBAC) permissions management.
 
-- File issues at https://github.com/zendframework/zend-permissions-rbac
-- Documentation is at https://zendframework.github.io/zend-permissions-rbac/
+- File issues at https://github.com/zendframework/zend-permissions-rbac/issues
+- Documentation is at https://docs.zendframework.com/zend-permissions-rbac/
diff --git a/composer.json b/composer.json
@@ -1,10 +1,12 @@
 {
     "name": "zendframework/zend-permissions-rbac",
-    "description": "provides a role-based access control management",
+    "description": "Provides a role-based access control management",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
-        "Rbac"
+        "zendframework",
+        "zend-permssions-rbac",
+        "rbac",
+        "authorization"
     ],
     "homepage": "https://github.com/zendframework/zend-permissions-rbac",
     "autoload": {
@@ -13,7 +15,7 @@
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0"
+        "php": "^7.1"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -29,7 +31,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.15|| ^6.2.1",
+        "phpunit/phpunit": "^7.0.1",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "scripts": {