Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Update to Symfony 4#86

Merged
joanhe merged 11 commits intomagento-engcom:libs-upgradefrom
pmclain:smyfony4
Mar 14, 2018
Merged

Update to Symfony 4#86
joanhe merged 11 commits intomagento-engcom:libs-upgradefrom
pmclain:smyfony4

Conversation

@pmclain
Copy link
Copy Markdown
Contributor

@pmclain pmclain commented Feb 27, 2018

Description

Updates libraries to versions supporting PHP 7.2. This includes the Symfony components and brings composer.lock to a state that allows composer install on PHP ~7.1.3 and ~7.2.0

Fixed Issues (if relevant)

  1. friendsofphp/php-cs-fixer does not support PHP 7.2 #4

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

Patrick McLain added 7 commits February 24, 2018 13:27
allows compoer install on php71 and php72
* Update implementation of `Cm\RedisSession\Handler\ConfigInterface`
* Add Redis Sentinel config options to `setup:config:set` command
Replace references of `Symfony\Console\Helper\TableHelper` with
`Symfony\Console\Helper\Table`. `new` was used instead of DI to mirror
existing reference in
https://github.com/magento/magento2/blob/a083717504f63fd22748fb42d74b63c2906226ef/app/code/Magento/Developer/Console/Command/DiInfoCommand.php#L84
Not sure which is preferred.
It is replaced with `Symfony\Console\Helper\QuestionHelper`
`Symfony\Component\Console\Helper\ProgressBar` has been declared Final
and cannot be mocked.
The second constructor argument of parent class
`Symfony\Component\Console\Output\Output` must be boolean.
@buskamuza buskamuza self-assigned this Feb 28, 2018
composer.json Outdated
"magento/composer": "~1.2.0",
"colinmollenhour/php-redis-session-abstract": "~1.3.8",
"composer/composer": "~1.6.0",
"friendsofphp/php-cs-fixer": "~2.10.0",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is it moved to require from require-dev?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No reason. Moved back to require-dev.

composer.json Outdated
"symfony/console": "~2.3, !=2.7.0",
"symfony/event-dispatcher": "~2.1",
"symfony/process": "~2.1",
"sebastian/phpcpd": "~3.0.0",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is it moved to require from require-dev?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No reason. Moved back to require-dev.

},
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"php": "~7.1.3||~7.2.0",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Related #30
@pmclain , could you also update the related PR to reflect same PHP versions and target it to the same upgrade-libs branch? I'll merge both then. Or if you have time, merge it into this PR.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've applied the updates from #30 to this PR. I'll close #30

"composer/composer": "1.4.1",
"magento/composer": "~1.2.0",
"colinmollenhour/php-redis-session-abstract": "~1.3.8",
"composer/composer": "~1.6.0",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please update Magento/Framework/composer.json with the new version.
Same for symfony/console and symfony/process

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

updated

@buskamuza
Copy link
Copy Markdown
Contributor

Confirmed: composer install runs w/o errors on both PHP 7.1 and 7.2

@buskamuza
Copy link
Copy Markdown
Contributor

buskamuza commented Feb 28, 2018

Docs needed:

@shrielenee, could you please help with this? See updated PHP versions https://github.com/magento-engcom/php-7.2-support/pull/86/files#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780R15

Patrick McLain added 3 commits February 28, 2018 21:06
Match library versions with those in project composer.json
@pmclain
Copy link
Copy Markdown
Contributor Author

pmclain commented Mar 1, 2018

@buskamuza The requested changes have been made. I also updated .travis.yml, replacing php 7.0 with 7.2.

@buskamuza
Copy link
Copy Markdown
Contributor

Waiting for PRs to internal repositories before this one can be merged.

"require": {
"magento/magento2-functional-testing-framework": "1.0.0",
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
"php": "~7.1.3||~7.2.0"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I just noticed that MFTF tests has been also updated. I think it's better to be done in a separate task.
MFTF tests are run separately from the Magento application, so they can still run on its own supported PHP version. In scope of updating MFTF dependencies we should verify that the framework is not broken, which increases scope for this task.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sounds good. I'll back those changes out.

@buskamuza buskamuza added this to the Magento 2.3.0 milestone Mar 7, 2018
},
"require": {
"php": "7.0.2|~7.0.6|~7.1.0",
"php": "~7.1.3||~7.2.0",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I propose to skip this one too for now, and make the update in a separate task.

@joanhe joanhe merged commit 5708643 into magento-engcom:libs-upgrade Mar 14, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants