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

Merge release 1.10.4 into master #348

Merged
merged 27 commits into from
Aug 11, 2020

Conversation

doctrinebot
Copy link

albe and others added 27 commits June 7, 2020 12:37
Replace "blacklist" terminology with "ignore"
update annotation IDE annotation with current links
The version of webmozart/assert we use conflicts with lower versions.
Not prefixing it with a backslash does not work as expected.
phpbench recently dropped compatibilty with PHP 7.1
When this job was introduced, 7.1 was the latest version of PHP we
supported, so it makes sense to bump to 7.4 now.
See https://github.com/phpbench/phpbench/releases/tag/0.17.0
It makes the code more readable and IDE less confused.
This should help getting the PHP 8 build closer to a successful one.
Fixes #340
That is a version where we can installed newer versions of PHPUnit, and
use methods that may not exist otherwise.
DocParser: Improve private typehints
That is the only version that is compatible with PHP 8.
Lowering the minimum-stability on the nightly build is necessary until
9.3.0 is published.
It has been deprecated as of PHPUnit 9

Note that we still rely on the call order here, I am not the original
author of this test but the order looks like it is pretty important for
this test, or maybe at least for understanding it.
Also note that we no longer check that save() is called after all calls
to fetch().
The T_STRING and T_NS_SEPARATOR tokens are used differently in use
statements. Treating them the same makes the code harder to follow and
harder to adapt for PHP 8.
Co-authored-by: Soner Sayakci <s.sayakci@shopware.com>
Co-authored-by: Grégoire Paris <postmaster@greg0ire.fr>
Add support for the new PHP 8 tokens for use statements
@greg0ire greg0ire merged commit 8c329dc into master Aug 11, 2020
@greg0ire greg0ire deleted the 1.10.x-merge-up-into-master_5f3295487aede7.72510405 branch August 11, 2020 20:12
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.

7 participants