Skip to content

Fix 2914 (rebased): Merge PHPDoc block tags when inheriting #196

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
May 8, 2020
Merged

Fix 2914 (rebased): Merge PHPDoc block tags when inheriting #196

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0beb9dd
PHPCS - ignore tests cache
May 8, 2020
127bb52
Merge inherited PHPDocs
May 8, 2020
a3b712b
Get rid of cloning
ondrejmirtes May 8, 2020
ca7ac7d
Get rid of ClassReflection::requireFileName()
ondrejmirtes May 8, 2020
f073e73
Reworked InvalidThrowsPhpDocValueRule without NodeScopeResolver
ondrejmirtes May 8, 2020
ea57a4f
Not sure about this
ondrejmirtes May 8, 2020
cad7f20
Reworked tests
ondrejmirtes May 8, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
PHPCS - ignore tests cache
  • Loading branch information
@ondrejmirtes
Alexey Inkin authored and ondrejmirtes committed May 8, 2020
commit 0beb9dd3e3fe36094683aabff7921831a809b0d3
2 changes: 1 addition & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
<arg value="--encoding=utf-8"/>
<arg value="--tab-width=4"/>
<arg value="--cache=tmp/cache/phpcs"/>
<arg value="--ignore=tests/*/data,tests/*/traits,tests/notAutoloaded,src/Reflection/SignatureMap/functionMap.php"/>
<arg value="--ignore=tests/*/data,tests/*/traits,tests/notAutoloaded,tests/*/cache,src/Reflection/SignatureMap/functionMap.php"/>
<arg value="-sp"/>
<arg path="src"/>
<arg path="tests"/>
Expand Down