Skip to content

Tests: fix up some setup/teardown method signatures #874

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 1 commit into from
Mar 13, 2025
Merged

Tests: fix up some setup/teardown method signatures #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions tests/Core/Config/ReportWidthTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ final class ReportWidthTest extends TestCase
*
* @return void
*/
public static function cleanConfig()
protected function cleanConfig()
{
// Set to the property's default value to clear out potentially set values from other tests.
self::setStaticProperty('executablePaths', []);
Expand All @@ -52,7 +52,7 @@ public static function cleanConfig()
*
* @return void
*/
public function resetConfig()
protected function resetConfig()
{
$_SERVER['argv'] = [];

Expand Down
10 changes: 5 additions & 5 deletions tests/Core/Ruleset/ExpandRulesetReferenceHomePathTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ final class ExpandRulesetReferenceHomePathTest extends AbstractRulesetTestCase
*
* @return void
*/
protected function storeHomePath()
public static function storeHomePath()
{
$this->homepath = getenv('HOME');
self::$homepath = getenv('HOME');

}//end storeHomePath()

Expand All @@ -50,10 +50,10 @@ protected function storeHomePath()
*
* @return void
*/
protected function restoreHomePath()
public static function restoreHomePath()
{
if (is_string($this->homepath) === true) {
putenv('HOME='.$this->homepath);
if (is_string(self::$homepath) === true) {
putenv('HOME='.self::$homepath);
} else {
// Remove the environment variable as it didn't exist before.
putenv('HOME');
Expand Down
4 changes: 2 additions & 2 deletions tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ final class RuleInclusionAbsoluteLinuxTest extends TestCase
*
* @return void
*/
public function initializeConfigAndRuleset()
protected function initializeConfigAndRuleset()
{
$this->standard = __DIR__.'/'.basename(__FILE__, '.php').'.xml';
$repoRootDir = dirname(dirname(dirname(__DIR__)));
Expand Down Expand Up @@ -84,7 +84,7 @@ public function initializeConfigAndRuleset()
*
* @return void
*/
public function resetRuleset()
protected function resetRuleset()
{
file_put_contents($this->standard, $this->contents);

Expand Down
4 changes: 2 additions & 2 deletions tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ final class RuleInclusionAbsoluteWindowsTest extends TestCase
*
* @return void
*/
public function initializeConfigAndRuleset()
protected function initializeConfigAndRuleset()
{
$this->standard = __DIR__.'/'.basename(__FILE__, '.php').'.xml';
$repoRootDir = dirname(dirname(dirname(__DIR__)));
Expand Down Expand Up @@ -81,7 +81,7 @@ public function initializeConfigAndRuleset()
*
* @return void
*/
public function resetRuleset()
protected function resetRuleset()
{
file_put_contents($this->standard, $this->contents);

Expand Down
2 changes: 1 addition & 1 deletion tests/Core/Ruleset/RuleInclusionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ final class RuleInclusionTest extends AbstractRulesetTestCase
*
* @return void
*/
public static function initializeConfigAndRuleset()
protected function initializeConfigAndRuleset()
{
if (self::$standard === '') {
$standard = __DIR__.'/'.basename(__FILE__, '.php').'.xml';
Expand Down