Skip to content

Conversation

@stof
Copy link
Member

@stof stof commented Aug 10, 2020

Fixes #339
Replaces #344

This PR achieves the same goal than #344 but without forking the whole method. This is done by first refactoring the existing code to differentiate between T_STRING and T_NS_SEPARATOR as they actually have different needs (T_NS_SEPARATOR won't appear in a explicit alias for instance) and then adding the support for the new PHP 8 tokens in this cleaned code.
For the second commit, I marked @shyim as a co-author to credit them for the good work done in #344 to make the feature work.

stof and others added 2 commits August 10, 2020 10:50
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.
Copy link
Contributor

@shyim shyim left a comment

Choose a reason for hiding this comment

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

Thanks!

@stof stof requested a review from greg0ire August 10, 2020 16:25
@greg0ire greg0ire closed this Aug 10, 2020
@greg0ire greg0ire reopened this Aug 10, 2020
@greg0ire
Copy link
Member

Triggering a new build now that #345 was merged

Co-authored-by: Grégoire Paris <[email protected]>
@greg0ire greg0ire merged commit bfe91e3 into doctrine:1.10.x Aug 10, 2020
@greg0ire
Copy link
Member

Thanks @stof @shyim !

@greg0ire greg0ire added this to the 1.10.4 milestone Aug 11, 2020
jkufner added a commit to smalldb/annotations that referenced this pull request Aug 11, 2020
Release [1.10.4](https://github.com/doctrine/annotations/milestone/25)

1.10.4
======

- Total issues resolved: **0**
- Total pull requests resolved: **8**
- Total contributors: **5**

 - [347: Add support for the new PHP 8 tokens for use statements](doctrine#347) thanks to @stof
 - [345: Remove calls to TestCase::at()](doctrine#345) thanks to @greg0ire
 - [343: Allow using PHPUnit 9.3](doctrine#343) thanks to @greg0ire

Improvement
-----------

 - [342: Upgrade phpunit](doctrine#342) thanks to @greg0ire
 - [332: DocParser: Improve private typehints](doctrine#332) thanks to @jkufner

bug
---

 - [341: Make type in phpdoc resolvable](doctrine#341) thanks to @greg0ire

Documentation
-------------

 - [338: update annotation IDE annotation with current links](doctrine#338) thanks to @Haehnchen

Documentation,Improvement
-------------------------

 - [337: Replace &quot;blacklist&quot; terminology with &quot;ignore&quot;](doctrine#337) thanks to @albe
@stof stof deleted the fix_php8_use_statements branch August 12, 2020 13:09
BenMorel added a commit to brick/reflection that referenced this pull request Sep 28, 2020
Yurunsoft added a commit to Yurunsoft/doctrine-annotations that referenced this pull request Nov 29, 2020
Release [1.10.4](https://github.com/doctrine/annotations/milestone/25)

1.10.4
======

- Total issues resolved: **0**
- Total pull requests resolved: **8**
- Total contributors: **5**

 - [347: Add support for the new PHP 8 tokens for use statements](doctrine#347) thanks to @stof
 - [345: Remove calls to TestCase::at()](doctrine#345) thanks to @greg0ire
 - [343: Allow using PHPUnit 9.3](doctrine#343) thanks to @greg0ire

Improvement
-----------

 - [342: Upgrade phpunit](doctrine#342) thanks to @greg0ire
 - [332: DocParser: Improve private typehints](doctrine#332) thanks to @jkufner

bug
---

 - [341: Make type in phpdoc resolvable](doctrine#341) thanks to @greg0ire

Documentation
-------------

 - [338: update annotation IDE annotation with current links](doctrine#338) thanks to @Haehnchen

Documentation,Improvement
-------------------------

 - [337: Replace &quot;blacklist&quot; terminology with &quot;ignore&quot;](doctrine#337) thanks to @albe

# gpg: Signature made Tue Aug 11 20:55:32 2020
# gpg:                using DSA key 1BEDEE0A820BC30D858F9F0C2C3A645671828132
# gpg: Can't check signature: No public key

# Conflicts:
#	composer.json
#	lib/Doctrine/Common/Annotations/Annotation/Attributes.php
#	lib/Doctrine/Common/Annotations/DocParser.php
#	tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php
#	tests/Doctrine/Tests/Common/Annotations/AnnotationReaderTest.php
#	tests/Doctrine/Tests/Common/Annotations/DocParserTest.php
#	tests/Doctrine/Tests/Common/Annotations/FileCacheReaderTest.php
#	tests/Doctrine/Tests/Common/Annotations/SimpleAnnotationReaderTest.php
#	tests/Doctrine/Tests/Common/Annotations/Ticket/DCOM55Test.php
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.

Aliasing breaks with PHP8

3 participants