Skip to content
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

Jump to bottom

Port isTargetAllowed to share 2.0 #26615

Merged
merged 1 commit into from
Nov 29, 2016
Merged

Port isTargetAllowed to share 2.0 #26615

merged 1 commit into from
Nov 29, 2016

Conversation

PVince81
Copy link
Contributor

Description

  • move isTargetAllowed to SharedMount and return false in moveMount
  • replace getItemShared() call with ShareManager->getSharesByPath()
  • implement ShareManager->getSharesByPath() by calling the provider

Related Issue

#22209 (comment)

Motivation and Context

Get rid of calls to old share API.

How Has This Been Tested?

TODO: explain

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Tech debt

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

TODOs

  • move tests for isTargetAllowed to the tests for SharedMount
  • fix unit tests
  • see FIXME in code

@PVince81 PVince81 added this to the 9.2 milestone Nov 11, 2016
@mention-bot
Copy link

@PVince81, thanks for your PR! By analyzing the history of the files in this pull request, we identified @schiessle, @icewind1991 and @rullzer to be potential reviewers.

This was referenced Nov 11, 2016
Closed
Merged
@PVince81 PVince81 force-pushed the share20-istargetallowed branch from 10f4199 to a350674 Compare November 14, 2016 12:22
@PVince81
Copy link
Contributor Author

PVince81 commented Nov 14, 2016 •
edited
Loading

I could of course modify the test to use a View again...

@PVince81 PVince81 mentioned this pull request Nov 14, 2016
Merged
10 tasks
@PVince81 PVince81 force-pushed the share20-istargetallowed branch from a350674 to 9618fb1 Compare November 25, 2016 08:51
@PVince81
Copy link
Contributor Author

Rebased and adjusted test.

Please review @jvillafanez @VicDeo

jvillafanez
jvillafanez reviewed Nov 25, 2016
View reviewed changes
lib/private/Files/View.php
* @return boolean
*/
private function isTargetAllowed($target) {
private function isTargetAllowed(MoveableMount $mount1, $target) {
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure if we should rename this method (or the one in the Mount class) or not. I got confused with both.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I could give that one here another name and keep MoveableMount::isTargetAllowed(), might remove confusion.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

renamed to "canMove()" now

lib/private/Share20/Manager.php
}

// in most cases it's the same provider
if ($providers[0] === $providers[1]) {
Copy link
Member

Choose a reason for hiding this comment

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

use array_unique or something similar instead?. It might won't happen, but if at some point we get 3 or more providers this will give trouble.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Boo, array_unique only works for strings, PHP tries to convert these to strings.

I'll try and do it differently using provider id as keys

@PVince81 PVince81 force-pushed the share20-istargetallowed branch from 9618fb1 to 4b211a2 Compare November 25, 2016 13:57
@PVince81
Copy link
Contributor Author

Adjusted and squashed.

I also added a test for getSharesByPath after realizing that there wasn't one.

@jvillafanez rereview ?

@jvillafanez
Copy link
Member

Changes look good 👍

@PVince81 PVince81 force-pushed the share20-istargetallowed branch from 4b211a2 to ec780cd Compare November 29, 2016 12:07
@PVince81 PVince81 merged commit bebf120 into master Nov 29, 2016
@PVince81 PVince81 deleted the share20-istargetallowed branch November 29, 2016 17:36
@LukasReschke LukasReschke mentioned this pull request Dec 23, 2016
Closed
@lock
Copy link

lock bot commented Aug 4, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 4, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jvillafanez jvillafanez jvillafanez left review comments

Assignees
No one assigned
Labels
4 - To release feature:sharing
Projects
None yet
Milestone
10.0
Development

Successfully merging this pull request may close these issues.
3 participants
@PVince81 @mention-bot @jvillafanez