The class name is Movie NOT Movies

[oparoz]

No description provided.

[ghost]

Thanks a lot for your contribution! Contributions to the core repo require a signed contributors agreement http://owncloud.org/contribute/agreement/ Alternatively you can add a comment here stating that this contribution is MIT licensed. Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

[oparoz]

This contribution is MIT licensed

[nickvergessen]

The problem here is even worse, the class name does not match the file name.
I think we should fix the class name instead.

I checked the code and the class name only appears in the class file, so change it there.

[MorrisJobke]

@nickvergessen We can also fix the file name

[nickvergessen]

yeah would also make sense since all others are singulars... so dont care too much, either fix the class name, or fix the docs and the file name

[MorrisJobke]

I would vote for the rename of the file. @oparoz Can you add the rename of the file into this PR? Thanks

[LukasReschke]

@owncloud-bot This is okay to test.

[oparoz]

That should be it. Let me know if I've forgotten something...

[nickvergessen]

Mind squashing all commits together?
If you don't know what squashing means, either jump on irc: freenode #owncloud-dev or say it here, then someone else can try to do it for you.

[MorrisJobke]

👍

[nickvergessen]

Now you messed up the file rename and duplicated the file instead.

[oparoz]

@nickvergessen - Well, that's the way "Github for Windows" does it. The change said "renamed", but then a new file is created during the git push --force and the old one is left behind and has to be deleted in another commit.

Updating 284ba5b..cc26d50
Fast-forward
 config/config.sample.php                      | 2 +-
 lib/private/preview.php                       | 4 ++--
 lib/private/preview/{movies.php => movie.php} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/private/preview/{movies.php => movie.php} (100%)

[ghost]

Thanks a lot for your contribution! Contributions to the core repo require a signed contributors agreement http://owncloud.org/contribute/agreement/ Alternatively you can add a comment here stating that this contribution is MIT licensed. Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

[MorrisJobke]

@owncloud-bot this is okay to test

[nickvergessen]

@MorrisJobke this needs to be squashed again, otherwise the history of movie.php is lost, which is easily avoidable.

[oparoz]

After an upgrade, GFW was able to do it all in one step \o/

[nickvergessen]

Can't really test this on windows, because movie is disabled.
But from the code it looks okay: 👍

[MorrisJobke]

@owncloud-bot this is okay to test

[MorrisJobke]

@DeepDiver1975 Jenkins refuses to test this 😠

[nickvergessen]

@MorrisJobke that is because it cant be merged.
Needs a rebase

[MorrisJobke]

This wasn't the case when I wrote this

[oparoz]

Could be because of other patches against the Movie class which gets renamed in this one

[MorrisJobke]

@oparoz Can I ask you to rebase this on current master and fix the merge conflict?

[oparoz]

@MorrisJobke - Done

[MorrisJobke]

@owncloud-bot retest this please

[scrutinizer-notifier]

The inspection completed: No new issues

[ghost]

🚀 Test PASSed. 🚀
Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/3215/
🚀 Test PASSed. 🚀

[ghost]

Hi,

backporting this to OC7 could fix #14316

[oparoz]

@MorrisJobke - Backport?

[karlitschek]

@MorrisJobke Can you backport?

[nickvergessen]

Will take care of it later