Skip to content

php 8 changes in full.php and rbac.php causes issue in function descendants($ID) #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
q-u-o-s-a wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

php 8 changes in full.php and rbac.php causes issue in function descendants($ID) #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f030342
fix: add "vendor" and "composer.lock" in gitignore, add jetbrains ide…
q-u-o-s-a Jul 18, 2024
5bef29d
fix: descendantsConditional parameter order causes descendants($ID) b…
q-u-o-s-a Jul 18, 2024
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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
.settings
.buildpath
.project
.idea
*bak*
*draft*
*phprbac.sqlite3*
*Doxygen*
*phpdoc*
index.php
index.php
vendor
/composer.lock
7 changes: 4 additions & 3 deletions PhpRbac/src/PhpRbac/core/lib/nestedset/full.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,12 @@ function deleteSubtreeConditional($ConditionString,$Rest=null)
* @param boolean $AbsoluteDepths to return Depth of sub-tree from zero or absolutely from the whole tree
* @param string $Condition
* @param string $Rest optional, rest of variables to fill in placeholders of condition string, one variable for each ? in condition
* @return Rowset including Depth field
* @seealso children
* @return Rowset including Depth field
* @seealso children
*/
function descendantsConditional($ConditionString,$Rest=null,$AbsoluteDepths=false)
function descendantsConditional($ConditionString,$AbsoluteDepths=false,$Rest=null)
{
$DepthConcat = "";
if (!$AbsoluteDepths)
$DepthConcat="- (sub_tree.innerDepth )";
$Arguments=func_get_args();
Expand Down
2 changes: 1 addition & 1 deletion PhpRbac/src/PhpRbac/core/lib/rbac.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ function children($ID)
*/
function descendants($ID)
{
$res = $this->{$this->type ()}->descendantsConditional("ID=?", $ID, /* absolute depths*/false);
$res = $this->{$this->type()}->descendantsConditional("ID=?", false, $ID);
$out = array ();
if (is_array ( $res ))
foreach ( $res as $v )
Expand Down