Skip to content

Commit

Permalink
apply changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@keradus
keradus committed Mar 7, 2021
1 parent 34fef28 commit 8f028d7
Show file tree
Hide file tree
Showing 20 changed files with 66 additions and 66 deletions.
8 changes: 4 additions & 4 deletions tests/AbstractFunctionReferenceFixerTest.php
View file
Expand Up @@ -26,18 +26,18 @@ final class AbstractFunctionReferenceFixerTest extends TestCase
{
private $fixer;

protected function doSetUp(): void
protected function setUp(): void
{
$this->fixer = new FunctionReferenceTestFixer();

parent::doSetUp();
parent::setUp();
}

protected function doTearDown(): void
protected function tearDown(): void
{
$this->fixer = null;

parent::doTearDown();
parent::tearDown();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/AutoReview/ProjectCodeTest.php
View file
Expand Up @@ -229,7 +229,7 @@ static function (\ReflectionMethod $reflectionMethod) use ($reflectionClass) {

foreach ($publicMethods as $method) {
static::assertMatchesRegularExpression(
'/^(test|expect|provide|doSetUpBeforeClass$|doTearDownAfterClass$)/',
'/^(test|expect|provide|setUpBeforeClass$|tearDownAfterClass$)/',
$method->getName(),
sprintf('Public method "%s::%s" is not properly named.', $reflectionClass->getName(), $method->getName())
);
Expand Down
4 changes: 2 additions & 2 deletions tests/Cache/FileHandlerTest.php
View file
Expand Up @@ -29,9 +29,9 @@
*/
final class FileHandlerTest extends TestCase
{
protected function doTearDown(): void
protected function tearDown(): void
{
parent::doTearDown();
parent::tearDown();

$file = $this->getFile();

Expand Down
8 changes: 4 additions & 4 deletions tests/Console/Command/SelfUpdateCommandTest.php
View file
Expand Up @@ -38,9 +38,9 @@ final class SelfUpdateCommandTest extends TestCase
*/
private $root;

protected function doSetUp(): void
protected function setUp(): void
{
parent::doSetUp();
parent::setUp();

$this->root = vfsStream::setup();

Expand All @@ -50,9 +50,9 @@ protected function doSetUp(): void
file_put_contents("{$this->root->url()}/{$this->getNewMajorVersion()}.phar", 'New major version of PHP CS Fixer.');
}

protected function doTearDown(): void
protected function tearDown(): void
{
parent::doTearDown();
parent::tearDown();

$this->root = null;

Expand Down
4 changes: 2 additions & 2 deletions tests/FileReaderTest.php
View file
Expand Up @@ -27,9 +27,9 @@
*/
final class FileReaderTest extends TestCase
{
public static function doTearDownAfterClass(): void
public static function tearDownAfterClass(): void
{
parent::doTearDownAfterClass();
parent::tearDownAfterClass();

// testReadStdinCaches registers a stream wrapper for php so we can mock
// php://stdin. Restore the original stream wrapper after this class so
Expand Down
2 changes: 1 addition & 1 deletion tests/FileRemovalTest.php
View file
Expand Up @@ -37,7 +37,7 @@ final class FileRemovalTest extends TestCase
*/
private static $removeFilesOnTearDown = true;

public static function doTearDownAfterClass(): void
public static function tearDownAfterClass(): void
{
if (self::$removeFilesOnTearDown) {
@unlink(sys_get_temp_dir().'/cs_fixer_foo.php');
Expand Down
8 changes: 4 additions & 4 deletions tests/Fixer/ClassNotation/OrderedClassElementsFixerTest.php
View file
Expand Up @@ -146,11 +146,11 @@ public static function teardownafterclass() {
protected function setUp() {}
protected function doSetUp() {}
protected function setUp() {}
protected function tearDown() {}
protected function doTearDown() {}
protected function tearDown() {}
abstract public function foo1($a, $b = 1);
Expand Down Expand Up @@ -199,9 +199,9 @@ abstract public function foo1($a, $b = 1);
protected function tearDown() {}
protected function doSetUp() {}
protected function setUp() {}
protected function doTearDown() {}
protected function tearDown() {}
public function __clone() {}
Expand Down
4 changes: 2 additions & 2 deletions tests/Fixer/ControlStructure/NoUnneededControlParenthesesFixerTest.php
View file
Expand Up @@ -29,9 +29,9 @@ final class NoUnneededControlParenthesesFixerTest extends AbstractFixerTestCase
{
private static $defaultStatements;

public static function doSetUpBeforeClass(): void
public static function setUpBeforeClass(): void
{
parent::doSetUpBeforeClass();
parent::setUpBeforeClass();

$fixer = new NoUnneededControlParenthesesFixer();
foreach ($fixer->getConfigurationDefinition()->getOptions() as $option) {
Expand Down
8 changes: 4 additions & 4 deletions tests/Indicator/PhpUnitTestCaseIndicatorTest.php
View file
Expand Up @@ -31,18 +31,18 @@ final class PhpUnitTestCaseIndicatorTest extends TestCase
*/
private $indicator;

protected function doSetUp(): void
protected function setUp(): void
{
$this->indicator = new PhpUnitTestCaseIndicator();

parent::doSetUp();
parent::setUp();
}

protected function doTearDown(): void
protected function tearDown(): void
{
$this->indicator = null;

parent::doTearDown();
parent::tearDown();
}

/**
Expand Down
8 changes: 4 additions & 4 deletions tests/Report/AbstractReporterTestCase.php
View file
Expand Up @@ -30,16 +30,16 @@ abstract class AbstractReporterTestCase extends TestCase
*/
protected $reporter;

protected function doSetUp(): void
protected function setUp(): void
{
parent::doSetUp();
parent::setUp();

$this->reporter = $this->createReporter();
}

protected function doTearDown(): void
protected function tearDown(): void
{
parent::doTearDown();
parent::tearDown();

$this->reporter = null;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Report/CheckstyleReporterTest.php
View file
Expand Up @@ -35,12 +35,12 @@ final class CheckstyleReporterTest extends AbstractReporterTestCase
*/
private static $xsd;

public static function doSetUpBeforeClass(): void
public static function setUpBeforeClass(): void
{
self::$xsd = file_get_contents(__DIR__.'/../../doc/report-schema/checkstyle.xsd');
}

public static function doTearDownAfterClass(): void
public static function tearDownAfterClass(): void
{
self::$xsd = null;
}
Expand Down
8 changes: 4 additions & 4 deletions tests/Report/JunitReporterTest.php
View file
Expand Up @@ -38,16 +38,16 @@ final class JunitReporterTest extends AbstractReporterTestCase
*/
private static $xsd;

public static function doSetUpBeforeClass(): void
public static function setUpBeforeClass(): void
{
parent::doSetUpBeforeClass();
parent::setUpBeforeClass();

self::$xsd = file_get_contents(__DIR__.'/../../doc/report-schema/junit-10.xsd');
}

public static function doTearDownAfterClass(): void
public static function tearDownAfterClass(): void
{
parent::doTearDownAfterClass();
parent::tearDownAfterClass();

self::$xsd = null;
}
Expand Down
8 changes: 4 additions & 4 deletions tests/Report/XmlReporterTest.php
View file
Expand Up @@ -34,16 +34,16 @@ final class XmlReporterTest extends AbstractReporterTestCase
*/
private static $xsd;

public static function doSetUpBeforeClass(): void
public static function setUpBeforeClass(): void
{
parent::doSetUpBeforeClass();
parent::setUpBeforeClass();

self::$xsd = file_get_contents(__DIR__.'/../../doc/report-schema/xml.xsd');
}

public static function doTearDownAfterClass(): void
public static function tearDownAfterClass(): void
{
parent::doTearDownAfterClass();
parent::tearDownAfterClass();

self::$xsd = null;
}
Expand Down
12 changes: 6 additions & 6 deletions tests/Smoke/CiIntegrationTest.php
View file
Expand Up @@ -32,9 +32,9 @@ final class CiIntegrationTest extends AbstractSmokeTest
{
public static $fixtureDir;

public static function doSetUpBeforeClass(): void
public static function setUpBeforeClass(): void
{
parent::doSetUpBeforeClass();
parent::setUpBeforeClass();

self::$fixtureDir = __DIR__.'/../Fixtures/ci-integration';

Expand Down Expand Up @@ -64,16 +64,16 @@ public static function doSetUpBeforeClass(): void
}
}

public static function doTearDownAfterClass(): void
public static function tearDownAfterClass(): void
{
parent::doTearDownAfterClass();
parent::tearDownAfterClass();

self::executeCommand('rm -rf .git');
}

protected function doTearDown(): void
protected function tearDown(): void
{
parent::doTearDown();
parent::tearDown();

self::executeScript([
'git reset . -q',
Expand Down
4 changes: 2 additions & 2 deletions tests/Smoke/InstallViaComposerTest.php
View file
Expand Up @@ -41,9 +41,9 @@ final class InstallViaComposerTest extends AbstractSmokeTest
'vendor/bin/php-cs-fixer fix --help',
];

public static function doSetUpBeforeClass(): void
public static function setUpBeforeClass(): void
{
parent::doSetUpBeforeClass();
parent::setUpBeforeClass();

if ('\\' === \DIRECTORY_SEPARATOR) {
static::markTestIncomplete('This test is broken on Windows');
Expand Down
4 changes: 2 additions & 2 deletions tests/Smoke/PharTest.php
View file
Expand Up @@ -34,9 +34,9 @@ final class PharTest extends AbstractSmokeTest
private static $pharCwd;
private static $pharName;

public static function doSetUpBeforeClass(): void
public static function setUpBeforeClass(): void
{
parent::doSetUpBeforeClass();
parent::setUpBeforeClass();

self::$pharCwd = __DIR__.'/../..';
self::$pharName = 'php-cs-fixer.phar';
Expand Down
8 changes: 4 additions & 4 deletions tests/Test/AbstractFixerTestCase.php
View file
Expand Up @@ -66,17 +66,17 @@ abstract class AbstractFixerTestCase extends TestCase
'general_phpdoc_tag_rename' => true,
];

protected function doSetUp(): void
protected function setUp(): void
{
parent::doSetUp();
parent::setUp();

$this->linter = $this->getLinter();
$this->fixer = $this->createFixer();
}

protected function doTearDown(): void
protected function tearDown(): void
{
parent::doTearDown();
parent::tearDown();

$this->linter = null;
$this->fixer = null;
Expand Down
4 changes: 2 additions & 2 deletions tests/Test/AbstractFixerWithAliasedOptionsTestCase.php
View file
Expand Up @@ -30,9 +30,9 @@ abstract class AbstractFixerWithAliasedOptionsTestCase extends AbstractFixerTest
*/
private $fixerWithAliasedConfig;

protected function doTearDown(): void
protected function tearDown(): void
{
parent::doTearDown();
parent::tearDown();

$this->fixerWithAliasedConfig = null;
}
Expand Down
16 changes: 8 additions & 8 deletions tests/Test/AbstractIntegrationTestCase.php
View file
Expand Up @@ -75,9 +75,9 @@ abstract class AbstractIntegrationTestCase extends TestCase
*/
private static $fileRemoval;

public static function doSetUpBeforeClass(): void
public static function setUpBeforeClass(): void
{
parent::doSetUpBeforeClass();
parent::setUpBeforeClass();

$tmpFile = static::getTempFile();
self::$fileRemoval = new FileRemoval();
Expand All @@ -93,26 +93,26 @@ public static function doSetUpBeforeClass(): void
}
}

public static function doTearDownAfterClass(): void
public static function tearDownAfterClass(): void
{
parent::doTearDownAfterClass();
parent::tearDownAfterClass();

$tmpFile = static::getTempFile();

self::$fileRemoval->delete($tmpFile);
self::$fileRemoval = null;
}

protected function doSetUp(): void
protected function setUp(): void
{
parent::doSetUp();
parent::setUp();

$this->linter = $this->getLinter();
}

protected function doTearDown(): void
protected function tearDown(): void
{
parent::doTearDown();
parent::tearDown();

$this->linter = null;
}
Expand Down
8 changes: 4 additions & 4 deletions tests/Test/AbstractTransformerTestCase.php
View file
Expand Up @@ -32,16 +32,16 @@ abstract class AbstractTransformerTestCase extends TestCase
*/
protected $transformer;

protected function doSetUp(): void
protected function setUp(): void
{
parent::doSetUp();
parent::setUp();

$this->transformer = $this->createTransformer();
}

protected function doTearDown(): void
protected function tearDown(): void
{
parent::doTearDown();
parent::tearDown();

$this->transformer = null;
}
Expand Down

0 comments on commit 8f028d7

Please sign in to comment.