Skip to content

Merge pull request #2715 from rectorphp/coverage #2715

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
TomasVotruba merged 3 commits into from
Jan 19, 2020
Merged

Merge pull request #2715 from rectorphp/coverage #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a74b661
fix cs
TomasVotruba Jan 19, 2020
ebdd023
use pcov for coverage
TomasVotruba Jan 19, 2020
738e76f
remove duplicated rector job
TomasVotruba Jan 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .coveralls.yml
View file
Open in desktop

This file was deleted.

46 changes: 12 additions & 34 deletions .github/workflows/code_checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ jobs:
name: PHP ${{ matrix.php }} tests
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.2
coverage: none # disable xdebug, pcov
Expand All @@ -31,8 +30,7 @@ jobs:
- run: git fetch --depth=100000 origin

# see https://github.com/shivammathur/setup-php
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.2
coverage: none
Expand All @@ -44,8 +42,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.2
coverage: none # disable xdebug, pcov
Expand All @@ -56,25 +53,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.2
coverage: none # disable xdebug, pcov
- run: composer install --no-progress
- run: composer check-cs

rector:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
with:
php-version: 7.3
coverage: none # disable xdebug, pcov
- run: composer install --no-progress
- run: composer rector
rector-ci:
runs-on: ubuntu-latest
steps:
Expand All @@ -91,8 +76,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.2
coverage: none # disable xdebug, pcov
Expand All @@ -103,8 +87,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.2
coverage: none # disable xdebug, pcov
Expand All @@ -115,8 +98,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.2
coverage: none # disable xdebug, pcov
Expand All @@ -127,8 +109,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.2
coverage: none # disable xdebug, pcov
Expand All @@ -139,8 +120,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.2
coverage: none # disable xdebug, pcov
Expand All @@ -154,8 +134,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.3
coverage: none # disable xdebug, pcov
Expand All @@ -166,8 +145,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
-
uses: shivammathur/setup-php@v1
- uses: shivammathur/setup-php@v1
with:
php-version: 7.3
coverage: pcov
Expand All @@ -176,7 +154,7 @@ jobs:

# https://kizu514.com/blog/pcov-is-better-than-phpdbg-and-xdebug-for-code-coverage/
- run: |
vendor/bin/phpunit --coverage-clover coverage.xml
vendor/bin/phpunit --coverage-clover build/logs/clover.xml
# Coveralls.io
wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.1.0/php-coveralls.phar
php php-coveralls.phar --verbose
Expand Down
4 changes: 1 addition & 3 deletions packages/DeadCode/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,7 @@ private function isAssignNodeUsed(
// this node was just used, skip to next one
return $previousNode !== null && ($previousNode->isType(
VariableNodeUseInfo::TYPE_ASSIGN
) && $nodeByTypeAndPosition->isType(
VariableNodeUseInfo::TYPE_USE
));
) && $nodeByTypeAndPosition->isType(VariableNodeUseInfo::TYPE_USE));
}

private function shouldRemoveAssignNode(
Expand Down
4 changes: 1 addition & 3 deletions src/PhpParser/Node/Manipulator/IfManipulator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,7 @@ private function matchComparedAndReturnedNode(NotIdentical $notIdentical, Return
if ($this->betterStandardPrinter->areNodesEqual(
$notIdentical->left,
$returnNode->expr
) && $this->constFetchManipulator->isNull(
$notIdentical->right
)) {
) && $this->constFetchManipulator->isNull($notIdentical->right)) {
return $notIdentical->left;
}

Expand Down