Skip to content

Conversation

@jkufner
Copy link
Contributor

@jkufner jkufner commented May 11, 2020

  • Improve private typehints and annotations; unify imports
  • syntaxError() returns the exception rather than throwing it; it makes the code more readable and IDE less confused

None of these changes should change any behavior.

greg0ire
greg0ire previously approved these changes May 11, 2020
SenseException
SenseException previously approved these changes May 11, 2020
@greg0ire greg0ire dismissed stale reviews from SenseException and themself via 0e636eb July 30, 2020 17:13
@greg0ire greg0ire force-pushed the private-typehints branch from c0ed4b2 to 0e636eb Compare July 30, 2020 17:13
greg0ire
greg0ire previously approved these changes Jul 30, 2020
@greg0ire

This comment has been minimized.

@greg0ire greg0ire force-pushed the private-typehints branch from 0e636eb to 1a8a646 Compare July 30, 2020 19:25
@greg0ire greg0ire changed the base branch from master to 1.10.x July 30, 2020 19:25
@greg0ire greg0ire merged commit eb0bfd4 into doctrine:1.10.x Jul 31, 2020
@greg0ire
Copy link
Member

Thanks @jkufner !

@greg0ire greg0ire added this to the 1.10.4 milestone Jul 31, 2020
* @return int|null
*/
private function findInitialTokenPosition($input)
private function findInitialTokenPosition($input): ?int
Copy link
Member

Choose a reason for hiding this comment

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

if you add the return type, why not adding the argument type too ?

* Generates a new syntax error.
*
* @param string $expected Expected string.
* @param array|null $token Optional token.
Copy link
Member

Choose a reason for hiding this comment

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

the descriptions don't really provide any value here, and the types are not specified through typehints

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.

4 participants