diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index c512a3d57d64..000000000000 --- a/.coveralls.yml +++ /dev/null @@ -1,3 +0,0 @@ -service_name: travis-ci -coverage_clover: coverage.xml -json_path: coverage.json diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml index 8053174cb2b5..269e2eb0bd9d 100644 --- a/.github/workflows/code_checks.yml +++ b/.github/workflows/code_checks.yml @@ -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 @@ -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 @@ -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 @@ -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: @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/packages/DeadCode/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php b/packages/DeadCode/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php index 1733c2ba78d5..83c6f1bbd50f 100644 --- a/packages/DeadCode/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php +++ b/packages/DeadCode/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php @@ -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( diff --git a/src/PhpParser/Node/Manipulator/IfManipulator.php b/src/PhpParser/Node/Manipulator/IfManipulator.php index 3738f88cbf2e..0d5554a70763 100644 --- a/src/PhpParser/Node/Manipulator/IfManipulator.php +++ b/src/PhpParser/Node/Manipulator/IfManipulator.php @@ -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; }