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

#430 Add ability to specify doc comment for the functions #431

Merged
merged 2 commits into from
Jul 23, 2018
Merged

#430 Add ability to specify doc comment for the functions #431

merged 2 commits into from
Jul 23, 2018

Conversation

funivan
Copy link
Contributor

@funivan funivan commented Jun 10, 2018

No description provided.

@funivan
Copy link
Contributor Author

funivan commented Jun 10, 2018

@asgrim need some help. Tests failed on unexpected place:

ERROR: UndefinedPropertyFetch - src/Reflection/ReflectionFunctionAbstract.php:566:29 - Instance property PhpParser\Node\Expr\Error::$name is not defined
            if (! is_string($paramNode->var->name) || strtolower($paramNode->var->name) !== $lowerName) {
ERROR: UndefinedPropertyFetch - src/TypesFinder/FindParameterType.php:56:50 - Instance property PhpParser\Node\Expr\Error::$name is not defined
            if ($paramTag->getVariableName() === $node->var->name) {

I think this is not my bug.

@asgrim
Copy link
Member

asgrim commented Jun 10, 2018

@funivan indeed, I'm investigating this in #425 so hopefully we'll get that merged soon :)

@asgrim
Copy link
Member

asgrim commented Jun 16, 2018

@funivan #425 that was causing the test failures here has now been merged, please could you rebase this PR to the latest master?

@funivan
Copy link
Contributor Author

funivan commented Jun 18, 2018

done

@asgrim asgrim self-assigned this Jun 22, 2018
@asgrim
Copy link
Member

asgrim commented Jun 22, 2018

@funivan hmm, there seem to be some additional commits added here which shouldn't be part of this change..

To fix, please could you try this (assuming your upstream remote is git@github.com:Roave/BetterReflection.git or the https version):

  • git fetch upstream
  • git checkout master
  • git reset --hard upstream/master
  • git checkout 430-change-method-comment
  • git rebase -i master

Remove the additional commits, it should look something like this I think (not exactly):

pick abc123a #430 Add ability to specify doc comment for the functions
pick abc123b #430 fix code style
  • git push -f origin 430-change-method-comment

Please ping me if you need a hand! :)

@funivan
Copy link
Contributor Author

funivan commented Jun 27, 2018

Done.

Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@Ocramius Ocramius merged commit ca0298b into Roave:master Jul 23, 2018
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