Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop' of git://github.com/zendframework/zf2 into string
Browse files Browse the repository at this point in the history
  • Loading branch information
Show file tree
Hide file tree
Showing 20 changed files with 3,146 additions and 8 deletions.
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "zendframework/zend-permissions-acl",
"description": "Zend\\Permissions\\Acl component",
"description": "provides a lightweight and flexible access control list (ACL) implementation for privileges management",
"license": "BSD-3-Clause",
"keywords": [
"zf2",
"permissions-acl"
"acl"
],
"homepage": "https://github.com/zendframework/zend-permissions-acl",
"autoload": {
Expand All @@ -13,7 +13,7 @@
}
},
"require": {
"php": ">=5.3.23"
"php": ">=5.3.3"
},
"suggest": {
"zendframework/zend-servicemanager": "To support Zend\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage"
Expand All @@ -24,14 +24,14 @@
"dev-develop": "2.5-dev"
}
},
"require-dev": {
"fabpot/php-cs-fixer": "1.7.*",
"satooshi/php-coveralls": "dev-master",
"phpunit/PHPUnit": "~4.0"
},
"autoload-dev": {
"psr-4": {
"ZendTest\\Permissions\\Acl\\": "test/"
}
},
"require-dev": {
"fabpot/php-cs-fixer": "1.7.*",
"satooshi/php-coveralls": "dev-master",
"phpunit/PHPUnit": "~4.0"
}
}
Loading

0 comments on commit 446a94e

Please sign in to comment.