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

Allow Symfony 5 + many cleanups #480

Merged
merged 1 commit into from Oct 21, 2019
Merged

Conversation

nicolas-grekas
Copy link
Member

@nicolas-grekas nicolas-grekas commented Oct 20, 2019

Note that having php-cs-fixer in the deps blocks installing Symfony 5 (did I already mention it's a bad practice to add tools as deps? ;) )
But locally when I remove php-cs-fixer (and patch the code to use my local version), all is green, with SF5 deps.

$this->fs->symlink('../../../../../../vendor/symfony/phpunit-bridge', './vendor/symfony/phpunit-bridge');
} else {
$this->fs->mirror(\dirname(__DIR__, 2).'/vendor/symfony/phpunit-bridge', $this->flexPath.'/vendor/symfony/phpunit-bridge');
}
Copy link
Member

Choose a reason for hiding this comment

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

Using the required phpunit bridge was now a problem?

Copy link
Member Author

Choose a reason for hiding this comment

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

The bridge used for the main test suite and for functional tests must be at exactly the same version because they share the same runtime space. This leads to a fatal error right now when main is 4.4 or 5.0 but functionals stay at 4.3.

),
$this->createNullConstant(),
new Node\Expr\Variable('this')
)
))
);

// if ($newUserProfile !== $user->getUserProfile()) {
Copy link
Member

Choose a reason for hiding this comment

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

What prompted needing to flip all of these?

Copy link
Member Author

Choose a reason for hiding this comment

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

Running php-cs-fixer

@weaverryan
Copy link
Member

Thanks Nicolas!

weaverryan added a commit that referenced this pull request Oct 21, 2019
This PR was merged into the 1.0-dev branch.

Discussion
----------

Allow Symfony 5 + many cleanups

Note that having php-cs-fixer in the deps blocks installing Symfony 5 (did I already mention it's a bad practice to add tools as deps? ;) )
But locally when I remove php-cs-fixer (and patch the code to use my local version), all is green, with SF5 deps.

Commits
-------

2cf9460 Allow Symfony 5 + many cleanups
@weaverryan weaverryan merged commit 2cf9460 into symfony:master Oct 21, 2019
@nicolas-grekas nicolas-grekas deleted the sf5 branch May 12, 2021 14:21
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.

None yet

2 participants