From 35da969a78cdebe7ab6bffdacf8ae77e7c8c1e38 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 1 Mar 2017 09:47:36 -0500
Subject: [PATCH] Update ZFC-RBAC
---
composer.json | 2 +-
composer.lock | 37 ++++++++++++++++++++++---------------
2 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/composer.json b/composer.json
index 0a5c46c03e9..cfb63fef105 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,7 @@
"zendframework/zendrest": "2.0.2",
"zendframework/zendservice-amazon": "2.0.4",
"zendframework/zendservice-recaptcha": "3.0.0",
- "zf-commons/zfc-rbac": "2.5.3"
+ "zf-commons/zfc-rbac": "2.6.2"
},
"require-dev": {
"behat/mink": "1.7.1",
diff --git a/composer.lock b/composer.lock
index 49d576bac24..14f842cc247 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "c58e0a6b27cb8bcd77131ff7f1d89f48",
+ "content-hash": "cd9411d1614974599d1e3c309e85ea7f",
"packages": [
{
"name": "aferrandini/phpqrcode",
@@ -3725,33 +3725,40 @@
},
{
"name": "zf-commons/zfc-rbac",
- "version": "v2.5.3",
+ "version": "v2.6.2",
"source": {
"type": "git",
"url": "https://github.com/ZF-Commons/zfc-rbac.git",
- "reference": "64b9318217cee56ed6ea3dc13a8ca7c949585579"
+ "reference": "48df720a3670dbc36d57bf98f8e1827206431656"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ZF-Commons/zfc-rbac/zipball/64b9318217cee56ed6ea3dc13a8ca7c949585579",
- "reference": "64b9318217cee56ed6ea3dc13a8ca7c949585579",
+ "url": "https://api.github.com/repos/ZF-Commons/zfc-rbac/zipball/48df720a3670dbc36d57bf98f8e1827206431656",
+ "reference": "48df720a3670dbc36d57bf98f8e1827206431656",
"shasum": ""
},
"require": {
- "php": ">=5.4",
- "zendframework/zend-mvc": "~2.2",
- "zendframework/zend-servicemanager": "~2.2",
+ "php": "~5.6 || ~7.0",
+ "zendframework/zend-config": "~2.2",
+ "zendframework/zend-eventmanager": "^2.6.3 || ^3.0",
+ "zendframework/zend-mvc": "~2.7 || ^3.0",
+ "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
"zfr/rbac": "~1.2"
},
"require-dev": {
"doctrine/common": "~2.4",
- "doctrine/doctrine-module": "~0.8",
- "doctrine/doctrine-orm-module": "~0.8",
- "phpunit/phpunit": "~3.7",
+ "doctrine/doctrine-module": "~1.1",
+ "doctrine/doctrine-orm-module": "^1.0",
+ "phpunit/phpunit": "~4.8.26",
"satooshi/php-coveralls": "~0.6",
- "squizlabs/php_codesniffer": "1.4.*",
- "zendframework/zend-developer-tools": "dev-master",
- "zendframework/zendframework": "~2.2"
+ "squizlabs/php_codesniffer": "2.6.*",
+ "zendframework/zend-authentication": "~2.2",
+ "zendframework/zend-developer-tools": "~1.1",
+ "zendframework/zend-http": "~2.2",
+ "zendframework/zend-i18n": "~2.7.3",
+ "zendframework/zend-log": "~2.2",
+ "zendframework/zend-serializer": "~2.2",
+ "zendframework/zend-view": "~2.2"
},
"suggest": {
"doctrine/doctrine-module": "if you want to use Doctrine role provider",
@@ -3797,7 +3804,7 @@
"rbac",
"zf2"
],
- "time": "2015-09-09T03:15:04+00:00"
+ "time": "2016-10-26T14:05:28+00:00"
},
{
"name": "zfr/rbac",
--
GitLab