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.

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

Update bundle to support Flysystem v2 #59

Merged
merged 26 commits into from
Jan 17, 2021

Conversation

Lustmored
Copy link
Contributor

I have built upon flysystem-v2 branch and set it as a target as probably such a change will require major version bump.

Most of the work was updating tests to actually run against new architecture. I have commented and removed functionality and adapters that are missing from v2.

I haven't touched docs and didn't add support for any new options as I wanted to get feedback before eventually delving more.

This PR also includes merging master into flysystem-v2 as a base for work.

@tgalopin
Copy link
Member

Thanks a lot @Lustmored !

It seems you should probably rebase on master as the first commits in your PR are newly merged commits.

I'll review this asap :) .

@Lustmored
Copy link
Contributor Author

Thanks a lot @Lustmored !

It seems you should probably rebase on master as the first commits in your PR are newly merged commits.

I'll review this asap :) .

Right! I have force-pushed rebase onto master.

@tgalopin
Copy link
Member

There still seems to be a merge problem, are you sure you rebased properly?

@Lustmored
Copy link
Contributor Author

I am pretty sure. Yet as I've stated - this PR is based on 'flysystem-v2' branch from original repository and targets it. I believe rebase of 'flysystem-v2' branch onto master will fix the conflicts. Alternatively I can target 'master' branch.

@tgalopin
Copy link
Member

Ah right! My bad, I must have badly rebased myself then :) I'll have a look asap (I'm preparing the SymfonyWorld conference right now, kinda busy but I'll have more time later :) )

@Lustmored Lustmored changed the base branch from flysystem-v2 to master December 10, 2020 13:22
@Lustmored
Copy link
Contributor Author

I have changed PR target to master for easier review and merge.

I have also updated docs and re-added cached storage driver based on lustmored/flysystem-v2-simple-cache-adapter for easier upgrade path with useful, yet lighter, cached filesystem driver. If you'd prefer I don't just let me know and I will drop that part from the PR :)

@tgalopin
Copy link
Member

Thanks for the ping, I'll have a look :)

@Lustmored
Copy link
Contributor Author

@tgalopin Just a friendly remainder, no pressure intended :)

I've found out my commits authoring was off, so fixed it and force pushed. No changes in code this time.

Copy link
Member

@tgalopin tgalopin left a comment

Choose a reason for hiding this comment

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

Hi!

Thanks for the friendly ping :) . Here is a review. Also, you should rebase your branch on master to get the latest CI fixes.

More generally: I would find it useful to keep Azure and Google Cloud support. Are there credible community alternatives for Flysytem 2?

composer.json Outdated
"league/flysystem-ziparchive": "^1.0",
"league/flysystem-aws-s3-v3": "^2.0",
"league/flysystem-memory": "^2.0",
"lustmored/flysystem-v2-simple-cache-adapter": "^0.1.0",
Copy link
Member

Choose a reason for hiding this comment

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

There is no cache adapter anymore? Perhaps would it make sense to remove the adapter then?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is no upstream adapter for v2 and there seems to be no work towards it. V1 adapter also was very memory inefficient (https://github.com/thephpleague/flysystem-cached-adapter/issues/23). That is why I have created this simple alternative for v2, which is very helpful in my projects already, so I think it can be helpful for others too.

But of course if you feel like dropping it from the bundle, I can do so.

Copy link
Member

Choose a reason for hiding this comment

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

Let's drop it for now, we'll add it if someone find it useful (not sure it is)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, I have removed it from code and docs

@Lustmored
Copy link
Contributor Author

I have updated PR with Google Cloud support, rebase to master and changes requested in comments

@tgalopin
Copy link
Member

tgalopin commented Jan 7, 2021

Thanks so much @Lustmored ! I'll have a look later today but thanks for your work :) !

@nCrazed
Copy link

nCrazed commented Jan 13, 2021

@Lustmored, @tgalopin is there anything that you're missing, could use some help with here?

I was planning to add flysystem to an existing Symfony project, but decided to postpone until this bundle starts can support V2. I am happy to put in some work in order to speed it up

@Lustmored
Copy link
Contributor Author

@Lustmored, @tgalopin is there anything that you're missing, could use some help with here?

I was planning to add flysystem to an existing Symfony project, but decided to postpone until this bundle starts can support V2. I am happy to put in some work in order to speed it up

We have to wait until @tgalopin has time to take another look and possibly merge and release

@tgalopin tgalopin merged commit 2da43e8 into thephpleague:master Jan 17, 2021
@tgalopin
Copy link
Member

Thanks so much for your work @Lustmored ! I'll release 2.0 soon.

Copy link
Member

@tgalopin tgalopin left a comment

Choose a reason for hiding this comment

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

A bit late, I agree, but I just realized a few things

@tgalopin
Copy link
Member

Released

@nCrazed could you test to ensure everything is good on your side :) ? I tested on my projects but more tests can't hurt.

@nCrazed
Copy link

nCrazed commented Jan 17, 2021

I am planning to start the refactoring/integration next week. Will report any problems that I run into.

@Lustmored
Copy link
Contributor Author

@tgalopin @nCrazed if any issues arise I am more than willing to help tackling them. Please mention me in any issue related to this and I will gladly help.

@tgalopin
Copy link
Member

Thanks @Lustmored, really appreciate the help!

@nspyke
Copy link
Contributor

nspyke commented Aug 21, 2022

Hi @tgalopin, @Lustmored
I'm currently using this bundle and the AWS adapter. I need to move my app to Azure. Would it be possible to reinstate Azure Blob storage support?
It didn't take long, so I've submitted a PR #112

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants