Fix issues with parsing invokable macros #1124

standaniels · 2020-12-11T10:40:45Z

Summary

Fix issues with parsing invokable macros (#1084).

Type of change

Bug fix (non-breaking change which fixes an issue)

Checklist

Existing tests have been adapted and/or new tests have been added
Add a CHANGELOG.md entry
Update the README.md (n/a)
Code style has been fixed via composer fix-style

Existing tests pass, but I expect that new tests must be added. Could you help me or point me in the right direction?

KaloyanYosifov · 2020-12-12T07:15:16Z

Oh my bad, sorry I didn't see your last message, below the checklist. Probably the existing test class needs to be modified -- https://github.com/barryvdh/laravel-ide-helper/blob/master/tests/MethodTest.php. You can see there is an existing class ExampleClass.

As a suggestion the way I would go about it, is to add an __invoke method either to that class or create a new class, and copy one of the last test methods and modify it to use __invoke.

standaniels · 2020-12-12T09:36:51Z

I've used the MethodTest class as a starting point for a new MacroTest class. Let me know if there's anything that can be improved.

KaloyanYosifov · 2020-12-12T09:56:43Z

@standaniels Looks really good to me and i think the test covers it pretty much. I used it on one of my big projects and everything seems to be correct. Great job!!!!

The only thing left is, when @mfn has the time to review it.

mfn

Briefly skimmed it, LGTM

KaloyanYosifov · 2020-12-21T18:27:09Z

@standaniels It seems that there is a conflict from a recent pull request. Would you be able to check it out?

standaniels · 2020-12-21T18:40:46Z

Sure! Let me have a look.

# Conflicts: # tests/MacroTest.php

standaniels · 2020-12-21T19:10:04Z

Here you are.

mfn · 2020-12-21T20:45:40Z

Nice, thanks :)

KaloyanYosifov · 2021-01-09T10:51:32Z

@barryvdh @mfn Is there any problem in merging this?

standaniels · 2021-01-09T14:11:15Z

Thanks for merging. #1084 may now be closed 😊

mfn · 2021-01-09T16:02:27Z

The changelog ended up in the wrong version due to the late merge 😅 Fixed via #1138

matsava · 2021-02-02T05:42:50Z

I'm still seeing this error, is this released?

mfn · 2021-02-02T15:01:07Z

@matsava not yet, it's listed for next release, please see https://github.com/barryvdh/laravel-ide-helper/blob/master/CHANGELOG.md#next-release

bytestream · 2021-03-15T21:52:14Z

src/Macro.php

@@ -63,7 +63,11 @@ protected function initPhpDoc($method)

    protected function addLocationToPhpDoc()
    {
-        $enclosingClass = $this->method->getClosureScopeClass();
+        if ($this->method->name === '__invoke') {


Given a macro accepts object|callable, possible values are:

callable - function () { }

callable - [$instance, 'method']

object - new Foo()

This should be $enclosingClass === null so it covers cases all cases where $this->method is not an anonymous function.

Feel free to send a PR!

Bumps [barryvdh/laravel-ide-helper](https://github.com/barryvdh/laravel-ide-helper) from 2.9.0 to 2.9.1. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/barryvdh/laravel-ide-helper/releases">barryvdh/laravel-ide-helper's releases</a>.</em></p> <blockquote> <h2>v2.9.1</h2> <h3>Added</h3> <ul> <li>Generate PHPDoc for Laravel 8.x factories <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1074">#1074 / ahmed-aliraqi</a></li> <li>Add a comment to a property like table columns <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1168">#1168 / biiiiiigmonster</a></li> <li>Added <code>post_migrate</code> hook to run commands after a migration <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1163">#1163 / netpol</a></li> </ul> <h3>Fixed</h3> <ul> <li>Error when generating helper for invokable classes <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1124">#1124 / standaniels</a></li> <li>Fix broken ReflectionUnionTypes <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1132">#1132 / def-studio</a></li> <li>Relative class names are not converted to fully-qualified class names <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1005">#1005 / SavKS</a></li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/barryvdh/laravel-ide-helper/blob/master/CHANGELOG.md">barryvdh/laravel-ide-helper's changelog</a>.</em></p> <blockquote> <h2>2021-03-15, 2.9.1</h2> <h3>Added</h3> <ul> <li>Generate PHPDoc for Laravel 8.x factories <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1074">#1074 / ahmed-aliraqi</a></li> <li>Add a comment to a property like table columns <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1168">#1168 / biiiiiigmonster</a></li> <li>Added <code>post_migrate</code> hook to run commands after a migration <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1163">#1163 / netpol</a></li> </ul> <h3>Fixed</h3> <ul> <li>Error when generating helper for invokable classes <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1124">#1124 / standaniels</a></li> <li>Fix broken ReflectionUnionTypes <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1132">#1132 / def-studio</a></li> <li>Relative class names are not converted to fully-qualified class names <a href="https://github.com/barryvdh/laravel-ide-helper/pull/1005">#1005 / SavKS</a></li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/barryvdh/laravel-ide-helper/commit/8d8302ff6adb55f8b844c798b8b1ffdee142f7e5"><code>8d8302f</code></a> chore: add missing changelog entries (<a href="https://github.com/barryvdh/laravel-ide-helper/issues/1176">#1176</a>)</li> <li><a href="https://github.com/barryvdh/laravel-ide-helper/commit/202395b50f31325911fd045993c2b4d2851b8bf6"><code>202395b</code></a> Auto generate models (<a href="https://github.com/barryvdh/laravel-ide-helper/issues/1163">#1163</a>)</li> <li><a href="https://github.com/barryvdh/laravel-ide-helper/commit/c5c9b2b9517696e1d17ce64790be42b8bb76a4d2"><code>c5c9b2b</code></a> Add comments like table columns. (<a href="https://github.com/barryvdh/laravel-ide-helper/issues/1168">#1168</a>)</li> <li><a href="https://github.com/barryvdh/laravel-ide-helper/commit/c5e18beff1a2933913f86d56281581566e5c8705"><code>c5e18be</code></a> Fix Relative class names are not converted to fully-qualified class names (FQ...</li> <li><a href="https://github.com/barryvdh/laravel-ide-helper/commit/6c4dcd9049e7e9aabc78673de7d1b9d428f3dc10"><code>6c4dcd9</code></a> Merge pull request <a href="https://github.com/barryvdh/laravel-ide-helper/issues/1164">#1164</a> from wilsenhc/readme-fix</li> <li><a href="https://github.com/barryvdh/laravel-ide-helper/commit/aaade4eab932efe3841306ad7faf9ef1a8cef391"><code>aaade4e</code></a> Fix typo in README</li> <li><a href="https://github.com/barryvdh/laravel-ide-helper/commit/b21324b20e24a3c36bedc184b4cf273bfa0a2d32"><code>b21324b</code></a> Merge pull request <a href="https://github.com/barryvdh/laravel-ide-helper/issues/1156">#1156</a> from ZaidBarghouthi/fix-zb-extra-quote</li> <li><a href="https://github.com/barryvdh/laravel-ide-helper/commit/db83fb8b6ba38ea0b1d28197e898b4ff0d9581d0"><code>db83fb8</code></a> Remove extra single quote</li> <li><a href="https://github.com/barryvdh/laravel-ide-helper/commit/4f42af1fa1f6265174ef97c36e0ae7beb2596c29"><code>4f42af1</code></a> Apply "<a href="https://github.com/PSR12"><code>@PSR12</code></a>" in php-cs-fixer (<a href="https://github.com/barryvdh/laravel-ide-helper/issues/1150">#1150</a>)</li> <li><a href="https://github.com/barryvdh/laravel-ide-helper/commit/f0959c1184c6f8f9e50afa6d9b6c1eb7691ae3ae"><code>f0959c1</code></a> Update changelog and also automagically apply style fix (<a href="https://github.com/barryvdh/laravel-ide-helper/issues/1140">#1140</a>)</li> <li>Additional commits viewable in <a href="https://github.com/barryvdh/laravel-ide-helper/compare/v2.9.0...v2.9.1">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=barryvdh/laravel-ide-helper&package-manager=composer&previous-version=2.9.0&new-version=2.9.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>

barryvdh requested a review from mfn December 21, 2020 08:38

barryvdh approved these changes Dec 21, 2020

View reviewed changes

mfn approved these changes Dec 21, 2020

View reviewed changes

Fix issues with parsing invokable macros

11a675a

Add macro test

b0a0ab3

# Conflicts: # tests/MacroTest.php

barryvdh merged commit fd30d11 into barryvdh:master Jan 9, 2021

mfn mentioned this pull request Jan 9, 2021

Call to a member function getMethods() on null #1084

Closed

bytestream reviewed Mar 15, 2021

View reviewed changes

This was referenced Mar 16, 2021

Bump barryvdh/laravel-ide-helper from 2.9.0 to 2.9.1 goldcoders-corp/vuetified#100

Closed

Bump barryvdh/laravel-ide-helper from 2.9.0 to 2.9.1 WesleyKlop/vote-system#329

Merged

dependabot bot mentioned this pull request Mar 16, 2021

fix(auto): bump barryvdh/laravel-ide-helper from 2.8.1 to 2.9.1 alecadub/application#13

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix issues with parsing invokable macros #1124

Fix issues with parsing invokable macros #1124

standaniels commented Dec 11, 2020 •

edited

Loading

KaloyanYosifov commented Dec 12, 2020 •

edited

Loading

standaniels commented Dec 12, 2020

KaloyanYosifov commented Dec 12, 2020 •

edited

Loading

mfn left a comment

KaloyanYosifov commented Dec 21, 2020

standaniels commented Dec 21, 2020

standaniels commented Dec 21, 2020

mfn commented Dec 21, 2020

KaloyanYosifov commented Jan 9, 2021

standaniels commented Jan 9, 2021

mfn commented Jan 9, 2021

matsava commented Feb 2, 2021

mfn commented Feb 2, 2021

bytestream Mar 15, 2021

mfn Mar 16, 2021

Fix issues with parsing invokable macros #1124

Fix issues with parsing invokable macros #1124

Conversation

standaniels commented Dec 11, 2020 • edited Loading

Summary

Type of change

Checklist

KaloyanYosifov commented Dec 12, 2020 • edited Loading

standaniels commented Dec 12, 2020

KaloyanYosifov commented Dec 12, 2020 • edited Loading

mfn left a comment

Choose a reason for hiding this comment

KaloyanYosifov commented Dec 21, 2020

standaniels commented Dec 21, 2020

standaniels commented Dec 21, 2020

mfn commented Dec 21, 2020

KaloyanYosifov commented Jan 9, 2021

standaniels commented Jan 9, 2021

mfn commented Jan 9, 2021

matsava commented Feb 2, 2021

mfn commented Feb 2, 2021

bytestream Mar 15, 2021

Choose a reason for hiding this comment

mfn Mar 16, 2021

Choose a reason for hiding this comment

standaniels commented Dec 11, 2020 •

edited

Loading

KaloyanYosifov commented Dec 12, 2020 •

edited

Loading

KaloyanYosifov commented Dec 12, 2020 •

edited

Loading