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

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Krämer committed Dec 10, 2015
2 parents 56d3376 + f3fdee4 commit 337588e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
10 changes: 3 additions & 7 deletions .travis.yml
@@ -1,4 +1,5 @@
language: php
sudo: false

php:
- 5.6
Expand All @@ -15,8 +16,6 @@ matrix:
env:
- COVERALLS=1

fast_finish: true

before_script:
- composer self-update
- composer install --prefer-dist --no-interaction
Expand All @@ -26,10 +25,7 @@ before_script:
script:
- phpunit
- sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then php bin/coveralls -c .coveralls.yml -v; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"

notifications:
slack: world-architects:CEb47sLB0YiVywpTXvRzR9Vc
email: true
recipients:
- travis-ci@world-architects.com
email: false
4 changes: 4 additions & 0 deletions README.md
@@ -1,6 +1,10 @@
Simple RBAC Authorization Adapter for CakePHP
============================================

[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.txt)
[![Build Status](https://img.shields.io/travis/burzum/cakephp-simple-rbac/master.svg?style=flat-square)](https://travis-ci.org/burzum/cakephp-simple-rbac)
[![Coverage Status](https://img.shields.io/coveralls/burzum/cakephp-simple-rbac/master.svg?style=flat-square)](https://coveralls.io/r/burzum/cakephp-simple-rbac)

A simple to use and configure RBAC authorization adapter for CakePHP.

Requirements
Expand Down
3 changes: 0 additions & 3 deletions composer.json
Expand Up @@ -29,8 +29,5 @@
"Cake\\Test\\": "/vendor/cakephp/cakephp/tests",
"Burzum\\SimpleRbac\\Test\\": "tests"
}
},
"scripts": {
"post-autoload-dump": "Cake\\Composer\\Installer\\PluginInstaller::postAutoloadDump"
}
}
2 changes: 1 addition & 1 deletion docs/Installation.md
Expand Up @@ -29,7 +29,7 @@ Load the adapter like any other authorization adapter as well.
$this->loadComponent('Auth', [
'authorize' => [
//'Controller',
'SimpleRbac'
'Burzum.SimpleRbac.SimpleRbac'
]
]);
}
Expand Down
2 changes: 1 addition & 1 deletion docs/RBAC-Configuration.md
@@ -1,7 +1,7 @@
RBAC Configuration
==================

To avoid adding a ton of things into `config/boostrap.php` create a new file `config/rbac.php`.
To avoid adding a ton of things into `config/bootstrap.php` create a new file `config/rbac.php`.

Here is an example of how it could look like:

Expand Down

0 comments on commit 337588e

Please sign in to comment.