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

Use https in Employee not http #9136

Merged
merged 2 commits into from May 29, 2018
Merged

Use https in Employee not http #9136

merged 2 commits into from May 29, 2018

Conversation

ghost
Copy link

@ghost ghost commented May 28, 2018 •
edited by eternoendless

Questions Answers
Branch? develop
Description? Use https
Type? improvement
Category? CO
BC breaks? no
Deprecations? no

This change is Reviewable

@prestonBot prestonBot added the develop Branch label May 28, 2018
mickaelandrieu
mickaelandrieu previously approved these changes May 28, 2018
View reviewed changes
@mickaelandrieu mickaelandrieu added the Waiting for QA Status: action required, waiting for test feedback label May 28, 2018
PierreRambaud
PierreRambaud reviewed May 29, 2018
View reviewed changes
classes/Employee.php Outdated
FROM `'._DB_PREFIX_.'module_preference`
WHERE `id_employee` = '.(int)$this->id.' AND `favorite` = 1 AND (`interest` = 1 OR `interest` IS NULL)'
);
SELECT `module`
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did you change the indentation?

Copy link
Author

Choose a reason for hiding this comment

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

@PierreRambaud

It's my sublime pluggin but we found 3 idententation in this class :

https://github.com/PrestaShop/PrestaShop/blob/develop/classes/Employee.php#L304

https://github.com/PrestaShop/PrestaShop/blob/develop/classes/Employee.php#L381

https://github.com/PrestaShop/PrestaShop/blob/develop/classes/Employee.php#L507

Tell me which is the right one

Copy link
Contributor

Choose a reason for hiding this comment

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

This one look really good, https://github.com/PrestaShop/PrestaShop/blob/develop/classes/Employee.php#L304
It's PSR2 / Symfony style compliant :)

@marionf marionf added QA ✔️ Status: check done, code approved and removed Waiting for QA Status: action required, waiting for test feedback labels May 29, 2018
@mickaelandrieu
Copy link
Contributor

"Make ident grat again" => ahahah don't worry we can change the git label name :)

Thansk @okom3pom

@ghost
Copy link
Author

ghost commented May 29, 2018

oh !

@mickaelandrieu mickaelandrieu merged commit cbcabc2 into PrestaShop:develop May 29, 2018
@mickaelandrieu
Copy link
Contributor

and merged!

Thanks @okom3pom

@ghost ghost deleted the okom-17-patch branch May 29, 2018 13:23
@eternoendless eternoendless added this to the 1.7.5.0 milestone Jun 6, 2018
db306 pushed a commit to db306/PrestaShop that referenced this pull request Apr 12, 2020
@Touxten
Use https in Employee not http (PrestaShop#9136)
39db2c0 
* Use https instead of http in Employee class

* Make ident great again
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
develop Branch Improvement Type: Improvement QA ✔️ Status: check done, code approved
Projects
None yet
Milestone
1.7.5.0
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@mickaelandrieu @PierreRambaud @Quetzacoalt91 @eternoendless @marionf @prestonBot @Touxten