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.

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

[stable12] Only in case of $currentAccess the array uses the id as index #7328

Merged
merged 2 commits into from Nov 28, 2017

Conversation

Projects
None yet
3 participants
@nickvergessen
Member

nickvergessen commented Nov 28, 2017

Backport #7327

nickvergessen added some commits Nov 28, 2017

Fix current access list test and add one for $currentAccess === false
Signed-off-by: Joas Schilling <coding@schilljs.com>
Only in case of $currentAccess the array uses the id as index
Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.

Regression from 3820d68

Signed-off-by: Joas Schilling <coding@schilljs.com>
@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Nov 28, 2017

Codecov Report

Merging #7328 into stable12 will increase coverage by <.01%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             stable12    #7328      +/-   ##
==============================================
+ Coverage       53.86%   53.86%   +<.01%     
- Complexity      22596    22597       +1     
==============================================
  Files            1384     1384              
  Lines           86671    86675       +4     
  Branches         1329     1329              
==============================================
+ Hits            46684    46687       +3     
- Misses          39987    39988       +1
Impacted Files Coverage Δ Complexity Δ
lib/private/Share20/Manager.php 87.12% <100%> (+0.08%) 234 <0> (+1) ⬆️
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)

codecov bot commented Nov 28, 2017

Codecov Report

Merging #7328 into stable12 will increase coverage by <.01%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             stable12    #7328      +/-   ##
==============================================
+ Coverage       53.86%   53.86%   +<.01%     
- Complexity      22596    22597       +1     
==============================================
  Files            1384     1384              
  Lines           86671    86675       +4     
  Branches         1329     1329              
==============================================
+ Hits            46684    46687       +3     
- Misses          39987    39988       +1
Impacted Files Coverage Δ Complexity Δ
lib/private/Share20/Manager.php 87.12% <100%> (+0.08%) 234 <0> (+1) ⬆️
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
@blizzz

blizzz approved these changes Nov 28, 2017

tested, works

@MorrisJobke MorrisJobke merged commit 90feccf into stable12 Nov 28, 2017

3 checks passed

codecov/patch 100% of diff hit (target 53.86%)
Details
codecov/project 53.86% (+<.01%) compared to 036eae6
Details
continuous-integration/drone/pr the build was successful
Details

@MorrisJobke MorrisJobke deleted the backport/7327/access-list-regression-for-not-current-accesss branch Nov 28, 2017

@MorrisJobke MorrisJobke referenced this pull request Nov 28, 2017

Merged

12.0.4 RC3 #7330

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment