Conditions for Guards

[davidwindell]

See #262.

So far this only applies to the RoutePermissionGuard as a proof of concept.

It's a shame that this guard specifically was created with an AND default whereas an OR would have made more sense (like the RouteGuard).

[coveralls]

Coverage decreased (-0.11%) when pulling 1eae206 on davidwindell:issue-262 into 02a5593 on ZF-Commons:master.

[coveralls]

Coverage decreased (-0.11%) when pulling 1c55f88 on davidwindell:issue-262 into 02a5593 on ZF-Commons:master.

[bakura10]

Strict comparison please (===)

[bakura10]

By the way, you are doing the check against condition inside the loop. I think the check can be move out the foreach.

[davidwindell]

Ok, those are done - sorry about the delay.

[coveralls]

Coverage decreased (-0.11%) when pulling be64fe5 on davidwindell:issue-262 into 02a5593 on ZF-Commons:master.

[bakura10]

Tests do not pass, there are three small CS fixes (https://travis-ci.org/ZF-Commons/zfc-rbac/jobs/38596755).

Also, I'll ask you to update the doc too: https://github.com/ZF-Commons/zfc-rbac/blob/master/docs/04.%20Guards.md#routeguard

Once everything is done, I'll merge and tag ;).

[coveralls]

Coverage decreased (-0.21%) when pulling 29b754f on davidwindell:issue-262 into 02a5593 on ZF-Commons:master.

[davidwindell]

There you go sir!

[coveralls]

Coverage decreased (-0.05%) when pulling c4e629d on davidwindell:issue-262 into 02a5593 on ZF-Commons:master.

[davidwindell]

@bakura10 Just noticed this one - can you get it merged now?

[bakura10]

Doc is wrong here :p.

[bakura10]

Hi,

Sorry about this, we should definitely start to merge it :p. @danizord could you have your own quick review please ?

[davidwindell]

Great - we have been using in production for some time now. Works grand.

[bakura10]

Ok, I'm going to merge than Monday if nothing complain about it. Can you remind me if I forget?

[danizord]

No need to align when the value is array

[danizord]

I think you can simplify the logic to something like that:

if (GuardInterface::CONDITION_AND === $condition) {
    foreach ($permissions as $permission) {
        if (!$this->authorizationService->isGranted($permission)) {
            return false;
        }
    }

    return true;
}    

if (GuardInterface::CONDITION_OR === $condition) {
    foreach ($permissions as $permission) {
        if ($this->authorizationService->isGranted($permission)) {
            return true;
        }
    }

    return false;
}    

throw new InvalidArgumentException(sprintf(
    'Condition must be either "AND" or "OR", %s given',
    is_object($condition) ? get_class($condition) : gettype($condition)
));

[bakura10]

I agree with @danizord change, more efficient and way easier to read.

[coveralls]

Coverage decreased (-0.82%) to 93.27% when pulling 41ce33f on davidwindell:issue-262 into 02a5593 on ZF-Commons:master.

[bakura10]

Thanks!

Just a few more CS fixes to make travis happy: https://travis-ci.org/ZF-Commons/zfc-rbac/jobs/56477072

[coveralls]

Coverage decreased (-0.82%) to 93.27% when pulling f56b0b8 on davidwindell:issue-262 into 02a5593 on ZF-Commons:master.

[coveralls]

Coverage decreased (-0.82%) to 93.27% when pulling f56b0b8 on davidwindell:issue-262 into 02a5593 on ZF-Commons:master.

[davidwindell]

👍

[bakura10]

Thanks! I've tagged ZfcRbac as 2.5.0 :).

Hopefully someone will be able to backport this feature for other guards !