Skip to content

Conversation

@greg0ire
Copy link
Member

No description provided.

greg0ire added 3 commits July 30, 2020 19:37
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
@greg0ire greg0ire changed the title Fix broken build Make type in phpdoc resolvable Jul 30, 2020
@greg0ire greg0ire added the bug label Jul 30, 2020
@greg0ire
Copy link
Member Author

I'm labelling this as a patch since I fix phpdoc in src

@greg0ire greg0ire added this to the 1.10.4 milestone Jul 30, 2020
@greg0ire greg0ire merged commit f27036d into doctrine:1.10.x Jul 30, 2020
@greg0ire greg0ire deleted the fix-broken-build branch July 30, 2020 19:24
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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants