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

Fix install/upgrade/upgrade.php for php-5.4 syntax #7832

Merged

Conversation

transkontrol
Copy link

Questions Answers
Branch? "develop"
Description? fix install/upgrade/upgrade.php for php-5.4 syntax
Type? bug fix
Category? IN
BC breaks? no
Deprecations? no
Fixed ticket? -
How to test? update application at php-5.4

@prestonBot
Copy link
Collaborator

Hello transkontrol!

This is your first pull request on the PrestaShop project. Thank you, and welcome to this Open Source community!

@transkontrol transkontrol changed the title IN fix install/upgrade/upgrade.php for php-5.4 syntax IN: fix install/upgrade/upgrade.php for php-5.4 syntax Apr 27, 2017
@xBorderie
Copy link
Contributor

Thank you for your contribution!

Sadly, you now have malformed commits instead of just one commit:

  • the initial commit, which follows the naming convention,
  • one merge commit -- which if merged can break the repository's history!

Could you try and squash those commits into just one? Another explanation of squashing.

Thank you!

@Quetzacoalt91 Quetzacoalt91 changed the title IN: fix install/upgrade/upgrade.php for php-5.4 syntax Fix install/upgrade/upgrade.php for php-5.4 syntax Apr 27, 2017
@transkontrol
Copy link
Author

transkontrol commented Apr 27, 2017

Sadly, you now have malformed commits instead of just one commit:

complete!

@@ -110,7 +110,8 @@
}

$result = '<?xml version="1.0" encoding="UTF-8"?>';
if (empty($upgrade->hasFailure())) {
$hasFailure = $upgrade->hasFailure();
Copy link
Member

@Quetzacoalt91 Quetzacoalt91 Apr 27, 2017

Choose a reason for hiding this comment

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

Actually, when we look at this function, we can find:

        public function hasFailure()
        {
            return !empty($this->failureList);
        }

I don't understand why we have an empty() at the first place.

if (!$upgrade->hasFailure()) {

should be enough.

Copy link
Author

Choose a reason for hiding this comment

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

Sorry, do you mean that you fix it now without PR?

Copy link
Member

Choose a reason for hiding this comment

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

It depends if you want a contribution on this. If you put the change in your PR, I will merge it. Otherwise I wil open another one. 😉

IN: fix install/upgrade/upgrade.php for php-5.4 syntax
@Quetzacoalt91 Quetzacoalt91 merged commit 475cecf into PrestaShop:develop May 2, 2017
@Quetzacoalt91
Copy link
Member

Perfect, thank you @transkontrol

@xBorderie xBorderie added this to the 1.7.2.0 milestone May 2, 2017
@transkontrol transkontrol deleted the fix-upgrade-for-php54 branch May 2, 2017 10:04
@transkontrol transkontrol restored the fix-upgrade-for-php54 branch May 2, 2017 10:04
@transkontrol transkontrol deleted the fix-upgrade-for-php54 branch May 2, 2017 10:13
@transkontrol transkontrol restored the fix-upgrade-for-php54 branch May 2, 2017 10:17
@transkontrol transkontrol deleted the fix-upgrade-for-php54 branch May 2, 2017 10:23
@transkontrol transkontrol restored the fix-upgrade-for-php54 branch May 2, 2017 10:28
@transkontrol transkontrol deleted the fix-upgrade-for-php54 branch May 4, 2017 05:44
nihco2 pushed a commit to nihco2/PrestaShop that referenced this pull request May 11, 2017
…php54

Fix install/upgrade/upgrade.php for php-5.4 syntax
nihco2 pushed a commit to nihco2/PrestaShop that referenced this pull request May 11, 2017
…php54

Fix install/upgrade/upgrade.php for php-5.4 syntax
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.

4 participants