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

Replace "blacklist" terminology with "ignore" #337

Merged
merged 1 commit into from
Jun 7, 2020

Conversation

albe
Copy link
Contributor

@albe albe commented Jun 7, 2020

It's the terminology used in the code, so that just makes sense.

greg0ire
greg0ire previously approved these changes Jun 7, 2020
@greg0ire
Copy link
Member

greg0ire commented Jun 7, 2020

I'm going to retarget this to the lowest maintained branch, and it will bubble up afterwards.

@albe
Copy link
Contributor Author

albe commented Jun 7, 2020

Ah yes - sorry, forgot to look closely where to target. Thanks!

@SenseException SenseException merged commit 8f03e71 into doctrine:1.10.x Jun 7, 2020
@albe albe deleted the patch-2 branch June 7, 2020 20:09
@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 "blacklist" terminology with "ignore"](doctrine#337) thanks to @albe
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 "blacklist" terminology with "ignore"](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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants