Skip to content
This repository was archived by the owner on Jul 3, 2020. It is now read-only.

Added ability to set multiple assertions and their condition for permissions #320

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Added ability to set multiple assertions and their condition for permissions #320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7d5795e
Added ability to set multiple assertions and it's condition for permi…
DavidHavl Jan 4, 2016
9b5d507
Recoded the ability to set multiple assertions and it's condition for…
DavidHavl Oct 25, 2016
01e35ba
Merge remote-tracking branch 'remotes/upstream/master'
DavidHavl Oct 25, 2016
b06275f
Added PSR2 new line to end of file
DavidHavl Oct 25, 2016
0a3e9a7
empty lines are back
DavidHavl Oct 25, 2016
d2a7e27
Ability to define multiple assertions in assertion map simpler way.
DavidHavl Oct 28, 2016
8c6a9c3
PSR2 compliance fix
DavidHavl Oct 28, 2016
311b942
PSR2 compliance fix
DavidHavl Oct 28, 2016
d9a86ad
Adjusted unit tests
DavidHavl Oct 28, 2016
1a30f06
Adjusted unit tests
DavidHavl Oct 28, 2016
c695e41
Added check for valid condition when asserting
DavidHavl Oct 28, 2016
47e17f8
Rewrite of AssertionSet and moved dynamic creation of AssertionSet to…
DavidHavl Oct 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PSR2 compliance fix
  • Loading branch information
@DavidHavl
DavidHavl committed Oct 28, 2016
commit 8c6a9c3c58c2b253b2f369499fe12e65a4173b06
1 change: 0 additions & 1 deletion src/ZfcRbac/Assertion/AssertionSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,5 @@ public function assert(AuthorizationService $authorizationService, $context = nu

return false;
}

}
}
2 changes: 1 addition & 1 deletion src/ZfcRbac/Service/AuthorizationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function setAssertion($permission, $assertion)
}

// retrieve an actual instance from assertion plugin manager if necessary
foreach ($assertion['assertions'] as $key=>$value) {
foreach ($assertion['assertions'] as $key => $value) {
if (is_string($value)) {
$assertion['assertions'][$key] = $this->assertionPluginManager->get($value);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fetching assertions would be better when they are really needed in assert() method in this case AssertionSet::assert()

}
Expand Down