Skip to content

Commit 464e662

Browse files
committed
Fix phpunit.
1 parent 928350b commit 464e662

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ php:
99

1010
env:
1111
global:
12-
- CHECKS=1
12+
- DEFAULT=1
1313

1414
matrix:
1515
include:
@@ -21,11 +21,9 @@ matrix:
2121
before_script:
2222
- composer install --prefer-dist --no-interaction
2323

24-
- if [[ $CHECKS != 1 ]]; then composer require --dev phpunit/phpunit:"^6.0"; fi
24+
- if [[ $CHECKS != 1 ]]; then composer require --dev phpunit/phpunit:"^5.0|^6.0"; fi
2525

2626
script:
27-
- if [[ $DEFAULT == 1 ]]; then vendor/bin/phpunit; fi
28-
2927
- if [[ $CHECKS == 1 ]]; then composer phpstan-setup && composer phpstan ; fi
3028
- if [[ $CHECKS == 1 ]]; then composer cs-check ; fi
3129

tests/AllTests.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static function psr2rSuite() {
4747
$GLOBALS['PHP_CODESNIFFER_SNIFF_CODES'] = [];
4848
$GLOBALS['PHP_CODESNIFFER_FIXABLE_CODES'] = [];
4949

50-
$suite = new PHPUnit_Framework_TestSuite('PHP PSR2R Standards');
50+
$suite = new TestSuite('PHP PSR2R Standards');
5151
$toolFile = $GLOBALS['finder']->findFile(AbstractSniff::class);
5252
$standardDir = dirname(dirname(realpath($toolFile)));
5353
$testsDir = __DIR__ . DIRECTORY_SEPARATOR . 'PSR2R' . DIRECTORY_SEPARATOR . 'Tests' . DIRECTORY_SEPARATOR;

tests/Sniffs/Commenting/FullyQualifiedClassNameInDocBlockSniffTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
namespace PSR2R\Tests\Commenting;
44

5+
use PHPUnit\Framework\TestCase;
56
use PSR2R\Sniffs\Commenting\FullyQualifiedClassNameInDocBlockSniff;
67

7-
/**
8-
*/
9-
class FullyQualifiedClassNameInDocBlockSniffTest extends \PHPUnit_Framework_TestCase {
8+
class FullyQualifiedClassNameInDocBlockSniffTest extends TestCase {
109

1110
/**
1211
* @return void

tests/Sniffs/Commenting/FullyQualifiedClassNameInDocBlockUnitTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
66

7-
/**
8-
*/
97
class FullyQualifiedClassNameInDocBlockUnitTest extends AbstractSniffUnitTest {
108

119
/**

0 commit comments

Comments
 (0)