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

Array indentation #11695

Merged
merged 13 commits into from Dec 13, 2018

Conversation

@MathiasReker
Copy link
Contributor

MathiasReker commented Dec 11, 2018

Questions Answers
Branch? develop
Description? /
Type? improvement
Category? CO
BC breaks? Does it break backward compatibility? no
Deprecations? Does it deprecate an existing feature? no
Fixed ticket? /
How to test? /

This change is Reviewable

@jolelievre
Copy link
Contributor

jolelievre left a comment

thanks @MathiasReker
so much more pleasurable to read
just a few comments though, then it's perfect ;)

Show resolved Hide resolved classes/PaymentModule.php Outdated
Show resolved Hide resolved classes/Product.php
Show resolved Hide resolved classes/controller/AdminController.php Outdated
Show resolved Hide resolved classes/stock/StockAvailable.php
Show resolved Hide resolved controllers/admin/AdminCmsController.php Outdated
Show resolved Hide resolved tests-legacy/resources/ModulesOverrideInstallUninstallTest/Cart.php Outdated
Show resolved Hide resolved tests-legacy/resources/module/pscsx3241/override/classes/Cart.php Outdated
Show resolved Hide resolved ...module/pscsx32412/override/controllers/admin/AdminProductsController.php Outdated
Show resolved Hide resolved ...module/pscsx32412/override/controllers/admin/AdminProductsController.php Outdated
Show resolved Hide resolved ...module/pscsx32412/override/controllers/admin/AdminProductsController.php Outdated
@MathiasReker

This comment has been minimized.

Copy link
Contributor

MathiasReker commented Dec 11, 2018

@jolelievre I agree with you, but the reason why I did not fix this from the beginning was that I would introduce an update to PHP CS fixer and this PR is 'array_indentation' => true'

Your suggestion could be fixed with other PHP CS fixer rules :)

Do you still want me to fix your suggestions or should I wait to not confuse #11718?

@MathiasReker

This comment has been minimized.

Copy link
Contributor

MathiasReker commented Dec 11, 2018

@LouiseBonnard No change to wording :)

@jolelievre

This comment has been minimized.

Copy link
Contributor

jolelievre commented Dec 11, 2018

@MathiasReker ok for the update of php-cs-fixer but then you will have to integrate the PR #11718 with the cs fixes in the code, if you think this will fix all my comments then I can approve this PR

@MathiasReker

This comment has been minimized.

Copy link
Contributor

MathiasReker commented Dec 11, 2018

@jolelievre unfortunately I will have to run the script on the root folder to fix your suggestions. I think that it is too many changes since this CS lacks more places. I will fix your suggestions in this PR since it is OK for you :)

@jolelievre

This comment has been minimized.

Copy link
Contributor

jolelievre commented Dec 11, 2018

I'm not sure of what you suggested in the end, "this" is confusing :P
do you fix the comments in this PR (#11695) or in the next one with the config (#11718)?

@MathiasReker

This comment has been minimized.

Copy link
Contributor

MathiasReker commented Dec 11, 2018

I fix them in this PR :)

MathiasReker added some commits Dec 11, 2018

@MathiasReker

This comment has been minimized.

Copy link
Contributor

MathiasReker commented Dec 12, 2018

@jolelievre is it OK for now? please check. I don't want to make this PR anymore bigger. I can add ); (still missing some places) to new line in another PR, I need some time to prepare a script for that.

EDIT: Here you go :trollface:

MathiasReker added some commits Dec 12, 2018

@jolelievre

This comment has been minimized.

Copy link
Contributor

jolelievre commented Dec 12, 2018

thank you @MathiasReker yeah I think it's enough ^^

@jolelievre

This comment has been minimized.

Copy link
Contributor

jolelievre commented Dec 12, 2018

@PierreRambaud can you merge this one when Codacy is over please?

@jolelievre

This comment has been minimized.

Copy link
Contributor

jolelievre commented Dec 13, 2018

waiting for travis and another approval from @PrestaShop/prestashop-core-developers

@jolelievre jolelievre merged commit ef8aae4 into PrestaShop:develop Dec 13, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jolelievre

This comment has been minimized.

Copy link
Contributor

jolelievre commented Dec 13, 2018

@PierreRambaud PierreRambaud added this to the 1.7.6.0 milestone Dec 19, 2018

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